Merge remote branch 'origin/master' into divVerent/crypto2

[xonotic/xonotic.git] / all

diff --git a/all b/all
index bd561dde72a4ca59ef025b5719363aed50f15d00..74b4f3d4c2898c7d511bd56e4aab0e33ebd40882 100755 (executable)
--- a/all
+++ b/all
@@ -670,6 +670,8 @@ case "$cmd" in
                        fi
                fi
                set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic -mygames "$@"
+               # change this to:
+               #set -- "darkplaces/darkplaces$client" -xonotic -mygames "$@"
 
                # if pulseaudio is running: USE IT
                if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
@@ -1010,7 +1012,21 @@ case "$cmd" in
                        esac
                        # now rebrand the binaries...
                        for f in $targetfiles; do
-                               verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
+                               #verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
+                               case "$f" in
+                                       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
                fi
                ;;
@@ -1068,11 +1084,17 @@ case "$cmd" in
                        release 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated'
                ;;
        release-engine)
-               verbose "$SELF" release-engine-win64
-               verbose "$SELF" release-engine-osx
-               verbose "$SELF" release-engine-win32
-               verbose "$SELF" release-engine-linux32
-               verbose "$SELF" release-engine-linux64
+               verbose "$SELF" release-engine-linux32 &
+               verbose "$SELF" release-engine-linux64 &
+               verbose "$SELF" release-engine-win32 &
+               verbose "$SELF" release-engine-win64 &
+               verbose "$SELF" release-engine-osx &
+               wait %1
+               wait %2
+               wait %3
+               wait %4
+               wait %5
+               wait
                ;;
        release-maps)
                verbose "$SELF" update-maps
@@ -1177,6 +1199,7 @@ case "$cmd" in
                                fi
                        done
                fi
+               verbose export git_src_repo="$d0/$src" # skip hash-object
                verbose "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
                verbose zip -9yr "../../$dst" .
                verbose cd ../..
@@ -1220,16 +1243,19 @@ case "$cmd" in
                ;;
        release-zip)
                stamp=`cat Xonotic/stamp.txt`
-               verbose zip -9yr Xonotic-$stamp-common.zip \
+               verbose zip -9yr Xonotic-$stamp-engine.zip \
                        Xonotic/*.dll \
+                       Xonotic/bin64/*.dll \
+                       Xonotic/*.app \
+                       Xonotic/xonotic-* \
+                       Xonotic/xonotic.exe
+               verbose cp Xonotic-$stamp-engine.zip Xonotic-$stamp-common.zip
+               verbose zip -9yr Xonotic-$stamp-common.zip \
                        Xonotic/source/*/ \
                        Xonotic/Docs \
                        Xonotic/misc \
                        Xonotic/fteqcc \
                        Xonotic/server \
-                       Xonotic/*.app \
-                       Xonotic/xonotic-* \
-                       Xonotic/xonotic.exe \
                        Xonotic/key_0.d0pk \
                        Xonotic/data/font-nimbussansl-$stamp.pk3
                verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip