use 7zip instead of infozip where possible

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 5064b3e7e5171472e404d39d21756ab4dcd03c31..0b8413b015be1b82f19566846466a5fba06b7dce 100755 (executable)
--- a/all
+++ b/all
@@ -978,10 +978,11 @@ case "$cmd" in
                srcdir=$5
                depsdir=$6
                targetfiles=$7
+               set -x
                if [ -n "$targetfiles" ]; then
                        case " $HOSTS_THAT_ARE_DISABLED " in
                                *\ $host\ *)
-                                       return 0
+                                       exit
                                        ;;
                        esac
                        case " $HOSTS_THAT_ARE_MYSELF " in
@@ -997,7 +998,7 @@ case "$cmd" in
                                *)
                                        verbose rsync --delete -zLvaSHP "$srcdir"/ "$host:$buildpath/"
                                        verbose rsync --delete -zLvaSHP "$depsdir"/ "$host:$buildpath.deps/"
-                                       verbose ssh "$host" "ln -snf $buildpath.deps $buildpath/.deps && cd $buildpath && make clean $maketargets $makeflags"
+                                       verbose ssh "$host" "ln -snf $buildpath.deps $buildpath/.deps && cd $buildpath && nice -`nice` make clean $maketargets $makeflags"
                                        for f in $targetfiles; do
                                                verbose rsync -zvaSHP "$host:$buildpath/${f%:*}" "${f##*:}" || true
                                        done
@@ -1210,7 +1211,7 @@ case "$cmd" in
                fi
                verbose export git_src_repo="$d0/$src" # skip hash-object
                verbose "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
-               verbose zip -9yr "../../$dst" .
+               verbose 7za a -tzip -mx=9 "../../$dst" .
                verbose cd ../..
                verbose rm -rf Xonotic/temp
                ;;
@@ -1252,6 +1253,7 @@ case "$cmd" in
                ;;
        release-zip)
                stamp=`cat Xonotic/stamp.txt`
+               # need to use infozip for these (+x bits)
                verbose zip -9yr Xonotic-$stamp-engine.zip \
                        Xonotic/*.dll \
                        Xonotic/bin64/*.dll \
@@ -1259,7 +1261,7 @@ case "$cmd" in
                        Xonotic/xonotic-* \
                        Xonotic/xonotic.exe
                verbose cp Xonotic-$stamp-engine.zip Xonotic-$stamp-common.zip
-               verbose zip -9yr Xonotic-$stamp-common.zip \
+               verbose 7za a -tzip -mx=9 Xonotic-$stamp-common.zip \
                        Xonotic/source/*/ \
                        Xonotic/Docs \
                        Xonotic/misc \