Merge branch 'master' into divVerent/crypto2

[xonotic/xonotic.git] / all

diff --git a/all b/all
index e1c7780e41246e9d7d673bf6aec82842ecbe6433..8f34fdc99587fa1856166432035884ca2f85a54c 100755 (executable)
--- a/all
+++ b/all
@@ -819,22 +819,16 @@ case "$cmd" in
                ;;
 
        # release building goes here
-       release-mkdir)
-               mkdir -p Xonotic/"$1"
-               ;;
        release-prepare)
-#"$SELF" each git clean -fxd
+               #"$SELF" each git clean -fxd
+               rm -rf Xonotic
                mkdir -p Xonotic
-               "$SELF" release-copy Docs/
-               "$SELF" release-copy misc/
-               "$SELF" release-copy server/
-               "$SELF" release-copy xonotic-linux-glx.sh
-               "$SELF" release-copy xonotic-linux-sdl.sh
-               "$SELF" release-mkdir data
-               "$SELF" release-mkdir fteqcc
-               ;;
-       release-copy)
-               rsync --exclude=.git -vaSHPAX "$1" Xonotic/"$1"
+               git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh | {
+                       cd Xonotic
+                       mkdir data fteqcc
+                       tar xvf -
+                       rm -rf misc/builddeps misc/buildfiles
+               }
                ;;
        release-compile-run)
                host=$1
@@ -869,7 +863,7 @@ case "$cmd" in
        release-engine-win64)
                rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/win64/* Xonotic/
                "$SELF" release-compile win32 \
-                       '"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"' \
+                       '"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-64.exe darkplaces-sdl.exe:xonotic-sdl-64.exe darkplaces-dedicated.exe:xonotic-dedicated-64.exe'
                ;;
@@ -914,7 +908,7 @@ case "$cmd" in
                # version numnber and stuff like that
                ;;
        release-qc)
-               verbose make -C Xonotic/data/xonotic-data.pk3dir FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK=
+               verbose make -C data/xonotic-data.pk3dir FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK=
                ;;
        release-buildpk3-transform-raw)
                dir=$1
@@ -956,7 +950,19 @@ case "$cmd" in
                                ;;
                esac
                rm -rf Xonotic/temp
-               rsync --exclude=.git -vaSHPAX "$src"/ "Xonotic/temp"
+               mkdir -p Xonotic/temp
+               {
+                       cd "$src"
+                       git archive --format=tar HEAD
+               } | {
+                       cd Xonotic/temp
+                       tar xvf -
+               }
+               if [ x"$src" = x"data/xonotic-data.pk3dir" ]; then
+                       cp "$src"/progs.dat Xonotic/temp/
+                       cp "$src"/csprogs.dat Xonotic/temp/
+                       cp "$src"/menu.dat Xonotic/temp/
+               fi
                "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
                cd Xonotic/temp
                zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
@@ -981,11 +987,11 @@ case "$cmd" in
                ;;
        release)
                "$SELF" release-prepare
+               "$SELF" release-engine
                "$SELF" release-maps
                "$SELF" release-finish
                "$SELF" release-qc
                "$SELF" release-pack
-               "$SELF" release-engine
                ;;
        *)
                echo "Usage:"