X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=ef561178b9f8737eeb54b7f8cf1f9600cb811d38;hp=8ae9ed0a52c1149abd4aefeed7e21fde5feb483c;hb=816c025b12fc4726a7c7fb6ef73d395cdc4c2eda;hpb=bf6b1f437063dcf16cbdbb09e6dc65215fc29cfe

diff --git a/all b/all
index 8ae9ed0a..ef561178 100755
--- a/all
+++ b/all
@@ -856,6 +856,26 @@ case "$cmd" in
 		rm -f "$t"
 		echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt
 		;;
+	clean)
+		force=false
+		if [ x"$1" = x"-f" ]; then
+			force=true
+		fi
+		for d in $repos; do
+			enter "$d0/$d" verbose
+			if $force; then
+				git checkout-index -fa
+			fi
+			case "$d" in
+				.)
+					git clean -df
+					;;
+				*)
+					git clean -xdf
+					;;
+			esac
+		done
+		;;
 
 	# release building goes here
 	release-prepare)
@@ -1041,9 +1061,6 @@ case "$cmd" in
 		verbose export ogg_qual=1
 		verbose export del_src=true
 		find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
-		if [ -f "quake.rc" ]; then
-			verbose echo "r_texture_dds_load 1" >> quake.rc
-		fi
 		;;
 	release-buildpk3)
 		src=$1
@@ -1067,9 +1084,9 @@ case "$cmd" in
 		}
 		verbose cd Xonotic/temp
 		if [ x"$src" = x"data/xonotic-data.pk3dir" ]; then
-			verbose cp ../progs.dat .
-			verbose cp ../csprogs.dat .
-			verbose cp ../menu.dat .
+			verbose cp ../source/progs.dat .
+			verbose cp ../source/csprogs.dat .
+			verbose cp ../source/menu.dat .
 			verbose rm -rf qcsrc
 			gv=`grep "^gameversion " "defaultXonotic.cfg" | awk '{ print $2 }'`
 			major=$(($gv / 10000))
@@ -1131,9 +1148,9 @@ case "$cmd" in
 		;;
 	release-zip)
 		stamp=`cat Xonotic/stamp.txt`
-		verbose zip -9yr Xonotic-common.zip \
+		verbose zip -9yr Xonotic-$stamp-common.zip \
 			Xonotic/*.dll \
-			Xonotic/source \
+			Xonotic/source/*/ \
 			Xonotic/Docs \
 			Xonotic/misc \
 			Xonotic/fteqcc \
@@ -1142,26 +1159,26 @@ case "$cmd" in
 			Xonotic/xonotic-* \
 			Xonotic/xonotic.exe \
 			Xonotic/data/font-nimbussansl-$stamp.pk3
-		verbose cp Xonotic-common.zip Xonotic.zip
-		verbose zip -0yr Xonotic.zip \
+		verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip
+		verbose zip -0yr Xonotic-$stamp.zip \
 			Xonotic/data/xonotic-$stamp-data.pk3 \
 			Xonotic/data/xonotic-$stamp-maps.pk3 \
 			Xonotic/data/xonotic-$stamp-music.pk3 \
 			Xonotic/data/xonotic-$stamp-nexcompat.pk3
-		verbose cp Xonotic-common.zip Xonotic-low.zip
-		verbose zip -0yr Xonotic-low.zip \
+		verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp-low.zip
+		verbose zip -0yr Xonotic-$stamp-low.zip \
 			Xonotic/data/xonotic-$stamp-data-low.pk3 \
 			Xonotic/data/xonotic-$stamp-maps-low.pk3 \
 			Xonotic/data/xonotic-$stamp-music-low.pk3 \
 			Xonotic/data/xonotic-$stamp-nexcompat.pk3
-		verbose cp Xonotic-common.zip Xonotic-lowdds.zip
-		verbose zip -0yr Xonotic-lowdds.zip \
+		verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp-lowdds.zip
+		verbose zip -0yr 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 \
 			Xonotic/data/xonotic-$stamp-nexcompat.pk3
-		verbose mv Xonotic-common.zip Xonotic-high.zip
-		verbose zip -0yr Xonotic-high.zip \
+		verbose mv Xonotic-$stamp-common.zip Xonotic-$stamp-high.zip
+		verbose zip -0yr Xonotic-$stamp-high.zip \
 			Xonotic/data/xonotic-$stamp-data-raw.pk3 \
 			Xonotic/data/xonotic-$stamp-maps-raw.pk3 \
 			Xonotic/data/xonotic-$stamp-music.pk3 \