we no longer need the -mygames option

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 403c4583fc99c1660057dbb224a5e007b05a981f..06101152eda1e38c3aa8f0a81b6a294f1735774b 100755 (executable)
--- a/all
+++ b/all
@@ -267,6 +267,12 @@ fi
 cmd=$1
 shift
 
+case "$cmd" in
+       release-*)
+               export LC_ALL=C
+               ;;
+esac
+
 fix_upstream_rebase()
 {
        if [ -z "$r_me" ] || [ -z "$r_other" ]; then
@@ -349,10 +355,20 @@ fix_git_config()
        verbose git config filter.mapclean.smudge "cat"
 }
 
+mkzipr()
+{
+       archive=$1; shift
+       find "$@" -exec touch -d "1970-01-01 00:00:00 +0000" {} \+ # ugly hack to make the pk3 files rsync-friendly
+       ziplist=`mktemp`
+       find "$@" -xtype f \( -executable -or -type l \) -print > "$ziplist"
+       7za a -tzip -mx=9 -x@"$ziplist" "$archive" "$@" || true
+       zip         -9y   -@<"$ziplist" "$archive"      || true
+       rm -f "$ziplist"
+}
+
 mkzip()
 {
-       archive=$1
-       shift
+       archive=$1; shift
        ziplist=`mktemp`
        find "$@" -xtype f \( -executable -or -type l \) -print > "$ziplist"
        7za a -tzip -mx=9 -x@"$ziplist" "$archive" "$@" || true
@@ -362,7 +378,8 @@ mkzip()
 
 mkzip0()
 {
-       zip -0ry "$@"
+       archive=$1; shift
+       zip -0ry "$archive" "$@"
 }
 
 mirrorspeed()
@@ -379,6 +396,7 @@ bestmirror()
        suf=$1; shift
 
        if ! { time -p true; } >/dev/null 2>&1; then
+               msg "Cannot do timing in this shell"
                return 1
        fi
 
@@ -546,7 +564,6 @@ case "$cmd" in
                case "$location" in
                        current)
                                if [ x"`git config xonotic.all.mirrorselection 2>/dev/null || true`" != x"done" ]; then
-                                       git config xonotic.all.mirrorselection done
                                        location=best
                                fi
                                ;;
@@ -564,7 +581,7 @@ case "$cmd" in
                                case "$newbase" in
                                        *\ *)
                                                if location=`bestmirror $newbase"xonotic.git" de us nl:'*6/5'`; then # 20% malus to the NL server to not overload it too much
-                                                       :
+                                                       git config xonotic.all.mirrorselection done
                                                else
                                                        location=current
                                                fi
@@ -858,10 +875,10 @@ case "$cmd" in
                                -r|-p)
                                        case "$1" in
                                                -p)
-                                                       debug=release
+                                                       debug=profile
                                                        ;;
                                                -r)
-                                                       debug=profile
+                                                       debug=release
                                                        ;;
                                        esac
                                        export CC="$CC -g"
@@ -1061,7 +1078,7 @@ case "$cmd" in
                                exit 1
                        fi
                fi
-               set -- "darkplaces/darkplaces$client" -xonotic -mygames "$@"
+               set -- "darkplaces/darkplaces$client" -xonotic "$@"
 
                # if pulseaudio is running: USE IT
                if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
@@ -1602,7 +1619,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 && nice -`nice` make clean $maketargets $makeflags"
+                                       verbose ssh "$host" "export LC_ALL=C; 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
@@ -1614,15 +1631,6 @@ case "$cmd" in
                                case "${f##*:}" in
                                        Xonotic/xonotic*.exe)
                                                verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "${f##*:}"
-                                               (
-                                                       d=`mktemp -d -t rebrand.XXXXXX`
-                                                       cd "$d"
-                                                       $ECHO "-mygames" > darkplaces.opt
-                                                       zip -9r darkplaces.zip darkplaces.opt
-                                                       cat darkplaces.zip
-                                                       cd "$d0"
-                                                       rm -rf "$d"
-                                               ) >> "${f##*:}"
                                                ;;
                                esac
                        done
@@ -1829,7 +1837,7 @@ case "$cmd" in
                fi
                verbose export git_src_repo="$d0/$src" # skip hash-object
                verbose "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
-               verbose mkzip "../../$dst" *
+               verbose mkzipr "../../$dst" *
                verbose cd ../..
                verbose rm -rf Xonotic/temp
                ;;