From 20fed853996a84054351b418b38663504ea3df11 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Thu, 15 Jan 2009 23:17:38 +0000 Subject: Update package buildscript --- scripts/mkpkg | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/scripts/mkpkg b/scripts/mkpkg index d5cda2f33..25c5afe6d 100755 --- a/scripts/mkpkg +++ b/scripts/mkpkg @@ -19,16 +19,21 @@ mkdir -p ${LOG_DIR}/DEPEND test=${OK} -function build_package () +function clean_files() { - printf "%-31s" "$1" rm -f ${LOG} rm -f ${LOG_OK_FILE} rm -f ${LOG_FAIL_FILE} rm -f ${DEPENDENCY} +} +function dirclean () +{ make $1-dirclean > /dev/null 2>&1 +} +function process () +{ make $1 >> ${LOG} 2>&1 || test=${FAIL} grep "\.tar\." ${LOG} > ${DEPENDENCY} if [ ${test} == ${OK} ] ; then @@ -36,10 +41,33 @@ function build_package () echo "OK " else mv ${LOG} ${LOG_FAIL_FILE} - echo "FAIL " + printf "FAIL " + echo \"$2\" fi } -build_package $1 +function build_package () +{ + printf "mk %-31s" "$1" + if [ "$2X" == "X" ] ; then # no parameters + clean_files $1 + dirclean $1 + process $1 + elif [ "$2X" == "OKX" ] ; then # Previous build was OK + clean_files $1 + dirclean $1 + process $1 + elif [ "$2X" == "FAILX" ] ; then + clean_files $1 + dirclean $1 + process $1 $3 + elif [ "$2X" == "BROKENX" ] ; then + printf "BROKEN " + echo \"$3\" + fi +} + +build_package $1 $2 $3 + -- cgit v1.2.3