X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fall%2Frelease.subr;h=13cc2bccddd1155a207e467c219f3af3cae0b291;hp=37ee05a0591484d23fea8aa3836c83bcd933b091;hb=2d25ba3ea003813c844a6c4a15a6455e0d1a27dd;hpb=7e66523372f8ecb08188906e7ad00f222564035d

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index 37ee05a0..13cc2bcc 100644
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -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++
@@ -207,14 +206,12 @@ case "$cmd" in
 		release_common
 		binary=$1
 		basename=${binary##*/}
+		dpname=darkplaces${basename#xonotic}
 		rev=`( cd "$d0/darkplaces" && git rev-parse HEAD )`
-		verbose wget -O "$binary" "http://beta.xonotic.org/autobuild-bin/$rev/$basename"
-		[ -s "$binary" ]
-		# TODO eventually do the rebranding on travis too.
+		verbose wget -O "$binary" "http://beta.xonotic.org/autobuild-bin/$rev/$dpname"
+		[ -s "$binary" ] || rm -f "$binary"
+		[ -f "$binary" ]
 		case "$binary" in
-			Xonotic/xonotic*.exe)
-				verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "$binary"
-				;;
 			Xonotic/*osx*|Xonotic/*linux*)
 				chmod +x "$binary"
 				;;
@@ -222,38 +219,39 @@ case "$cmd" in
 		;;
 	release-engine-win32)
 		release_common
-		verbose "$SELF" release-getbinary Xonotic/xonotic.exe || true
-		verbose "$SELF" release-getbinary Xonotic/xonotic-sdl.exe || true
-		verbose "$SELF" release-getbinary Xonotic/xonotic-dedicated.exe || true
+		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
 		;;
 	release-engine-win64)
 		release_common
-		verbose "$SELF" release-getbinary Xonotic/xonotic-x64.exe || true
-		verbose "$SELF" release-getbinary Xonotic/xonotic-x64-sdl.exe || true
-		verbose "$SELF" release-getbinary Xonotic/xonotic-x64-dedicated.exe || true
+		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
 		;;
 	release-engine-osx)
 		release_common
-		verbose "$SELF" release-getbinary Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin || true
-		verbose "$SELF" release-getbinary Xonotic/xonotic-osx-dedicated || true
-		;;
-	release-engine-linux32)
-		release_common
-		verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-glx || true
-		verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-sdl || true
-		verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-dedicated || true
+		good=true
+		verbose "$SELF" release-getbinary Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin || good=false
+		verbose "$SELF" release-getbinary Xonotic/xonotic-osx-dedicated || good=false
+		$good
 		;;
 	release-engine-linux64)
 		release_common
-		verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-glx || true
-		verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-sdl || true
-		verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-dedicated || true
+		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
 		;;
 	release-engine)
 		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
@@ -435,6 +433,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 "$d0/mediasource/gfx/luma" "$PWD" "$versionstr"
 		fi
 		if [ x"$src" = x"data/xonotic-maps.pk3dir" ]; then
 			for X in ../../data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
@@ -478,6 +477,7 @@ case "$cmd" in
 		;;
 	release-pack)
 		release_common
+		verbose "$SELF" release-buildpk3s data/font-unifont.pk3dir      raw ''
 		verbose "$SELF" release-buildpk3s data/font-xolonium.pk3dir     raw ''
 		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'
@@ -525,6 +525,7 @@ case "$cmd" in
 				Xonotic/gmqcc \
 				Xonotic/server \
 				Xonotic/key_0.d0pk \
+				Xonotic/data/font-unifont-$pk3stamp.pk3 \
 				Xonotic/data/font-xolonium-$pk3stamp.pk3
 			verbose cp Xonotic-$stamp-enginesource$suffix.zip Xonotic-$stamp-source$suffix.zip
 			verbose mkzip Xonotic-$stamp-source$suffix.zip \