X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=29e8a65c0aff1273347f5ec05fa864ae1e11b5ad;hp=1296bdae9cecb62e4f6f4ae97d19a2e7a3e3236b;hb=fc00291a3cabd0fc24767a221a9231f27c1a3e97;hpb=1ae12fed4b2f163a7d4559cf9d55cc55ef448d2b

diff --git a/all b/all
index 1296bdae..29e8a65c 100755
--- a/all
+++ b/all
@@ -548,16 +548,10 @@ case "$cmd" in
 				cleanqc=true
 				shift
 				;;
-			-n)
-				cleandp=false
-				cleanqcc=false
-				cleanqc=false
-				shift
-				;;
 			*)
 				cleandp=false
 				cleanqcc=false
-				cleanqc=true # version info
+				cleanqc=false
 				;;
 		esac
 		if [ $# -gt 0 ] && [ x"$1" = x"" ]; then
@@ -662,6 +656,8 @@ case "$cmd" in
 			fi
 		fi
 		set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic -mygames "$@"
+		# change this to:
+		#set -- "darkplaces/darkplaces$client" -xonotic -mygames "$@"
 
 		# if pulseaudio is running: USE IT
 		if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
@@ -904,9 +900,10 @@ case "$cmd" in
 			force=true
 		fi
 		for d in $repos; do
-			enter "$d0/$d" verbose
+			verbose cd "$d0/$d"
 			if $force; then
-				verbose git checkout-index -fa
+				verbose git reset --hard
+				#redundant# verbose git checkout-index -fa
 			fi
 			case "$d" in
 				.)
@@ -936,7 +933,11 @@ case "$cmd" in
 		esac
 		verbose rm -rf Xonotic Xonotic*.zip
 		verbose mkdir -p Xonotic
-		verbose date +%Y%m%d > Xonotic/stamp.txt
+		if [ -n "$RELEASEDATE" ]; then
+			verbose echo "$RELEASEDATE" > Xonotic/stamp.txt
+		else
+			verbose date +%Y%m%d > Xonotic/stamp.txt
+		fi
 		verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | {
 			verbose cd Xonotic
 			verbose mkdir data fteqcc source source/darkplaces source/fteqcc
@@ -995,7 +996,21 @@ case "$cmd" in
 			esac
 			# now rebrand the binaries...
 			for f in $targetfiles; do
-				verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
+				#verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
+				case "$f" in
+					xonotic*.exe)
+						verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "$f"
+						(
+							d=`mktemp -d -t rebrand.XXXXXX`
+							cd "$d"
+							echo "-mygames" > darkplaces.opt
+							zip -9r darkplaces.zip darkplaces.opt
+							cat darkplaces.zip
+							cd "$d0"
+							rm -rf "$d"
+						) >> "$f"
+						;;
+				esac
 			done
 		fi
 		;;
@@ -1034,7 +1049,7 @@ case "$cmd" in
 		verbose "$SELF" release-compile osx \
 			'STRIP=: CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks"' \
 			'' '' \
-			'cl-release' 'darkplaces-glx:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin'
+			'cl-release' 'darkplaces-agl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin'
 		;;
 	release-engine-osx)
 		verbose "$SELF" release-engine-osx-sv-sdl
@@ -1162,6 +1177,7 @@ case "$cmd" in
 				fi
 			done
 		fi
+		verbose export git_src_repo="$d0/$src" # skip hash-object
 		verbose "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
 		verbose zip -9yr "../../$dst" .
 		verbose cd ../..
@@ -1205,16 +1221,19 @@ case "$cmd" in
 		;;
 	release-zip)
 		stamp=`cat Xonotic/stamp.txt`
-		verbose zip -9yr Xonotic-$stamp-common.zip \
+		verbose zip -9yr Xonotic-$stamp-engine.zip \
 			Xonotic/*.dll \
+			Xonotic/bin64/*.dll \
+			Xonotic/*.app \
+			Xonotic/xonotic-* \
+			Xonotic/xonotic.exe
+		verbose cp Xonotic-$stamp-engine.zip Xonotic-$stamp-common.zip
+		verbose zip -9yr Xonotic-$stamp-common.zip \
 			Xonotic/source/*/ \
 			Xonotic/Docs \
 			Xonotic/misc \
 			Xonotic/fteqcc \
 			Xonotic/server \
-			Xonotic/*.app \
-			Xonotic/xonotic-* \
-			Xonotic/xonotic.exe \
 			Xonotic/data/font-nimbussansl-$stamp.pk3
 		verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip
 		verbose zip -0yr Xonotic-$stamp.zip \