X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=all;h=cca966437184ca277c8ba0933bd5df0212f4dddd;hb=3c9f2bd0cecdf01dc946eece08a2007f5b929a9b;hp=fd009d9c58affaa0a246920b0f2851f0f95f0d2b;hpb=9fae4c9fc709c8709b680bd49b79e2be89c8d723;p=xonotic%2Fxonotic.git

diff --git a/all b/all
index fd009d9c..cca96643 100755
--- a/all
+++ b/all
@@ -498,13 +498,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/
@@ -549,7 +552,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/
 						;;
@@ -660,6 +663,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
@@ -1156,6 +1162,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 +1246,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 +1381,6 @@ case "$cmd" in
 				msg "Unknown arg: $X"
 			fi
 			found=true
-			shift
 		done
 		if ! $found; then
 			rmuntracked=true
@@ -1495,7 +1509,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 source/d0_blind_id
+			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
@@ -1534,6 +1548,16 @@ case "$cmd" in
 			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
@@ -1661,7 +1685,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
@@ -1671,11 +1695,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
 		;;
@@ -1737,8 +1775,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)
@@ -1800,11 +1838,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
@@ -1844,7 +1883,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 \
@@ -1856,11 +1896,15 @@ 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 mkzip0 Xonotic-$stamp-mappingsuppport.zip \
+			Xonotic/mapping \
+			Xonotic/data/xonotic-$stamp-maps-low.pk3 # TODO add a Radiant build
 		;;
 	release)
 		verbose "$SELF" release-prepare