X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=misc%2Ftools%2Fall%2Frelease.subr;h=eebf677af905901f9b07126653c6b4ac02b76bc7;hb=7d4a334f356e65cf9bcb5f44e634bb7db9104497;hp=93c2586557e6df667f3119bf65ba081ea05ebaab;hpb=4223dcb8633421a4b5a94c8ebda31e629b4bd7eb;p=xonotic%2Fxonotic.git

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index 93c25865..eebf677a 100644
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -200,14 +200,17 @@ case "$cmd" in
 		)
 		rm -f Xonotic/key_15.d0pk
 		(
-			verbose cd Xonotic/mapping
-			verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20120301.tar.bz2
-			verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20120301-win32-7z.exe
-			for X in *-7z.exe; do
-				7za x "$X"
-				rm -f "$X"
-			done
+			# bones_was_here: don't ship 10 year old netradiant
+			# also seems better to update netradiant independently of xonotic versions
+			#verbose cd Xonotic/mapping
+			#verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20120301.tar.bz2
+			#verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20120301-win32-7z.exe
+			#for X in *-7z.exe; do
+			#	7za x "$X"
+			#	rm -f "$X"
+			#done
 			# TODO possibly include other tools?
+			printf "Please find links to NetRadiant builds at https://netradiant.gitlab.io or https://xonotic.org/download\nNetRadiant source available at https://gitlab.com/xonotic/netradiant\n" > NetRadiant\ links.txt
 		)
 		./all each git rev-parse HEAD > Xonotic/misc/git-revisions.txt
 		;;
@@ -340,7 +343,7 @@ case "$cmd" in
 		#verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-dedicated || good=false
 		#$good
 		verbose "$SELF" release-compile linux64 \
-			'STRIP=: CC="gcc -m64 -g1 -I../../../.deps/include -L../../../.deps/lib -DSUPPORTIPV6" DP_LINK_CRYPTO=shared LIB_CRYPTO="../../../.deps/lib/libd0_blind_id.a ../../../.deps/lib/libgmp.a" DP_LINK_CRYPTO_RIJNDAEL=dlopen DP_LINK_JPEG=shared LIB_JPEG=/usr/lib/x86_64-linux-gnu/libjpeg.a DP_LINK_ODE=shared CFLAGS_ODE="-DUSEODE -DLINK_TO_LIBODE -DdDOUBLE" LIB_ODE="../../../.deps/lib/libode.a -lstdc++ -pthread" DP_LINK_ZLIB=shared' \
+			'STRIP=: CC="gcc -m64 -g1 -I../../../.deps/include -L../../../.deps/lib -DSUPPORTIPV6" DP_LINK_CRYPTO=shared LIB_CRYPTO="../../../.deps/lib/libd0_blind_id.a ../../../.deps/lib/libgmp.a" DP_LINK_CRYPTO_RIJNDAEL=shared DP_LINK_JPEG=shared LIB_JPEG=/usr/lib/x86_64-linux-gnu/libjpeg.a DP_LINK_ODE=shared CFLAGS_ODE="-DUSEODE -DLINK_TO_LIBODE -DdDOUBLE" LIB_ODE="../../../.deps/lib/libode.a -lstdc++ -pthread" DP_LINK_ZLIB=shared' \
 			release 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated'
 		;;
 	release-engine)
@@ -461,16 +464,18 @@ case "$cmd" in
 				# pre-1.0: compatible with any other pre-1.0
 				verbose sed "
 					s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
-					s/^gameversion_min [0-9]*/gameversion_min     0/;
 					s/^gameversion_max [0-9]*/gameversion_max  9999/;
 				" < xonotic-common.cfg > xonotic-common.cfg.new
+				# Following line was included in sed above, ref https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/1034
+				# s/^gameversion_min [0-9]*/gameversion_min     0/;
 			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 ))/;
 				" < xonotic-common.cfg > xonotic-common.cfg.new
+				# Following line was included in sed above, ref https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/1034
+				# s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
 			fi
 			mv xonotic-common.cfg.new xonotic-common.cfg
 			case "$RELEASETYPE" in