From: Rudolf Polzer <divVerent@alientrap.org>
Date: Tue, 7 Sep 2010 17:50:14 +0000 (+0200)
Subject: Merge branch 'divVerent/crypto2' of ssh://git.xonotic.org/xonotic into divVerent... 
X-Git-Tag: xonotic-v0.1.0preview~125^2~42
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=f3922b7a08f53c82092930237c249064ed47ecaf;hp=2038538b005396681eb97c3aaa26681695696d8b

Merge branch 'divVerent/crypto2' of ssh://git.xonotic.org/xonotic into divVerent/crypto2
---

diff --git a/all b/all
index 55fba078..74b4f3d4 100755
--- a/all
+++ b/all
@@ -1084,11 +1084,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
@@ -1193,6 +1199,7 @@ case "$cmd" in
 				fi
 			done
 		fi
+		verbose export git_src_repo="$d0/$src" # skip hash-object
 		verbose "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
 		verbose zip -9yr "../../$dst" .
 		verbose cd ../..
diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index 36126588..0bd61fdc 100755
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -12,6 +12,7 @@ set -e
 : ${do_ogg:=false}
 : ${ogg_qual:=1}
 : ${del_src:=false}
+: ${git_src_repo:=}
 
 me=$0
 case "$me" in
@@ -47,9 +48,16 @@ cached()
 	if [ x"$infile1/../$infile2" = x"$lastinfiles" ]; then
 		sum=$lastinfileshash
 	else
-		sum=`git hash-object "$infile1"`
-		if [ -n "$infile2" ]; then
-			sum=$sum`git hash-object "$infile2"`
+		if [ -n "$git_src_repo" ]; then
+			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"`
+			fi
+		else
+			sum=`git hash-object "$infile1"`
+			if [ -n "$infile2" ]; then
+				sum=$sum`git hash-object "$infile2"`
+			fi
 		fi
 		lastinfileshash=$sum
 	fi