From: Dale Weiler Date: Wed, 25 Sep 2013 08:23:06 +0000 (-0400) Subject: Fix some stuff for xonotic and make check-proj actually use the options line correctly. X-Git-Tag: 0.3.5~80 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d664b9f6076ab1a8b8357e918f7a04ff8a0a029a;p=xonotic%2Fgmqcc.git Fix some stuff for xonotic and make check-proj actually use the options line correctly. --- diff --git a/misc/check-proj.sh b/misc/check-proj.sh index 4b19c97..bcdc0b7 100755 --- a/misc/check-proj.sh +++ b/misc/check-proj.sh @@ -99,37 +99,34 @@ env -i type gmqcc 1>/dev/null 2>&1 || { pushd ~/.gmqcc/testsuite/projects > /dev/null find . -maxdepth 1 -mindepth 1 -type d -printf "%f\n" | while read -r line do - error=0 echo -n "compiling $line... " pushd "$line" > /dev/null # does the project have multiple subprojects? if [ -f dirs ]; then + echo "" cat dirs | while read -r dir do # change to subproject + echo -n " compiling $dir... " pushd "$dir" > /dev/null - "$gmqcc_bin" $(cat ../../../options | grep "$line:" | awk '{print $2}') > /dev/null 2>&1 + "$gmqcc_bin" $(cat ../../../options | grep "$line:" | awk '{print substr($0, index($0, $2))}') > /dev/null 2>&1 if [ $? -ne 0 ]; then - error=1 + echo "error" + else + echo "success" fi popd > /dev/null done # nope only one project else - "$gmqcc_bin" $(cat ../../options | grep "$line:" | awk '{print $2}') > /dev/null 2>&1 + "$gmqcc_bin" $(cat ../../options | grep "$line:" | awk '{print substr($0, index($0, $2))}') > /dev/null 2>&1 if [ $? -ne 0 ]; then - error=1 + echo "error" + else + echo "success" fi fi - - # status - if [ $error -ne 0 ]; then - echo "error" - else - echo "success" - fi - popd > /dev/null done diff --git a/misc/xonotic_export.sh b/misc/xonotic_export.sh index 075b044..2791564 100755 --- a/misc/xonotic_export.sh +++ b/misc/xonotic_export.sh @@ -25,6 +25,10 @@ else echo "complete" fi +echo -n "generated precache-for-csqc ..." +./collect-precache.sh > /dev/null 2>&1 +echo "complete" + echo -n "removing redundant files ..." rm -f Makefile rm -f autocvarize-update.sh