]> de.git.xonotic.org Git - xonotic/xonotic.git/blobdiff - all
add license files... forgot to do that all the time, apparently
[xonotic/xonotic.git] / all
diff --git a/all b/all
index 92e63400ab973e30be8709e80c2e1ba967f1bd98..12b77cf7230e93a297077024e4efb5383e5ca48a 100755 (executable)
--- a/all
+++ b/all
@@ -771,10 +771,8 @@ case "$cmd" in
                        else
                                b=`repobranch "$d"`
                                if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
-                                       exists=true
                                        verbose git checkout $checkoutflags "$b"
                                elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
-                                       exists=true
                                        verbose git checkout $checkoutflags --track -b "$b" "$remote/$b"
                                else
                                        $ECHO "WTF? Not even branch $b doesn't exist in $d"
@@ -1848,11 +1846,21 @@ case "$cmd" in
                                        versionstr="$versionstr$RELEASETYPE"
                                        ;;
                        esac
-                       verbose sed "
-                               s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
-                               s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
-                               s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/;
-                       " < defaultXonotic.cfg > defaultXonotic.cfg.new
+                       if [ $gv -lt 900 ]; then
+                               # pre-1.0: compatible with any other pre-1.0
+                               verbose sed "
+                                       s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
+                                       s/^gameversion_min [0-9]*/gameversion_min     0/;
+                                       s/^gameversion_max [0-9]*/gameversion_max  9999/;
+                               " < defaultXonotic.cfg > defaultXonotic.cfg.new
+                       else
+                               # >= 1.0
+                               verbose sed "
+                                       s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
+                                       s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
+                                       s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/;
+                               " < defaultXonotic.cfg > defaultXonotic.cfg.new
+                       fi
                        mv defaultXonotic.cfg.new defaultXonotic.cfg
                        case "$RELEASETYPE" in
                                release)
@@ -1932,7 +1940,8 @@ case "$cmd" in
                crypto_libs=`find Xonotic -name \*d0_rijndael\*.so -o -name \*d0_rijndael\*.dylib -o -name \*d0_rijndael\*.dll -o -name \*d0_rijndael\*.c`
                if [ -n "$crypto_libs" ]; then
                        verbose mkzip Xonotic-$stamp-crypto.zip \
-                               $crypto_libs
+                               $crypto_libs \
+                               COPYING GPL-2 GPL-3
                        rm -f $crypto_libs
                fi
                # build the archives
@@ -1942,7 +1951,8 @@ case "$cmd" in
                        Xonotic/*.app \
                        Xonotic/xonotic-* \
                        Xonotic/xonotic.exe \
-                       Xonotic/source/darkplaces/
+                       Xonotic/source/darkplaces/ \
+                       COPYING GPL-2 GPL-3
                verbose cp Xonotic-$stamp-engine.zip Xonotic-$stamp-common.zip
                verbose mkzip Xonotic-$stamp-common.zip \
                        Xonotic/source/fteqcc/ \