From 713fc53d88aa6e9c3fd3c13e8be2b188c9245dad Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 6 Sep 2010 11:45:39 +0200 Subject: [PATCH] release compile: fix hash-object logic; do all compiles in background processes and wait for them --- all | 16 +++++++++++----- misc/tools/cached-converter.sh | 4 ++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/all b/all index 29e8a65c..01857ae9 100755 --- 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 7e9d3af8..0bd61fdc 100755 --- 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"` -- 2.39.2