improve naming of win64 binareis

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 016300b61207f0ca87949e4f8234433475b6e84d..c77ab6012e60d8ef4115b4c6725faa5c889638eb 100755 (executable)
--- 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
+                               verbose git checkout-index -fa
+                       fi
+                       case "$d" in
+                               .)
+                                       verbose git clean -df
+                                       ;;
+                               *)
+                                       verbose git clean -xdf
+                                       ;;
+                       esac
+               done
+               ;;
 
        # release building goes here
        release-prepare)
@@ -954,8 +974,8 @@ case "$cmd" in
        release-engine-win64)
                verbose "$SELF" release-compile win64 \
                        'DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win64/include -L$HOME/dp.win64/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win64/bin/sdl-config" LDFLAGS_WINCOMMON=""' \
-                       win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-64.exe' \
-                       debug 'darkplaces.exe:Xonotic/xonotic-64.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl-64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-64.exe'
+                       win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-x64.exe' \
+                       debug 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl-x64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-x64.exe'
                ;;
        release-engine-osx)
                verbose "$SELF" release-compile osx \
@@ -1128,7 +1148,7 @@ 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/Docs \
@@ -1139,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 \