X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=c0ed752479214f4e006dc4a7b952861e5f0c8cba;hp=1d6cde8db3e43cdf0ebceae34c96224c5956a35d;hb=f51b93c9f4f82d89cbad3d0d63569e44eea217b9;hpb=8d86e11354671e3e1f5a628998f23193f82ee802

diff --git a/all b/all
index 1d6cde8d..c0ed7524 100755
--- a/all
+++ b/all
@@ -964,13 +964,6 @@ case "$cmd" in
 		;;
 	release-maps)
 		"$SELF" update-maps
-		for X in data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
-			if [ -f "$X" ]; then
-				cd Xonotic/data/xonotic-maps.pk3dir
-				unzip ../../../"$X"
-				cd ../../..
-			fi
-		done
 		;;
 	release-finish)
 		# version numnber and stuff like that
@@ -991,7 +984,7 @@ case "$cmd" in
 		export do_dds=true
 		export dds_flags=
 		export do_ogg=false
-		find textures -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
+		find models textures -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
 		;;
 	release-buildpk3-transform-low)
 		dir=$1
@@ -999,12 +992,25 @@ case "$cmd" in
 		# texture: convert to jpeg and dds
 		# music: reduce bitrate
 		export do_jpeg=true
-		export jpeg_qual_rgb=95
-		export jpeg_qual_a=99
+		export jpeg_qual_rgb=85
+		export jpeg_qual_a=95
 		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
+		find models textures sound/cdtracks -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
+		;;
+	release-buildpk3-transform-lowdds)
+		dir=$1
+		cd "$dir"
+		# texture: convert to jpeg and dds
+		# music: reduce bitrate
+		export do_jpeg=false
+		export do_dds=true
+		export dds_flags=
+		export do_ogg=true
+		export ogg_qual=1
+		export del_src=true
+		find models textures sound/cdtracks -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
 		;;
 	release-buildpk3)
 		src=$1
@@ -1031,6 +1037,16 @@ case "$cmd" in
 			cp "$src"/csprogs.dat Xonotic/temp/
 			cp "$src"/menu.dat Xonotic/temp/
 		fi
+		if [ x"$src" = x"data/xonotic-maps.pk3dir" ]; then
+			for X in data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
+				if [ -f "$X" ]; then
+					(
+						cd Xonotic/data/xonotic-maps.pk3dir
+						unzip ../../../"$X"
+					)
+				fi
+			done
+		fi
 		"$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
 		cd Xonotic/temp
 		zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
@@ -1047,19 +1063,30 @@ case "$cmd" in
 		done
 		;;
 	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-nimbussansl.pk3dir             raw ''
+		"$SELF" release-buildpk3s data/xonotic-data.pk3dir       normal '' raw '-raw' low '-low' lowdds '-lowdds'
+		"$SELF" release-buildpk3s data/xonotic-maps.pk3dir       normal '' raw '-raw' low '-low' lowdds '-lowdds'
+		"$SELF" release-buildpk3s data/xonotic-music.pk3dir      normal '' raw '-raw' low '-low' lowdds '-lowdds'
+		"$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                       low ''     lowdds '-lowdds'
+		;;
+	release-pack-needsx11)
+		case "$DISPLAY" in
+			'')
+				startx "$SELF" release-pack -- /usr/bin/Xvfb :7
+				;;
+			*)
+				"$SELF" release-pack
+				;;
+		esac
 		;;
 	release)
 		"$SELF" release-prepare
-		"$SELF" release-engine
-		"$SELF" release-maps
-		"$SELF" release-finish
-		"$SELF" release-qc
-		"$SELF" release-pack
+		"$SELF" release-maps &
+		"$SELF" release-engine &
+		"$SELF" release-finish &
+		"$SELF" release-qc &
+		wait
+		"$SELF" release-pack-needsx11
 		;;
 
 	*)