fix yet another ./all typo

[xonotic/xonotic.git] / all

diff --git a/all b/all
index a18991e368d894f38c01228470cdf134670f636b..cc26e5be4dcd64b745e4095638290194e3a1e3fb 100755 (executable)
--- a/all
+++ b/all
@@ -39,23 +39,10 @@ msg()
        echo "\e[1m$*\e[m"
 }
 
-checksum()
-{
-       if [ -x /usr/bin/md5sum ]; then
-               /usr/bin/md5sum "$@"
-       elif [ -x /bin/md5sum ]; then
-               /bin/md5sum "$@"
-       elif [ -x /usr/bin/cksum ]; then
-               /usr/bin/cksum "$@"
-       else
-               echo "NOCHECKSUM"
-       fi
-}
-
-self=`checksum "$SELF"`
+self=`git hash-object "$SELF"`
 checkself()
 {
-       self_new=`checksum "$SELF"`
+       self_new=`git hash-object "$SELF"`
        if [ x"$self" != x"$self_new" ]; then
                msg "./all has changed."
                if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
@@ -188,7 +175,7 @@ repoflags()
 
 repos=`for d in $repos; do
        p="${d%dir}"
-       if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! [ -f "$p" ]; then
+       if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! { [ -f "$d.no" ] || [ -f "$p" ]; }; then
                echo "$d"
        fi
 done`
@@ -413,7 +400,7 @@ case "$cmd" in
                        rem=`git config "branch.$r.remote" || echo origin`
                        bra=`git config "branch.$r.merge" || echo "$r"`
                        upstream="$rem/$bra"
-                       if ! [ git rev-parse "$upstream" ]; then
+                       if ! git rev-parse "$upstream" >/dev/null 2>&1; then
                                upstream="`repobranch "$d"`"
                        fi
                        if git log "$upstream".."$r" | grep .; then
@@ -803,7 +790,7 @@ case "$cmd" in
        release-engine-osx)
                rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/osx/* Xonotic/
                "$SELF" release-compile osx \
-                       'CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"' \
+                       'CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"' \
                        all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \
                        sdl-debug 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin'
                ;;
@@ -839,13 +826,32 @@ case "$cmd" in
                # version numnber and stuff like that
                ;;
        release-buildpk3-transform-raw)
+               dir=$1
                ;;
        release-buildpk3-transform-normal)
-               # texture: convert to jpeg
+               dir=$1
+               cd "$dir"
+               # texture: convert to jpeg and dds
+               export do_jpeg=true
+               export jpeg_qual_rgb=95
+               export jpeg_qual_a=99
+               export do_dds=true
+               export dds_flags=
+               export do_ogg=false
+               find textures -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
                ;;
        release-buildpk3-transform-low)
-               # texture: convert to jpeg and downscale
+               dir=$1
+               cd "$dir"
+               # texture: convert to jpeg and dds
                # music: reduce bitrate
+               export do_jpeg=true
+               export jpeg_qual_rgb=95
+               export jpeg_qual_a=99
+               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
                ;;
        release-buildpk3)
                src=$1
@@ -861,7 +867,9 @@ case "$cmd" in
                rm -rf Xonotic/temp
                rsync --exclude=.git -vaSHPAX "$src"/ "Xonotic/temp"
                "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
-               7za a -tzip -mx=9 "$dst" .
+               cd Xonotic/temp
+               zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
+               cd ../..
                rm -rf Xonotic/temp
                ;;
        release-buildpk3s)
@@ -869,28 +877,23 @@ case "$cmd" in
                shift
                while [ "$#" -gt 1 ]; do
                        "$SELF" release-buildpk3 "$src" "Xonotic/${src%.pk3dir}$2.pk3" "$1"
+                       shift
+                       shift
                done
-               rm -rf "$src"
                ;;
        release-pack)
-#"$SELF" release-buildpk3s data/font-dejavu.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'
-#"$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                       low ''
-               "$SELF" release-buildpk3s data/font-dejavu.pk3dir        raw ''
-               "$SELF" release-buildpk3s data/xonotic-data.pk3dir       raw ''
-               "$SELF" release-buildpk3s data/xonotic-maps.pk3dir       raw ''
-               "$SELF" release-buildpk3s data/xonotic-music.pk3dir      raw ''
-               "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir  raw ''
+               "$SELF" release-buildpk3s data/font-dejavu.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'
+               "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                       low ''
                ;;
        release)
                "$SELF" release-prepare
-               "$SELF" release-engine
-               "$SELF" release-gamedata
                "$SELF" release-maps
                "$SELF" release-finish
                "$SELF" release-pack
+               "$SELF" release-engine
                ;;
        *)
                echo "Usage:"