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 4b19c97ae3e11f3fb4fd8d3b885289a69d702f73..bcdc0b7a93d0cd603bd91fbca0e4c4792d27061e 100755 (executable)
--- 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 075b044aa491be45314b22e2006f4ed147880a1e..279156440c1d1801bfd5469055e72c8f96edee8a 100755 (executable)
--- 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