X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fall%2Frelease.subr;h=4fd05e9ba3e941c7072b0c70c468eb1df1ab6aee;hp=4bbb0ec718f69ea6b6694b65fe625b92ae18eea3;hb=4331b691c0e4073402529c9de16fe57d38e3edfb;hpb=52d1e5f4243cf60dfd2a7ff5ab09772d6a2ed4ee

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index 4bbb0ec7..4fd05e9b 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++
@@ -170,7 +169,7 @@ case "$cmd" in
 			verbose date +%Y%m%d > Xonotic/stamp.txt
 			verbose date +%Y%m%d > Xonotic/pk3stamp.txt
 		fi
-		release_git_extract_dir "." "Xonotic" Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh xonotic-linux-dedicated.sh Makefile misc/buildfiles key_0.d0pk COPYING GPL-2 GPL-3
+		release_git_extract_dir "." "Xonotic" Docs misc server xonotic-linux-sdl.sh xonotic-linux-dedicated.sh Makefile misc/buildfiles key_0.d0pk COPYING GPL-2 GPL-3
 		(
 			verbose cd Xonotic
 			verbose mkdir data gmqcc source source/darkplaces source/gmqcc source/d0_blind_id mapping
@@ -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,19 +238,10 @@ 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
 		verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-sdl || good=false
-		verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-glx || good=false
 		verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-dedicated || good=false
 		$good
 		;;
@@ -261,7 +249,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 +406,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
 			(