X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=9af0b7c4db9ad5be1d24b378aa8c7ce1e5f6580c;hp=f584ede593a5ffd9960bc3152758c4aea88e9298;hb=b08b89a6cfb865dbe116089d2ae3458367f0953a;hpb=5ac6145a7add94d5e387de721d735357aa658883

diff --git a/all b/all
index f584ede5..9af0b7c4 100755
--- a/all
+++ b/all
@@ -108,7 +108,10 @@ yesno()
 	while [ x"$yesno" != x"y" -a x"$yesno" != x"n" ]; do
 		eval "$2"
 		$ECHO "$1"
-		IFS= read -r yesno
+		if ! IFS= read -r yesno; then
+			yesno=n
+			break
+		fi
 	done
 	[ x"$yesno" = x"y" ]
 }
@@ -235,7 +238,7 @@ listrepos()
 		fi
 		# if we have .no file, skip
 		if [ -f "$d.no" ]; then
-			msg "Repository $d disabled by a .no file, delete $p.no to enable"
+			msg "Repository $d disabled by a .no file, delete $d.no to enable"
 			continue
 		fi
 		# if we have matching pk3, skip
@@ -264,11 +267,77 @@ fi
 cmd=$1
 shift
 
+case "$cmd" in
+	release|release-*)
+		export LC_ALL=C
+
+		release_args="$cmd $*"
+		msg "*** $release_args: start"
+		release_starttime=`date +%s`
+		release_end()
+		{
+			release_endtime=`date +%s`
+			release_deltatime=$(($release_endtime - $release_starttime))
+			msg "*** $release_args: $release_deltatime seconds"
+		}
+		trap release_end EXIT
+		release_tempstarttime=$release_starttime
+		release_timereport()
+		{
+			release_endtime=`date +%s` # RELEASE NOW!!!
+			if [ -n "$*" ]; then
+				release_deltatime=$(($release_endtime - $release_tempstarttime))
+				msg "**** $release_args: $*: $release_deltatime seconds"
+			fi
+			release_tempstarttime=$release_endtime
+		}
+		release_git_extract_dir()
+		{
+			release_src=$1; shift
+			release_dst=$1; shift
+			# try to create a hardlink
+			if ln -f "$release_src/.git/HEAD" "$release_dst/.hardlink-test"; then
+				rm -f "$release_dst/.hardlink-test"
+				{
+					verbose cd "$release_src"
+					git ls-files HEAD -- "$@"
+				} | {
+					while IFS= read -r F; do
+						case "$F" in */*) mkdir -p "$release_dst/${F%/*}" ;; esac
+						verbose ln -f "$release_src/$F" "$release_dst/$F"
+					done
+				}
+			else
+				{
+					verbose cd "$release_src"
+					verbose git archive --format=tar HEAD -- "$@"
+				} | {
+					verbose cd "$release_dst"
+					verbose tar xvf -
+				}
+			fi
+		}
+		;;
+esac
+
 fix_upstream_rebase()
 {
 	if [ -z "$r_me" ] || [ -z "$r_other" ]; then
 		return
 	fi
+
+	# one of the two sides of the merge should be remote upstream, or all is fine
+	r_r=`git symbolic-ref HEAD`
+	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
+		fi
+	fi
+
 	r_base=`git merge-base "$r_me" "$r_other"`
 
 	# no merge-base? upstream did filter-branch
@@ -311,6 +380,10 @@ fix_upstream_rebase_mergefail()
 
 fix_git_config()
 {
+	if ! [ -f ".git/config" ]; then
+		$ECHO "Not a git repository. Bailing out to not cause damage."
+		exit 1
+	fi
 	verbose git config remote.origin.url "$1"
 	if [ -n "$2" ]; then
 		verbose git config remote.origin.pushurl "$2"
@@ -333,20 +406,51 @@ fix_git_config()
 	verbose git config filter.mapclean.smudge "cat"
 }
 
+mkzipr()
+{
+	archive=$1; shift
+	case "$RELEASETYPE" in
+		release)
+			sevenzipflags=-mx=9
+			zipflags=-9
+			;;
+		*)
+			sevenzipflags=-mx=1
+			zipflags=-1
+			;;
+	esac
+	find "$@" -exec touch -d "2001-01-01 01:01:01 +0000" {} \+ # ugly hack to make the pk3 files rsync-friendly
+	ziplist=`mktemp`
+	find "$@" -xtype f \( -executable -or -type l \) -print > "$ziplist"
+	7za a -tzip $sevenzipflags -x@"$ziplist" "$archive" "$@" || true
+	zip         $zipflags -y   -@<"$ziplist" "$archive"      || true
+	rm -f "$ziplist"
+}
+
 mkzip()
 {
-	archive=$1
-	shift
+	archive=$1; shift
+	case "$RELEASETYPE" in
+		release)
+			sevenzipflags=-mx=9
+			zipflags=-9
+			;;
+		*)
+			sevenzipflags=-mx=1
+			zipflags=-1
+			;;
+	esac
 	ziplist=`mktemp`
 	find "$@" -xtype f \( -executable -or -type l \) -print > "$ziplist"
-	7za a -tzip -mx=9 -x@"$ziplist" "$archive" "$@" || true
-	zip         -9y   -@<"$ziplist" "$archive"      || true
+	7za a -tzip $sevenzipflags -x@"$ziplist" "$archive" "$@" || true
+	zip         $zipflags -y   -@<"$ziplist" "$archive"      || true
 	rm -f "$ziplist"
 }
 
 mkzip0()
 {
-	zip -0y "$@"
+	archive=$1; shift
+	zip -0ry "$archive" "$@"
 }
 
 mirrorspeed()
@@ -363,20 +467,34 @@ bestmirror()
 	suf=$1; shift
 
 	if ! { time -p true; } >/dev/null 2>&1; then
+		msg "Cannot do timing in this shell"
 		return 1
 	fi
 
 	bestin=
 	bestt=
-	for in in "$@"; do
+	for mir in "$@"; do
+		case "$mir" in
+			*:*)
+				in=${mir%%:*}
+				op=${mir#*:}
+				;;
+			*)
+				in=$mir
+				op=
+				;;
+		esac
 		m=$pre$in$suf
 		if t=`mirrorspeed "$m"`; then
-			msg "$m -> $t ticks"
 			if [ -n "$t" ]; then
-				if [ -z "$bestt" ] || [ "$t" -lt "$bestt" ]; then
+				tt=$(($t$op)) # fudge factor
+				msg "$m -> $t$op = $tt ticks"
+				if [ -z "$bestt" ] || [ "$tt" -lt "$bestt" ]; then
 					bestin=$in
-					bestt=$t
+					bestt=$tt
 				fi
+			else
+				msg "$m -> error"
 			fi
 		else
 			msg "$m -> FAIL"
@@ -402,7 +520,7 @@ case "$cmd" in
 			url=`repourl "$d"`
 			pushurl=`repopushurl "$d"`
 			branch=`repobranch "$d"`
-			if [ -d "$d0/$d" ]; then
+			if [ -f "$d0/$d/.git/config" ]; then
 				verbose cd "$d0/$d"
 				fix_git_config "$url" "$pushurl"
 				cd "$d0"
@@ -472,13 +590,16 @@ case "$cmd" in
 				allow_pull=false
 			elif [ x"$1" = x"-p" ]; then
 				fix_config=true
-				if [ x"$base" != x"ssh://xonotic@git.xonotic.org/" ]; then
-					pushbase=ssh://xonotic@git.xonotic.org/
-				fi
+				pushbase=ssh://xonotic@git.xonotic.org/
+			elif [ x"$1" = x"-ps" ]; then
+				fix_config=true
+				pushbase=ssh://xonotic@git.xonotic.org/
+			elif [ x"$1" = x"-ph" ]; then
+				fix_config=true
+				pushbase=http://git.xonotic.org/login/xonotic/
 			elif [ x"$1" = x"-s" ]; then
 				fix_config=true
 				base=ssh://xonotic@git.xonotic.org/
-				pushbase=
 			elif [ x"$1" = x"-g" ]; then
 				fix_config=true
 				base=git://git.xonotic.org/xonotic/
@@ -511,13 +632,27 @@ case "$cmd" in
 			fi
 			shift
 		done
+		case "$location" in
+			current)
+				if [ x"`git config xonotic.all.mirrorselection 2>/dev/null || true`" != x"done" ]; then
+					location=best
+				fi
+				;;
+		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://*|*/login/*)
+						pushbase=$base
+						base=git://git.xonotic.org/xonotic/
+						;;
+				esac
 				newbase=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,:// .git.xonotic.org/,"`
 				case "$newbase" in
 					*\ *)
-						if location=`bestmirror $newbase"xonotic.git" de nl us`; then
-							:
+						if location=`bestmirror $newbase"xonotic.git" de us nl:'*6/5'`; then # 20% malus to the NL server to not overload it too much
+							git config xonotic.all.mirrorselection done
 						else
 							location=current
 						fi
@@ -563,7 +698,12 @@ case "$cmd" in
 			url=`repourl "$d"`
 			pushurl=`repopushurl "$d"`
 			branch=`repobranch "$d"`
-			if [ -d "$d0/$d" ]; then
+			if [ -f "$d0/$d/.git/config" ]; then
+				# if we have .no file, skip
+				if [ -f "$d0/$d.no" ]; then
+					msg "Repository $d disabled by a .no file, delete $d.no to enable; thus, not updated"
+					continue
+				fi
 				if $allow_pull; then
 					enter "$d0/$d" verbose
 					r=`git symbolic-ref HEAD`
@@ -586,6 +726,14 @@ case "$cmd" in
 					cd "$d0"
 				fi
 			else
+				if [ -d "$d0/$d" ]; then
+					if yesno "$d0/$d is in the way, get rid of it and reclone?"; then
+						verbose rm -rf "$d0/$d"
+					else
+						echo "Note: $d0/$d will stay broken."
+						continue
+					fi
+				fi
 				verbose git clone "$url" "$d0/$d"
 				enter "$d0/$d" verbose
 				fix_git_config "$url" "$pushurl"
@@ -619,6 +767,9 @@ case "$cmd" in
 					;;
 			esac
 		fi
+		if [ -n "$checkoutflags" ]; then
+			set -- -f "$@" # to make checkself work again
+		fi
 		exists=false
 		for d in $repos; do
 			enter "$d0/$d" verbose
@@ -632,10 +783,8 @@ case "$cmd" in
 			else
 				b=`repobranch "$d"`
 				if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
-					exists=true
 					verbose git checkout $checkoutflags "$b"
 				elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
-					exists=true
 					verbose git checkout $checkoutflags --track -b "$b" "$remote/$b"
 				else
 					$ECHO "WTF? Not even branch $b doesn't exist in $d"
@@ -800,14 +949,23 @@ case "$cmd" in
 					cleanqc=true
 					shift
 					;;
-				-r)
-					debug=release
+				-r|-p)
+					case "$1" in
+						-p)
+							debug=profile
+							;;
+						-r)
+							debug=release
+							;;
+					esac
 					export CC="$CC -g"
 					case "`$CC -dumpversion`" in
 						[5-9]*|[1-9][0-9]*|4.[3-9]*|4.[1-9][0-9]*)
 							# gcc 4.3 or higher
 							# -march=native is broken < 4.3
-							export CC="$CC -mtune=native -march=native"
+							if $CC -mtune=native -march=native misc/tools/conftest.c -o conftest >/dev/null 2>&1; then
+								export CC="$CC -mtune=native -march=native"
+							fi
 							;;
 					esac
 					if [ -n "$WE_HATE_OUR_USERS" ]; then
@@ -833,7 +991,7 @@ case "$cmd" in
 					TARGETS="sv-$debug sdl-$debug"
 					;;
 			esac
-			export CC="$CC -fno-reorder-blocks -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
+			export CC="$CC -fno-reorder-blocks -I$PWD/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks"
 		else
 			TARGETS="sv-$debug cl-$debug sdl-$debug"
 		fi
@@ -877,7 +1035,7 @@ case "$cmd" in
 		fi
 		if [ -z "$MAKEFLAGS" ]; then
 			if [ -f /proc/cpuinfo ]; then
-				ncpus=$((`grep -c '^processor	:' /proc/cpuinfo`+0))
+				ncpus=$((`grep -c '^processor	:' /proc/cpuinfo || true`+0))
 				if [ $ncpus -gt 1 ]; then
 					MAKEFLAGS=-j$ncpus
 				fi
@@ -887,7 +1045,34 @@ case "$cmd" in
 			fi
 		fi
 
-		enter "$d0/d0_blind_id" verbose
+		
+		if ! verbose $CC misc/tools/conftest.c -o conftest; then
+			msg ""
+			msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+			msg "~~~~~~~~~~ COMPILER ~~~~~~~~~~"
+			msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+			msg "~~~~~~~~~~~~~~_...._~~~~~~~~~~"
+			msg "~~~~~~~~~~~,-'     \\\`-._~~~~~~"
+			msg "~~~~~~~~~~/     --. ><  \\~~~~~"
+			msg "~~~~~~~~~/      (*)> -<: \\~~~~"
+			msg "~~~~~~~~~(     ^~-'  (*) )~~~~"
+			msg "~~~~~~~~~\\        ^+-_/  |~~~~"
+			msg "~~~~~~~~~~\\       {vvv}  |~~~~"
+			msg "~~~~~~~~~~,\\    , {^^^},/~~~~~"
+			msg "~~~~~~~~,/  \`---.....-'~~W~~~~"
+			msg "~~~~~~,/   \\_____/_\\_W~~/~~~~~"
+			msg "~~~~~/          /~~~\\__/~~~~~~"
+			msg "~~~~/          /~~~~~~~~~~~~~~"
+			msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+			msg "~~~~~~~ Y U NO COMPILE ~~~~~~~"
+			msg "~~~~~~~~~~~~ CODE ~~~~~~~~~~~~"
+			msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+			msg ""
+			exit 1
+		fi
+		rm -f conftest
+
+		verbose cd "$d0/d0_blind_id"
 		if ! $compiled0; then
 			# compilation of crypto library failed
 			# use binaries then, if we can...
@@ -940,20 +1125,20 @@ case "$cmd" in
 			verbose make $MAKEFLAGS
 		fi
 
-		enter "$d0/fteqcc" verbose
+		verbose cd "$d0/fteqcc"
 		if $cleanqcc; then
 			verbose make $MAKEFLAGS clean
 		fi
 		verbose make $MAKEFLAGS
 
-		enter "$d0/data/xonotic-data.pk3dir" verbose
+		verbose cd "$d0/data/xonotic-data.pk3dir"
 		if $cleanqc; then
 			verbose make FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
 		fi
 		verbose make FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
 		# 4 levels up: data, xonotic-data, qcsrc, server
 
-		enter "$d0/darkplaces" verbose
+		verbose cd "$d0/darkplaces"
 		if [ x"$BAD_TARGETS" = x" " ]; then
 			$ECHO "Warning: invalid empty client, default clients will be used."
 		fi
@@ -974,8 +1159,8 @@ case "$cmd" in
 			client=
 			export PATH="$d0/misc/buildfiles/win32:$d0/d0_blind_id/.libs:$PATH"
 		elif [ x"`uname`" = x"Darwin" ]; then
-			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS:$d0/d0_blind_id/.libs"
-			export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
+			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic.app/Contents/MacOS:$d0/d0_blind_id/.libs"
+			export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks"
 			client=-sdl
 		else
 			export LD_LIBRARY_PATH="$d0/d0_blind_id/.libs"
@@ -999,7 +1184,7 @@ case "$cmd" in
 				exit 1
 			fi
 		fi
-		set -- "darkplaces/darkplaces$client" -xonotic -mygames "$@"
+		set -- "darkplaces/darkplaces$client" -xonotic "$@"
 
 		# if pulseaudio is running: USE IT
 		if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
@@ -1115,6 +1300,13 @@ case "$cmd" in
 		;;
 	admin-merge)
 		branch=$1
+		only_delete=false
+		case "$branch" in
+			-d)
+				branch=
+				only_delete=true
+				;;
+		esac
 		t=`mktemp`
 		report=""
 		reportecho()
@@ -1192,6 +1384,8 @@ case "$cmd" in
 							git push origin :"${ref#refs/remotes/origin/}"
 							reportecho4 "--> branch deleted"
 						fi
+					elif $only_delete; then
+						reportecho4 "--> skipped in delete-only run"
 					elif [ -z "$branch" ] && [ -n "$note" ]; then
 						reportdo4 $ECHO "$note"
 						reportecho4 "--> not merging, already had this one rejected before"
@@ -1325,7 +1519,6 @@ case "$cmd" in
 				msg "Unknown arg: $X"
 			fi
 			found=true
-			shift
 		done
 		if ! $found; then
 			rmuntracked=true
@@ -1396,13 +1589,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 ""
@@ -1444,6 +1631,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
@@ -1452,39 +1645,37 @@ case "$cmd" in
 		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 key_0.d0pk | {
+		release_git_extract_dir "." "Xonotic" Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles key_0.d0pk COPYING GPL-2 GPL-3
+		(
 			verbose cd Xonotic
-			verbose mkdir data fteqcc source source/darkplaces source/fteqcc
-			verbose tar xvf -
+			verbose mkdir data fteqcc source source/darkplaces source/fteqcc source/d0_blind_id mapping
 			verbose rm -rf misc/builddeps
-			verbose mv misc/buildfiles/win32/* . || true
+			verbose mv misc/buildfiles/win32 bin32 || true
+			verbose mv bin32/SDL.dll . || true
 			verbose mv misc/buildfiles/win64 bin64 || true
 			verbose mv misc/buildfiles/osx/* . || true
 			verbose rm -rf misc/buildfiles
 			verbose rm -rf misc/pki
-		}
-		{
-			verbose cd darkplaces
-			verbose git archive --format=tar HEAD
-		} | {
-			verbose cd Xonotic/source/darkplaces
-			verbose tar xvf -
-		}
-		{
-			verbose cd fteqcc
-			verbose git archive --format=tar HEAD
-		} | {
-			verbose cd Xonotic/source/fteqcc
-			verbose tar xvf -
-		}
+		)
+		release_git_extract_dir "darkplaces" "Xonotic/source/darkplaces" .
+		release_git_extract_dir "fteqcc" "Xonotic/source/fteqcc" .
+		release_git_extract_dir "data/xonotic-data.pk3dir" "Xonotic/source" qcsrc Makefile
+		release_git_extract_dir "d0_blind_id" "Xonotic/source/d0_blind_id" .
+		(
+			verbose cd Xonotic/source/d0_blind_id
+			verbose sh autogen.sh
+		)
+		rm -f Xonotic/key_15.d0pk
 		{
-			verbose cd data/xonotic-data.pk3dir
-			verbose git archive --format=tar HEAD -- qcsrc Makefile
-		} | {
-			verbose cd Xonotic/source
-			verbose tar xvf -
+			verbose cd Xonotic/mapping
+			verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110701.tar.bz2
+			verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110701-win32-7z.exe
+			for X in *-7z.exe; do
+				7za x "$X"
+				rm -f "$X"
+			done
+			# TODO possibly include other tools?
 		}
-		rm -f Xonotic/key_15.d0pk
 		;;
 	release-compile-run)
 		host=$1
@@ -1514,7 +1705,7 @@ case "$cmd" in
 				*)
 					verbose rsync --delete -zLvaSHP "$srcdir"/ "$host:$buildpath/"
 					verbose rsync --delete -zLvaSHP "$depsdir"/ "$host:$buildpath.deps/"
-					verbose ssh "$host" "ln -snf $buildpath.deps $buildpath/.deps && cd $buildpath && nice -`nice` make clean $maketargets $makeflags"
+					verbose ssh "$host" "[ -f /etc/profile ] && . /etc/profile; [ -f ~/.profile ] && . ~/.profile; export LC_ALL=C; ln -snf $buildpath.deps $buildpath/.deps && cd $buildpath && nice -`nice` make clean $maketargets $makeflags"
 					for f in $targetfiles; do
 						verbose rsync -zvaSHP "$host:$buildpath/${f%:*}" "${f##*:}" || true
 					done
@@ -1524,17 +1715,8 @@ case "$cmd" in
 			for f in $targetfiles; do
 				#verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
 				case "${f##*:}" in
-					xonotic*.exe)
+					Xonotic/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
@@ -1553,44 +1735,40 @@ case "$cmd" in
 		;;
 	release-engine-win32)
 		verbose "$SELF" release-compile win32 \
-			'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -march=i686 -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=0' \
+			'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -march=i686 -g1 -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=0' \
 			win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
 			'' ''
 		verbose "$SELF" release-compile win32 \
-			'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=0' \
+			'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-g++ -g1 -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=1' \
 			'' '' \
 			release 'darkplaces.exe:Xonotic/xonotic.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe'
 		;;
 	release-engine-win64)
 		verbose "$SELF" release-compile win64 \
-			'STRIP=: DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DSUPPORTIPV6" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=0' \
+			'STRIP=: DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DSUPPORTIPV6" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=0' \
 			win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-x64.exe' \
 			'sv-release sdl-release' 'darkplaces-sdl.exe:Xonotic/xonotic-x64-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-x64-dedicated.exe'
 		verbose "$SELF" release-compile win64 \
-			'STRIP=: DP_MAKE_TARGET=mingw CC="x86_64-w64-mingw32-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DSUPPORTIPV6" WINDRES="x86_64-w64-mingw32-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=0' \
+			'STRIP=: DP_MAKE_TARGET=mingw CC="x86_64-w64-mingw32-g++ -g1 -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DSUPPORTIPV6" WINDRES="x86_64-w64-mingw32-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=1' \
 			'' '' \
 			cl-release 'darkplaces.exe:Xonotic/xonotic-x64.exe'
 		;;
 	release-engine-osx)
 		# gcc on OSX is buggy, needs -fno-reorder-blocks for a release build to succeed
 		verbose "$SELF" release-compile osx \
-			'STRIP=: CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I.deps/include -L.deps/lib -fno-reorder-blocks -DSUPPORTIPV6"' \
+			'STRIP=: CC="gcc -g1 -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I.deps/include -L.deps/lib -fno-reorder-blocks -DSUPPORTIPV6"' \
 			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \
-			'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated'
-		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.deps/include -L.deps/lib -fno-reorder-blocks -DSUPPORTIPV6"' \
-			'' '' \
-			'cl-release' 'darkplaces-agl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin'
+			'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated'
 		;;
 	release-engine-linux32)
 		verbose "$SELF" release-compile linux32 \
-			'STRIP=: CC="gcc -m32 -march=i686 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \
+			'STRIP=: CC="gcc -m32 -march=i686 -g1 -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \
 			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \
 			release 'darkplaces-glx:Xonotic/xonotic-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated'
 		;;
 	release-engine-linux64)
 		verbose "$SELF" release-compile linux64 \
-			'STRIP=: CC="gcc -m64 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \
+			'STRIP=: CC="gcc -m64 -g1 -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \
 			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux64' \
 			release 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated'
 		;;
@@ -1611,16 +1789,8 @@ 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 rm -f Xonotic/source/*/fteqcc.log
+		verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
+		verbose rm -f Xonotic/source/qcsrc/*/fteqcc.log
 		;;
 	release-buildpk3-transform-raw)
 		dir=$1
@@ -1630,11 +1800,25 @@ case "$cmd" in
 		verbose cd "$dir"
 		# texture: convert to jpeg and dds
 		verbose export do_jpeg=true
+		verbose export jpeg_qual_rgb=97
+		verbose export jpeg_qual_a=99
+		verbose export do_dds=false
+		verbose export do_ogg=false
+		verbose export del_src=true
+		find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
+		;;
+	release-buildpk3-transform-normaldds)
+		dir=$1
+		verbose cd "$dir"
+		# texture: convert to jpeg and dds
+		# music: reduce bitrate
+		verbose export do_jpeg=false
+		verbose export do_jpeg_if_not_dds=true
 		verbose export jpeg_qual_rgb=95
 		verbose export jpeg_qual_a=99
 		verbose export do_dds=true
 		verbose export dds_flags=
-		verbose export do_ogg=false
+		verbose export do_ogg=true
 		verbose export del_src=true
 		find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
 		;;
@@ -1679,15 +1863,12 @@ case "$cmd" in
 				dst="$PWD/$dst"
 				;;
 		esac
+		release_timereport
 		verbose rm -rf Xonotic/temp
+		release_timereport "deleted temp directory"
 		verbose mkdir -p Xonotic/temp
-		{
-			verbose cd "$src"
-			verbose git archive --format=tar HEAD
-		} | {
-			verbose cd Xonotic/temp
-			verbose tar xvf -
-		}
+		release_git_extract_dir "$src" "Xonotic/temp" .
+		release_timereport "extracted data"
 		verbose cd Xonotic/temp
 		if [ x"$src" = x"data/xonotic-data.pk3dir" ]; then
 			verbose cp ../source/progs.dat .
@@ -1696,21 +1877,42 @@ case "$cmd" in
 			verbose rm -rf qcsrc
 			gv=`grep "^gameversion " "defaultXonotic.cfg" | awk '{ print $2 }'`
 			major=$(($gv / 10000))
-			minor=$(($gv / 100 - $major * 100))
-			patch=$(($gv - $major * 10000 - $minor * 100))
+			minor=$((($gv / 100) - ($major * 100)))
+			patch=$(($gv - ($major * 10000) - ($minor * 100)))
 			versionstr="$major.$minor.$patch"
 			case "$RELEASETYPE" in
-				beta)
-					versionstr="$versionstr""beta"
+				release)
+					;;
+				*)
+					versionstr="$versionstr$RELEASETYPE"
+					;;
+			esac
+			if [ $gv -lt 900 ]; then
+				# 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/;
+				" < defaultXonotic.cfg > defaultXonotic.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
+			fi
+			mv defaultXonotic.cfg.new defaultXonotic.cfg
+			case "$RELEASETYPE" in
+				release)
+					echo "" >> defaultXonotic.cfg
+					echo "// nicer menu" >> defaultXonotic.cfg
+					echo "set menu_watermark \"\"" >> defaultXonotic.cfg
 					;;
 			esac
-			verbose sed -i "
-				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
 			(
 				verbose cd gfx/menu/luminos
+				verbose rm -f background_l2.tga background_ingame_l2.tga
 				verbose cp "$d0"/mediasource/gfx/menu/luminos_versionbuilder/background_l2.svg .
 				verbose "$d0"/mediasource/gfx/menu/luminos_versionbuilder/versionbuilder "$versionstr"
 				verbose rm background_l2.svg
@@ -1725,10 +1927,14 @@ case "$cmd" in
 			done
 		fi
 		verbose export git_src_repo="$d0/$src" # skip hash-object
+		release_timereport "processed data"
 		verbose "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
-		verbose mkzip "../../$dst" *
+		release_timereport "transformed data"
+		verbose mkzipr "../../$dst" *
+		release_timereport "zipped data"
 		verbose cd ../..
 		verbose rm -rf Xonotic/temp
+		release_timereport "deleted temp directory again"
 		;;
 	release-buildpk3s)
 		stamp=`cat Xonotic/stamp.txt`
@@ -1750,11 +1956,12 @@ case "$cmd" in
 		done
 		;;
 	release-pack)
-		verbose "$SELF" release-buildpk3s data/font-nimbussansl.pk3dir             raw ''
-		verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir       normal ''            low '-low' lowdds '-lowdds'
-		verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir       normal ''            low '-low' lowdds '-lowdds'
-		verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir                raw ''     low '-low'
-		verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                       low ''
+		verbose "$SELF" release-buildpk3s data/font-nimbussansl.pk3dir                  raw ''
+		verbose "$SELF" release-buildpk3s data/font-xolonium.pk3dir                     raw ''
+		verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir       normal '-high'        low '-low' normaldds ''
+		verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir       normal '-high'        low '-low' normaldds ''
+		verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir                     raw '' low '-low'
+		verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir  normal '-high'                   normaldds ''
 		;;
 	release-pack-needsx11)
 		case "$DISPLAY" in
@@ -1771,20 +1978,23 @@ 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
+				$crypto_libs \
+				Xonotic/COPYING Xonotic/GPL-2 Xonotic/GPL-3
 			rm -f $crypto_libs
 		fi
 		# build the archives
 		verbose mkzip Xonotic-$stamp-engine.zip \
 			Xonotic/*.dll \
+			Xonotic/bin32/*.dll \
 			Xonotic/bin64/*.dll \
 			Xonotic/*.app \
 			Xonotic/xonotic-* \
 			Xonotic/xonotic.exe \
-			Xonotic/source/darkplaces/
+			Xonotic/source/darkplaces/ \
+			Xonotic/COPYING Xonotic/GPL-2 Xonotic/GPL-3
 		verbose cp Xonotic-$stamp-engine.zip Xonotic-$stamp-common.zip
 		verbose mkzip Xonotic-$stamp-common.zip \
 			Xonotic/source/fteqcc/ \
@@ -1794,7 +2004,8 @@ case "$cmd" in
 			Xonotic/fteqcc \
 			Xonotic/server \
 			Xonotic/key_0.d0pk \
-			Xonotic/data/font-nimbussansl-$stamp.pk3
+			Xonotic/data/font-nimbussansl-$stamp.pk3 \
+			Xonotic/data/font-xolonium-$stamp.pk3
 		verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip
 		verbose mkzip0 Xonotic-$stamp.zip \
 			Xonotic/data/xonotic-$stamp-data.pk3 \
@@ -1806,17 +2017,18 @@ 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 \
-			Xonotic/data/xonotic-$stamp-maps-lowdds.pk3 \
-			Xonotic/data/xonotic-$stamp-music-low.pk3
+		verbose mv Xonotic-$stamp-common.zip Xonotic-$stamp-high.zip
+		verbose mkzip Xonotic-$stamp-high.zip \
+			Xonotic/mapping
+		verbose mkzip0 Xonotic-$stamp-high.zip \
+			Xonotic/data/xonotic-$stamp-data-high.pk3 \
+			Xonotic/data/xonotic-$stamp-maps-high.pk3 \
+			Xonotic/data/xonotic-$stamp-music.pk3 \
+			Xonotic/data/xonotic-$stamp-nexcompat-high.pk3
+		verbose mkzip Xonotic-$stamp-mappingsupport.zip \
+			Xonotic/mapping
+		verbose mkzip0 Xonotic-$stamp-mappingsupport.zip \
+			Xonotic/data/xonotic-$stamp-maps-low.pk3
 		;;
 	release)
 		verbose "$SELF" release-prepare
@@ -1837,13 +2049,12 @@ case "$cmd" in
 		$ECHO "  $SELF checkout|switch <remote>/<branch>"
 		$ECHO "  $SELF clean [-m] [-f | -fu | -fU] [-r] [-D]"
 		$ECHO "  $SELF clean --reclone"
-		$ECHO "  $SELF compile [-c] [-r] [-0]"
+		$ECHO "  $SELF compile [-c] [-r|-p] [-0] [sdl|glx|wgl|agl|dedicated]"
 		$ECHO "  $SELF each|foreach [-k] command..."
 		$ECHO "  $SELF fix_upstream_rebase"
 		$ECHO "  $SELF keygen"
 		$ECHO "  $SELF merge"
 		$ECHO "  $SELF push|commit [-s]"
-		$ECHO "  $SELF release"
 		$ECHO "  $SELF restore-patches"
 		$ECHO "  $SELF run [sdl|glx|wgl|agl|dedicated] options..."
 		$ECHO "  $SELF save-patches"