Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Thu, 5 Aug 2010 08:41:38 +0000 (10:41 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 5 Aug 2010 08:41:38 +0000 (10:41 +0200)
all

diff --git a/all b/all
index 1d6cde8db3e43cdf0ebceae34c96224c5956a35d..7179a3bf71c8f1e2c28184900682d47585891835 100755 (executable)
--- a/all
+++ b/all
@@ -956,7 +956,7 @@ case "$cmd" in
                ;;
        release-engine)
                "$SELF" release-engine-win32 &
-               "$SELF" release-engine-win64 &
+               "$SELF" release-engine-win64 &
                "$SELF" release-engine-osx &
                "$SELF" release-engine-linux32 &
                "$SELF" release-engine-linux64 &
@@ -964,13 +964,6 @@ case "$cmd" in
                ;;
        release-maps)
                "$SELF" update-maps
-               for X in data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
-                       if [ -f "$X" ]; then
-                               cd Xonotic/data/xonotic-maps.pk3dir
-                               unzip ../../../"$X"
-                               cd ../../..
-                       fi
-               done
                ;;
        release-finish)
                # version numnber and stuff like that
@@ -1031,6 +1024,16 @@ case "$cmd" in
                        cp "$src"/csprogs.dat Xonotic/temp/
                        cp "$src"/menu.dat Xonotic/temp/
                fi
+               if [ x"$src" = x"data/xonotic-maps.pk3dir" ]; then
+                       for X in data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
+                               if [ -f "$X" ]; then
+                                       (
+                                               cd Xonotic/data/xonotic-maps.pk3dir
+                                               unzip ../../../"$X"
+                                       )
+                               fi
+                       done
+               fi
                "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
                cd Xonotic/temp
                zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
@@ -1047,7 +1050,7 @@ case "$cmd" in
                done
                ;;
        release-pack)
-               "$SELF" release-buildpk3s data/font-dejavu.pk3dir                  raw ''
+               "$SELF" release-buildpk3s data/font-nimbussansl.pk3dir             raw ''
                "$SELF" release-buildpk3s data/xonotic-data.pk3dir       normal '' raw '-raw' low '-low'
                "$SELF" release-buildpk3s data/xonotic-maps.pk3dir       normal '' raw '-raw' low '-low'
                "$SELF" release-buildpk3s data/xonotic-music.pk3dir      normal '' raw '-raw' low '-low'
@@ -1055,10 +1058,11 @@ case "$cmd" in
                ;;
        release)
                "$SELF" release-prepare
-               "$SELF" release-engine
-               "$SELF" release-maps
-               "$SELF" release-finish
-               "$SELF" release-qc
+               "$SELF" release-maps &
+               "$SELF" release-engine &
+               "$SELF" release-finish &
+               "$SELF" release-qc &
+               wait
                "$SELF" release-pack
                ;;