X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=misc%2Fcheck-proj.sh;h=36b3774e1e2841f294c7bca22d0c9d45cb32e411;hb=fa14ca93d2b60f722d55c24214fde7ac84581ad0;hp=2d94667534761b430335e184b872381dceeb4732;hpb=6a235dc25fcd1adff69603374016530b321e6a16;p=xonotic%2Fgmqcc.git

diff --git a/misc/check-proj.sh b/misc/check-proj.sh
index 2d94667..36b3774 100755
--- a/misc/check-proj.sh
+++ b/misc/check-proj.sh
@@ -12,7 +12,8 @@ download_hashes=$(wget -qO- ${hashes})
 download_options=$(wget -qO- ${options})
 
 download() {
-    pushd ~/.gmqcc/testsuite >> /dev/null
+    local old="$PWD"
+    cd ~/.gmqcc/testsuite
     echo "$download_list" | while read -r line
     do
         echo "downloading $line ..."
@@ -22,7 +23,7 @@ download() {
     echo "$download_hashes" > ~/.gmqcc/testsuite/hashes
     echo "$download_options" > ~/.gmqcc/testsuite/options
 
-    popd >> /dev/null
+    cd "$old"
 }
 
 if [ -z "$download_list" -o -z "$download_hashes" -o -z "$download_options" ]; then
@@ -44,9 +45,9 @@ if [ -f ~/.gmqcc/testsuite/hashes -a -f ~/.gmqcc/testsuite/options ]; then
     echo "$download_hashes" > /tmp/gmqcc_download_hashes
     echo "$download_options" > /tmp/gmqcc_download_options
 
-    diff -u ~/.gmqcc/testsuite/hashes /tmp/gmqcc_download_hashes >> /dev/null
+    diff -u ~/.gmqcc/testsuite/hashes /tmp/gmqcc_download_hashes > /dev/null
     check_hash=$?
-    diff -u ~/.gmqcc/testsuite/options /tmp/gmqcc_download_options >> /dev/null
+    diff -u ~/.gmqcc/testsuite/options /tmp/gmqcc_download_options > /dev/null
     check_opts=$?
 
     if [ $check_hash -ne 0 -o $check_opts -ne 0 ]; then
@@ -68,14 +69,15 @@ fi
 
 if [ ! -d ~/.gmqcc/testsuite/projects ]; then
     mkdir -p ~/.gmqcc/testsuite/projects
-    pushd ~/.gmqcc/testsuite/projects >> /dev/null
-    echo "$(ls ../ | cat | grep -v '^hashes$' | grep -v '^projects$')" | while read -r line
+    old="$PWD"
+    cd ~/.gmqcc/testsuite/projects
+    echo "$(ls ../ | cat | grep -v '^hashes$' | grep -v '^projects$' | grep -v '^options$')" | while read -r line
     do
         echo "extracting project $line"
         mkdir "$(echo "$line" | sed 's/\(.*\)\..*/\1/')"
         unzip -qq "../$line" -d $(echo "$line" | sed 's/\(.*\)\..*/\1/')
     done
-    popd >> /dev/null
+    cd "$old"
 else
     echo "previous state exists, using it"
 fi
@@ -96,18 +98,41 @@ env -i type gmqcc 1>/dev/null 2>&1 || {
     fi
 }
 
-pushd ~/.gmqcc/testsuite/projects >> /dev/null
-find . -maxdepth 1 -mindepth 1 -type d -printf "%f\n" | while read -r line
+end_dir="$PWD"
+cd ~/.gmqcc/testsuite/projects
+start="$PWD"
+find . -maxdepth 1 -mindepth 1 -type d | while read -r line
 do
+    line="${line#./}"
     echo -n "compiling $line... "
-    pushd "$line" >> /dev/null
-    "$gmqcc_bin" $(cat ../../options | grep "$line:" | awk '{print $2}') > /dev/null 2>&1
-    if [ $? -ne 0 ]; then
-        echo "error"
+    cd "${start}/${line}"
+
+    # 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... "
+            old="$PWD"
+            cd "$dir"
+            "$gmqcc_bin" $(cat ../../../options | grep "$line:" | awk '{print substr($0, index($0, $2))}') > /dev/null 2>&1
+            if [ $? -ne 0 ]; then
+                echo "error"
+            else
+                echo "success"
+            fi
+            cd "$old"
+        done
+    # nope only one project
     else
-        echo "success"
+        "$gmqcc_bin" $(cat ../../options | grep "$line:" | awk '{print substr($0, index($0, $2))}') > /dev/null 2>&1
+        if [ $? -ne 0 ]; then
+            echo "error"
+        else
+            echo "success"
+        fi
     fi
-
-    popd >> /dev/null
 done
-popd >> /dev/null
+
+cd "$end_dir"