X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fall%2Frelease.subr;h=078c09171c0c93b7355e8c956af458ea4cd408f0;hp=5059ed9783d92a7df35c8260e3fa36818670ec20;hb=c303237ecf7ae679334a8b60b4f9363404f69552;hpb=d5c8c7b29411ee2c0fc4936b6e194a57487ca403

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index 5059ed97..078c0917 100644
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -88,7 +88,7 @@ release_common()
 
 	getversion()
 	{
-		gv=`grep "^gameversion " "$1/defaultXonotic.cfg" | awk '{ print $2 }'`
+		gv=`grep "^gameversion " "$1/xonotic-common.cfg" | awk '{ print $2 }'`
 		major=$(($gv / 10000))
 		minor=$((($gv / 100) - ($major * 100)))
 		patch=$(($gv - ($major * 10000) - ($minor * 100)))
@@ -130,7 +130,6 @@ case "$cmd" in
 				# - .ssh/config must be configured so the following
 				#   host names are reachable and have a compile
 				#   infrastructure set up:
-				#   - xonotic-build-linux32 (with gcc on x86)
 				#   - xonotic-build-linux64 (with gcc on x86_64)
 				#   - xonotic-build-win32 (with i586-mingw32msvc-g++)
 				#   - xonotic-build-win64 (with amd64-mingw32msvc-g++
@@ -222,7 +221,6 @@ case "$cmd" in
 		release_common
 		good=true
 		verbose "$SELF" release-getbinary Xonotic/xonotic-x86.exe || good=false
-		verbose "$SELF" release-getbinary Xonotic/xonotic-x86-wgl.exe || good=false
 		verbose "$SELF" release-getbinary Xonotic/xonotic-x86-dedicated.exe || good=false
 		$good
 		;;
@@ -230,7 +228,6 @@ case "$cmd" in
 		release_common
 		good=true
 		verbose "$SELF" release-getbinary Xonotic/xonotic.exe || good=false
-		verbose "$SELF" release-getbinary Xonotic/xonotic-wgl.exe || good=false
 		verbose "$SELF" release-getbinary Xonotic/xonotic-dedicated.exe || good=false
 		$good
 		;;
@@ -241,14 +238,6 @@ case "$cmd" in
 		verbose "$SELF" release-getbinary Xonotic/xonotic-osx-dedicated || good=false
 		$good
 		;;
-	release-engine-linux32)
-		release_common
-		good=true
-		verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-sdl || good=false
-		verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-glx || good=false
-		verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-dedicated || good=false
-		$good
-		;;
 	release-engine-linux64)
 		release_common
 		good=true
@@ -261,7 +250,6 @@ case "$cmd" in
 		release_common
 		# TODO report failures here.
 		good=false
-		verbose "$SELF" release-engine-linux32 && good=true
 		verbose "$SELF" release-engine-linux64 && good=true
 		verbose "$SELF" release-engine-win32 && good=true
 		verbose "$SELF" release-engine-win64 && good=true
@@ -419,21 +407,21 @@ case "$cmd" in
 					s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
 					s/^gameversion_min [0-9]*/gameversion_min     0/;
 					s/^gameversion_max [0-9]*/gameversion_max  9999/;
-				" < defaultXonotic.cfg > defaultXonotic.cfg.new
+				" < xonotic-common.cfg > xonotic-common.cfg.new
 			else
 				# >= 1.0
 				verbose sed "
 					s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
 					s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
 					s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/;
-				" < defaultXonotic.cfg > defaultXonotic.cfg.new
+				" < xonotic-common.cfg > xonotic-common.cfg.new
 			fi
-			mv defaultXonotic.cfg.new defaultXonotic.cfg
+			mv xonotic-common.cfg.new xonotic-common.cfg
 			case "$RELEASETYPE" in
 				release)
-					echo "" >> defaultXonotic.cfg
-					echo "// nicer menu" >> defaultXonotic.cfg
-					echo "set menu_watermark \"\"" >> defaultXonotic.cfg
+					echo "" >> xonotic-common.cfg
+					echo "// nicer menu" >> xonotic-common.cfg
+					echo "set menu_watermark \"\"" >> xonotic-common.cfg
 					;;
 			esac
 			(
@@ -443,7 +431,7 @@ case "$cmd" in
 				verbose "$d0"/mediasource/gfx/menu/luminos_versionbuilder/versionbuilder "$versionstr"
 				verbose rm background_l2.svg
 			)
-			verbose "$d0"/mediasource/gfx/luma/render-version.sh "$PWD" "$versionstr"
+			verbose "$d0"/mediasource/gfx/luma/render-version.sh "$d0/mediasource/gfx/luma" "$PWD" "$versionstr"
 		fi
 		if [ x"$src" = x"data/xonotic-maps.pk3dir" ]; then
 			for X in ../../data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
@@ -492,7 +480,7 @@ case "$cmd" in
 		verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir             low '-low' normaldds ''                    normal '-high'
 		verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir             low '-low' normaldds '' mapping '-mapping' normal '-high'
 		verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir     raw '' low '-low'
-		verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                   normaldds ''
+		verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir        low '-low' normaldds ''                    normal '-high'
 		;;
 	release-pack-needsx11)
 		release_common
@@ -553,12 +541,14 @@ case "$cmd" in
 			verbose mkzip0 Xonotic-$stamp-low$suffix.zip \
 				Xonotic/data/xonotic-$pk3stamp-data-low.pk3 \
 				Xonotic/data/xonotic-$pk3stamp-maps-low.pk3 \
-				Xonotic/data/xonotic-$pk3stamp-music-low.pk3
+				Xonotic/data/xonotic-$pk3stamp-music-low.pk3 \
+				Xonotic/data/xonotic-$pk3stamp-nexcompat-low.pk3
 			verbose mv Xonotic-$stamp-common$suffix.zip Xonotic-$stamp-high$suffix.zip
 			verbose mkzip0 Xonotic-$stamp-high$suffix.zip \
 				Xonotic/data/xonotic-$pk3stamp-data-high.pk3 \
 				Xonotic/data/xonotic-$pk3stamp-maps-high.pk3 \
-				Xonotic/data/xonotic-$pk3stamp-music.pk3
+				Xonotic/data/xonotic-$pk3stamp-music.pk3 \
+				Xonotic/data/xonotic-$pk3stamp-nexcompat-high.pk3
 			# let's pass crypto import laws of some nasty countries
 			find Xonotic -name \*d0_rijndael\*.so -o -name \*d0_rijndael\*.dylib -o -name \*d0_rijndael\*.dll -o -name \*d0_rijndael\*.c -delete
 		done