X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=all;h=1d0e4633fbf591155e078c188e5c04026798e2c2;hb=e554f7ecf1d97b1096ea01f081bcb6bdcf1f1e87;hp=051a5e8e5ace91e81422c302d0c33fdcf54910a5;hpb=f0c8c174622fa5420ca4af4b4121c583b0f208e9;p=xonotic%2Fxonotic.git

diff --git a/all b/all
index 051a5e8e..1d0e4633 100755
--- a/all
+++ b/all
@@ -275,6 +275,7 @@ fix_upstream_rebase()
 	r_r=${r_r#refs/heads/}
 	r_rem=`git config "branch.$r_rem.remote" || $ECHO origin`
 	r_bra=`git config "branch.$r_bra.merge" || $ECHO "$r_r"`
+	r_bra=${r_bra#refs/heads/}
 	if [ x"$r_me" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
 		if [ x"$r_other" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
 			return
@@ -546,6 +547,13 @@ case "$cmd" in
 		esac
 		case "$location" in
 			best)
+				# if we fetched via ssh://, switch to git:// for fetching and keep using ssh:// for pushing
+				case "$base" in
+					ssh://*)
+						pushbase=$base
+						base=git://git.xonotic.org/xonotic/
+						;;
+				esac
 				newbase=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,:// .git.xonotic.org/,"`
 				case "$newbase" in
 					*\ *)
@@ -1429,13 +1437,7 @@ case "$cmd" in
 	release-prepare)
 		#"$SELF" each git clean -fxd
 		case "$RELEASETYPE" in
-			beta)
-				msg "Building a BETA"
-				;;
-			release)
-				msg "Building a RELEASE"
-				;;
-			*)
+			'')
 				$ECHO >&2 -n "$ESC[2J$ESC[H"
 				msg ""
 				msg ""
@@ -1477,6 +1479,12 @@ case "$cmd" in
 				#   (YYYYMMDD)
 				exit 1
 				;;
+			release)
+				msg "Building a FINISHED RELEASE"
+				;;
+			*)
+				msg "Building a $RELEASETYPE"
+				;;
 		esac
 		verbose rm -rf Xonotic Xonotic*.zip
 		verbose mkdir -p Xonotic
@@ -1487,7 +1495,7 @@ case "$cmd" in
 		fi
 		verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles key_0.d0pk | {
 			verbose cd Xonotic
-			verbose mkdir data fteqcc source source/darkplaces source/fteqcc
+			verbose mkdir data fteqcc source source/darkplaces source/fteqcc source/d0_blind_id
 			verbose tar xvf -
 			verbose rm -rf misc/builddeps
 			verbose mv misc/buildfiles/win32/* . || true
@@ -1517,6 +1525,14 @@ case "$cmd" in
 			verbose cd Xonotic/source
 			verbose tar xvf -
 		}
+		{
+			verbose cd d0_blind_id
+			verbose git archive --format=tar HEAD
+		} | {
+			verbose cd Xonotic/source/d0_blind_id
+			verbose tar xvf -
+			verbose sh autogen.sh
+		}
 		rm -f Xonotic/key_15.d0pk
 		;;
 	release-compile-run)
@@ -1644,15 +1660,7 @@ case "$cmd" in
 		verbose "$SELF" update-maps
 		;;
 	release-qc)
-		case "$RELEASETYPE" in
-			beta)
-				verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
-				# back out of: source/qcsrc/server
-				;;
-			release)
-				verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 FTEQCCFLAGS_WATERMARK= clean all
-				;;
-		esac
+		verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
 		verbose rm -f Xonotic/source/*/fteqcc.log
 		;;
 	release-buildpk3-transform-raw)
@@ -1733,8 +1741,10 @@ case "$cmd" in
 			patch=$(($gv - $major * 10000 - $minor * 100))
 			versionstr="$major.$minor.$patch"
 			case "$RELEASETYPE" in
-				beta)
-					versionstr="$versionstr""beta"
+				release)
+					;;
+				*)
+					versionstr="$versionstr$RELEASETYPE"
 					;;
 			esac
 			verbose sed -i "
@@ -1742,6 +1752,13 @@ case "$cmd" in
 				s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
 				s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/;
 			" defaultXonotic.cfg
+			case "$RELEASETYPE" in
+				release)
+					echo "" >> defaultXonotic.cfg
+					echo "// nicer menu" >> defaultXonotic.cfg
+					echo "set menu_watermark \"\"" >> defaultXonotic.cfg
+					;;
+			esac
 			(
 				verbose cd gfx/menu/luminos
 				verbose cp "$d0"/mediasource/gfx/menu/luminos_versionbuilder/background_l2.svg .
@@ -1804,7 +1821,7 @@ case "$cmd" in
 		# exe and dll files do not need +x, so this makes them eligible for 7zip compression too
 		chmod a-x Xonotic/*.exe Xonotic/*.dll || true
 		# let's pass crypto import laws of some nasty countries
-		crypto_libs=`find Xonotic -name \*d0_rijndael\*`
+		crypto_libs=`find Xonotic -name \*d0_rijndael\*.so -o -name \*d0_rijndael\*.dylib -o -name \*d0_rijndael\*.dll -o -name \*d0_rijndael\*.c`
 		if [ -n "$crypto_libs" ]; then
 			verbose mkzip Xonotic-$stamp-crypto.zip \
 				$crypto_libs
@@ -1839,12 +1856,6 @@ case "$cmd" in
 			Xonotic/data/xonotic-$stamp-data-low.pk3 \
 			Xonotic/data/xonotic-$stamp-maps-low.pk3 \
 			Xonotic/data/xonotic-$stamp-music-low.pk3
-#		verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp-high.zip
-#		verbose mkzip0 Xonotic-$stamp-high.zip \
-#			Xonotic/data/xonotic-$stamp-data-raw.pk3 \
-#			Xonotic/data/xonotic-$stamp-maps-raw.pk3 \
-#			Xonotic/data/xonotic-$stamp-music.pk3 \
-#			Xonotic/data/xonotic-$stamp-nexcompat.pk3
 		verbose mv Xonotic-$stamp-common.zip Xonotic-$stamp-lowdds.zip
 		verbose mkzip0 Xonotic-$stamp-lowdds.zip \
 			Xonotic/data/xonotic-$stamp-data-lowdds.pk3 \