X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=all;h=1685f3620fbcde9ff72c8d0e170021ed3be34e8a;hb=601b4f2f14d9db802d97909d0d302457b11e5477;hp=f37a17f629c4cc5612daa5f3cc8bb1eabecd8e7d;hpb=97fe16d7d3bf7c97873cc5ef52730fee817a6f72;p=xonotic%2Fxonotic.git

diff --git a/all b/all
index f37a17f6..1685f362 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
@@ -359,7 +362,7 @@ mkzip()
 
 mkzip0()
 {
-	zip -0y "$@"
+	zip -0ry "$@"
 }
 
 mirrorspeed()
@@ -376,6 +379,7 @@ bestmirror()
 	suf=$1; shift
 
 	if ! { time -p true; } >/dev/null 2>&1; then
+		msg "Cannot do timing in this shell"
 		return 1
 	fi
 
@@ -498,13 +502,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/
@@ -540,7 +547,6 @@ case "$cmd" in
 		case "$location" in
 			current)
 				if [ x"`git config xonotic.all.mirrorselection 2>/dev/null || true`" != x"done" ]; then
-					git config xonotic.all.mirrorselection done
 					location=best
 				fi
 				;;
@@ -549,7 +555,7 @@ case "$cmd" in
 			best)
 				# if we fetched via ssh://, switch to git:// for fetching and keep using ssh:// for pushing
 				case "$base" in
-					ssh://*)
+					ssh://*|*/login/*)
 						pushbase=$base
 						base=git://git.xonotic.org/xonotic/
 						;;
@@ -558,7 +564,7 @@ case "$cmd" in
 				case "$newbase" in
 					*\ *)
 						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
@@ -605,6 +611,11 @@ case "$cmd" in
 			pushurl=`repopushurl "$d"`
 			branch=`repobranch "$d"`
 			if [ -d "$d0/$d" ]; 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`
@@ -660,6 +671,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
@@ -841,8 +855,15 @@ 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]*)
@@ -928,7 +949,7 @@ case "$cmd" in
 			fi
 		fi
 
-		enter "$d0/d0_blind_id" verbose
+		verbose cd "$d0/d0_blind_id"
 		if ! $compiled0; then
 			# compilation of crypto library failed
 			# use binaries then, if we can...
@@ -981,20 +1002,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
@@ -1156,6 +1177,13 @@ case "$cmd" in
 		;;
 	admin-merge)
 		branch=$1
+		only_delete=false
+		case "$branch" in
+			-d)
+				branch=
+				only_delete=true
+				;;
+		esac
 		t=`mktemp`
 		report=""
 		reportecho()
@@ -1233,6 +1261,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"
@@ -1366,7 +1396,6 @@ case "$cmd" in
 				msg "Unknown arg: $X"
 			fi
 			found=true
-			shift
 		done
 		if ! $found; then
 			rmuntracked=true
@@ -1495,7 +1524,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 mapping
 			verbose tar xvf -
 			verbose rm -rf misc/builddeps
 			verbose mv misc/buildfiles/win32/* . || true
@@ -1525,7 +1554,25 @@ 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
+		{
+			verbose cd Xonotic/mapping
+			verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110223.tar.bz2
+			verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110223-win32-7z.exe
+			for X in *-7z.exe; do
+				7za x "$X"
+				rm -f "$X"
+			done
+			# TODO possibly include other tools?
+		}
 		;;
 	release-compile-run)
 		host=$1
@@ -1565,7 +1612,7 @@ 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`
@@ -1598,7 +1645,7 @@ case "$cmd" in
 			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++ -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=1' \
 			'' '' \
 			release 'darkplaces.exe:Xonotic/xonotic.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe'
 		;;
@@ -1608,7 +1655,7 @@ case "$cmd" in
 			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++ -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=1' \
 			'' '' \
 			cl-release 'darkplaces.exe:Xonotic/xonotic-x64.exe'
 		;;
@@ -1653,7 +1700,7 @@ case "$cmd" in
 		;;
 	release-qc)
 		verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
-		verbose rm -f Xonotic/source/*/fteqcc.log
+		verbose rm -f Xonotic/source/qcsrc/*/fteqcc.log
 		;;
 	release-buildpk3-transform-raw)
 		dir=$1
@@ -1663,11 +1710,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
 		;;
@@ -1729,8 +1790,8 @@ 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
 				release)
@@ -1792,11 +1853,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
@@ -1813,7 +1875,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
@@ -1836,7 +1898,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 \
@@ -1848,11 +1911,16 @@ 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 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 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 # TODO add a Radiant build
 		;;
 	release)
 		verbose "$SELF" release-prepare
@@ -1873,7 +1941,7 @@ 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]"
 		$ECHO "  $SELF each|foreach [-k] command..."
 		$ECHO "  $SELF fix_upstream_rebase"
 		$ECHO "  $SELF keygen"