Fix some stuff for xonotic and make check-proj actually use the options line correctly.

This commit is contained in:
Dale Weiler 2013-09-25 04:23:06 -04:00
parent 13ef558fff
commit d664b9f607
2 changed files with 14 additions and 13 deletions

View file

@ -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

View file

@ -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