fix launcher for now (but do we want to keep it?)

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 199b776839dc494429af7d36f2b5abe4c7d319dc..1edecb2990bdba30b6b2c02b7380e6df3e70a870 100755 (executable)
--- a/all
+++ b/all
@@ -860,6 +860,18 @@ case "$cmd" in
        # release building goes here
        release-prepare)
                #"$SELF" each git clean -fxd
+               case "$RELEASETYPE" in
+                       beta)
+                               msg "Building a BETA"
+                               ;;
+                       release)
+                               msg "Building a RELEASE"
+                               ;;
+                       *)
+                               msg "Must either set RELEASETYPE=beta or RELEASETYPE=release"
+                               exit 1
+                               ;;
+               esac
                verbose rm -rf Xonotic Xonotic*.zip
                verbose mkdir -p Xonotic
                verbose date +%Y%m%d > Xonotic/stamp.txt
@@ -976,10 +988,10 @@ case "$cmd" in
        release-qc)
                case "$RELEASETYPE" in
                        beta)
-                               verbose make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK= clean all
+                               verbose make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
                                ;;
                        release)
-                               verbose make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK= clean all
+                               verbose make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 FTEQCCFLAGS_WATERMARK= clean all
                                ;;
                esac
                verbose rm -f Xonotic/source/*/fteqcc.log
@@ -1055,9 +1067,9 @@ case "$cmd" in
                }
                verbose cd Xonotic/temp
                if [ x"$src" = x"data/xonotic-data.pk3dir" ]; then
-                       verbose cp ../progs.dat .
-                       verbose cp ../csprogs.dat .
-                       verbose cp ../menu.dat .
+                       verbose cp ../source/progs.dat .
+                       verbose cp ../source/csprogs.dat .
+                       verbose cp ../source/menu.dat .
                        verbose rm -rf qcsrc
                        gv=`grep "^gameversion " "defaultXonotic.cfg" | awk '{ print $2 }'`
                        major=$(($gv / 10000))
@@ -1121,7 +1133,7 @@ case "$cmd" in
                stamp=`cat Xonotic/stamp.txt`
                verbose zip -9yr Xonotic-common.zip \
                        Xonotic/*.dll \
-                       Xonotic/source \
+                       Xonotic/source/*/ \
                        Xonotic/Docs \
                        Xonotic/misc \
                        Xonotic/fteqcc \