also compress textures in models/

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 7179a3bf71c8f1e2c28184900682d47585891835..9152a7ea4aef7e8a55874667313b86390e9e33d0 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 &
@@ -984,7 +984,7 @@ case "$cmd" in
                export do_dds=true
                export dds_flags=
                export do_ogg=false
-               find textures -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
+               find models textures -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
                ;;
        release-buildpk3-transform-low)
                dir=$1
@@ -997,7 +997,7 @@ case "$cmd" in
                export do_dds=false
                export do_ogg=true
                export ogg_qual=1
-               find textures sound/cdtracks -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
+               find models textures sound/cdtracks -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
                ;;
        release-buildpk3)
                src=$1
@@ -1056,6 +1056,16 @@ case "$cmd" in
                "$SELF" release-buildpk3s data/xonotic-music.pk3dir      normal '' raw '-raw' low '-low'
                "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                       low ''
                ;;
+       release-pack-needsx11)
+               case "$DISPLAY" in
+                       '')
+                               startx "$SELF" release-pack -- /usr/bin/Xvfb :7
+                               ;;
+                       *)
+                               "$SELF" release-pack
+                               ;;
+               esac
+               ;;
        release)
                "$SELF" release-prepare
                "$SELF" release-maps &
@@ -1063,7 +1073,7 @@ case "$cmd" in
                "$SELF" release-finish &
                "$SELF" release-qc &
                wait
-               "$SELF" release-pack
+               "$SELF" release-pack-needsx11
                ;;
 
        *)