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

This commit is contained in:
Rudolf Polzer 2010-09-06 11:45:39 +02:00
parent 5fa6c64546
commit 713fc53d88
2 changed files with 13 additions and 7 deletions

16
all
View File

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

View File

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