X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=7ec02158e7c99a8461c4c13ecb8d3a79a4cb51f3;hp=8599484f386cd7170c74a0d14691ca7d9bc826e5;hb=f49f350f054e8a7d86765239e2b2a2337c2da9e7;hpb=a9da16b1915733874db39823b6dc506f6b41739e

diff --git a/all b/all
index 8599484f..7ec02158 100755
--- a/all
+++ b/all
@@ -39,23 +39,10 @@ msg()
 	echo "$*"
 }
 
-checksum()
-{
-	if [ -x /usr/bin/md5sum ]; then
-		/usr/bin/md5sum "$@"
-	elif [ -x /bin/md5sum ]; then
-		/bin/md5sum "$@"
-	elif [ -x /usr/bin/cksum ]; then
-		/usr/bin/cksum "$@"
-	else
-		echo "NOCHECKSUM"
-	fi
-}
-
-self=`checksum "$SELF"`
+self=`git hash-object "$SELF"`
 checkself()
 {
-	self_new=`checksum "$SELF"`
+	self_new=`git hash-object "$SELF"`
 	if [ x"$self" != x"$self_new" ]; then
 		msg "./all has changed."
 		if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
@@ -404,20 +391,22 @@ case "$cmd" in
 			enter "$d0/$d" verbose
 			r=`git symbolic-ref HEAD`
 			r=${r#refs/heads/}
-			if git diff HEAD | grep .; then
+			diffdata=`git diff --color HEAD`
+			if [ -n "$diffdata" ]; then
 				# we have uncommitted changes
-				if yesno "Uncommitted changes in \"$r\" in $dv. Commit?"; then
+				if yesno "Uncommitted changes in \"$r\" in $dv. Commit?" 'echo "$diffdata" | less -r'; then
 					verbose git commit -a
 				fi
 			fi
 			rem=`git config "branch.$r.remote" || echo origin`
 			bra=`git config "branch.$r.merge" || echo "$r"`
 			upstream="$rem/$bra"
-			if ! [ git rev-parse "$upstream" ]; then
+			if ! git rev-parse "$upstream" >/dev/null 2>&1; then
 				upstream="`repobranch "$d"`"
 			fi
-			if git log "$upstream".."$r" | grep .; then
-				if yesno "Push \"$r\" in $dv?"; then
+			logdata=`git log --color "$upstream".."$r"`
+			if [ -n "$logdata" ]; then
+				if yesno "Push \"$r\" in $dv?" 'echo "$logdata" | less -r'; then
 					verbose git push "$rem" HEAD
 				fi
 			fi
@@ -803,7 +792,7 @@ case "$cmd" in
 	release-engine-osx)
 		rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/osx/* Xonotic/
 		"$SELF" release-compile osx \
-			'CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"' \
+			'CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"' \
 			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \
 			sdl-debug 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin'
 		;;
@@ -839,13 +828,32 @@ case "$cmd" in
 		# version numnber and stuff like that
 		;;
 	release-buildpk3-transform-raw)
+		dir=$1
 		;;
 	release-buildpk3-transform-normal)
-		# texture: convert to jpeg
+		dir=$1
+		cd "$dir"
+		# texture: convert to jpeg and dds
+		export do_jpeg=true
+		export jpeg_qual_rgb=95
+		export jpeg_qual_a=99
+		export do_dds=true
+		export dds_flags=
+		export do_ogg=false
+		find textures -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
 		;;
 	release-buildpk3-transform-low)
-		# texture: convert to jpeg and downscale
+		dir=$1
+		cd "$dir"
+		# texture: convert to jpeg and dds
 		# music: reduce bitrate
+		export do_jpeg=true
+		export jpeg_qual_rgb=95
+		export jpeg_qual_a=99
+		export do_dds=false
+		export do_ogg=true
+		export ogg_qual=1
+		find textures sound/cdtracks -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
 		;;
 	release-buildpk3)
 		src=$1
@@ -861,7 +869,9 @@ case "$cmd" in
 		rm -rf Xonotic/temp
 		rsync --exclude=.git -vaSHPAX "$src"/ "Xonotic/temp"
 		"$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
-		7za a -tzip -mx=9 "$dst" .
+		cd Xonotic/temp
+		zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
+		cd ../..
 		rm -rf Xonotic/temp
 		;;
 	release-buildpk3s)
@@ -869,28 +879,23 @@ case "$cmd" in
 		shift
 		while [ "$#" -gt 1 ]; do
 			"$SELF" release-buildpk3 "$src" "Xonotic/${src%.pk3dir}$2.pk3" "$1"
+			shift
+			shift
 		done
-		rm -rf "$src"
 		;;
 	release-pack)
-#"$SELF" release-buildpk3s data/font-dejavu.pk3dir                  raw ''
-#"$SELF" release-buildpk3s data/xonotic-data.pk3dir       normal '' raw '-raw' low '-low'
-#"$SELF" release-buildpk3s data/xonotic-maps.pk3dir       normal '' raw '-raw' low '-low'
-#"$SELF" release-buildpk3s data/xonotic-music.pk3dir      normal '' raw '-raw' low '-low'
-#"$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                       low ''
-		"$SELF" release-buildpk3s data/font-dejavu.pk3dir        raw ''
-		"$SELF" release-buildpk3s data/xonotic-data.pk3dir       raw ''
-		"$SELF" release-buildpk3s data/xonotic-maps.pk3dir       raw ''
-		"$SELF" release-buildpk3s data/xonotic-music.pk3dir      raw ''
-		"$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir  raw ''
+		"$SELF" release-buildpk3s data/font-dejavu.pk3dir                  raw ''
+		"$SELF" release-buildpk3s data/xonotic-data.pk3dir       normal '' raw '-raw' low '-low'
+		"$SELF" release-buildpk3s data/xonotic-maps.pk3dir       normal '' raw '-raw' low '-low'
+		"$SELF" release-buildpk3s data/xonotic-music.pk3dir      normal '' raw '-raw' low '-low'
+		"$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                       low ''
 		;;
 	release)
 		"$SELF" release-prepare
-		"$SELF" release-engine
-		"$SELF" release-gamedata
 		"$SELF" release-maps
 		"$SELF" release-finish
 		"$SELF" release-pack
+		"$SELF" release-engine
 		;;
 	*)
 		echo "Usage:"