release compile: fix hash-object logic; do all compiles in background processes and...

diff --git a/all b/all
index 29e8a65c0aff1273347f5ec05fa864ae1e11b5ad..01857ae972ac73a1d48e02081da442f7403d1aba 100755 (executable)
--- a/all
+++ b/all
@@ -1068,11 +1068,17 @@ case "$cmd" in
                        release 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated'
                ;;
        release-engine)
-               verbose "$SELF" release-engine-win64
-               verbose "$SELF" release-engine-osx
-               verbose "$SELF" release-engine-win32
-               verbose "$SELF" release-engine-linux32
-               verbose "$SELF" release-engine-linux64
+               verbose "$SELF" release-engine-linux32 &
+               verbose "$SELF" release-engine-linux64 &
+               verbose "$SELF" release-engine-win32 &
+               verbose "$SELF" release-engine-win64 &
+               verbose "$SELF" release-engine-osx &
+               wait %1
+               wait %2
+               wait %3
+               wait %4
+               wait %5
+               wait
                ;;
        release-maps)
                verbose "$SELF" update-maps

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index 7e9d3af807527c7bb7e10538e3d8f22bd7383380..0bd61fdcd06aa8d913fed0b7ab18b0ebc624f27d 100755 (executable)
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -49,9 +49,9 @@ cached()
                sum=$lastinfileshash
        else
                if [ -n "$git_src_repo" ]; then
-                       sum=`( cd "$git_src_repo"; git rev-parse --revs-only HEAD:"$infile1" | grep . ) || git hash-object "$infile1"`
+                       sum=`( cd "$git_src_repo"; git rev-parse --revs-only HEAD:"${infile1#./}" | grep . ) || git hash-object "$infile1"`
                        if [ -n "$infile2" ]; then
-                               sum=$sum`( cd "$git_src_repo"; git rev-parse --revs-only HEAD:"$infile2" | grep . ) || git hash-object "$infile2"`
+                               sum=$sum`( cd "$git_src_repo"; git rev-parse --revs-only HEAD:"${infile2#./}" | grep . ) || git hash-object "$infile2"`
                        fi
                else
                        sum=`git hash-object "$infile1"`