Don't create a top-level gmqcc directory since there are no prebuilt GMQCC binaries...

[xonotic/xonotic.git] / misc / tools / all / release.subr

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index 13cc2bccddd1155a207e467c219f3af3cae0b291..a6263477f1836753a45e04c26ff1cb2e34267031 100644 (file)
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -88,7 +88,7 @@ release_common()
 
        getversion()
        {
-               gv=`grep "^gameversion " "$1/defaultXonotic.cfg" | awk '{ print $2 }'`
+               gv=`grep "^gameversion " "$1/xonotic-common.cfg" | awk '{ print $2 }'`
                major=$(($gv / 10000))
                minor=$((($gv / 100) - ($major * 100)))
                patch=$(($gv - ($major * 10000) - ($minor * 100)))
@@ -172,7 +172,7 @@ case "$cmd" in
                release_git_extract_dir "." "Xonotic" Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh xonotic-linux-dedicated.sh Makefile misc/buildfiles key_0.d0pk COPYING GPL-2 GPL-3
                (
                        verbose cd Xonotic
-                       verbose mkdir data gmqcc source source/darkplaces source/gmqcc source/d0_blind_id mapping
+                       verbose mkdir data source source/darkplaces source/gmqcc source/d0_blind_id mapping
                        verbose rm -rf misc/builddeps
                        verbose mv misc/buildfiles/win32 bin32 || true
                        verbose mv bin32/SDL.dll . || true
@@ -221,7 +221,6 @@ case "$cmd" in
                release_common
                good=true
                verbose "$SELF" release-getbinary Xonotic/xonotic-x86.exe || good=false
-               verbose "$SELF" release-getbinary Xonotic/xonotic-x86-wgl.exe || good=false
                verbose "$SELF" release-getbinary Xonotic/xonotic-x86-dedicated.exe || good=false
                $good
                ;;
@@ -229,7 +228,6 @@ case "$cmd" in
                release_common
                good=true
                verbose "$SELF" release-getbinary Xonotic/xonotic.exe || good=false
-               verbose "$SELF" release-getbinary Xonotic/xonotic-wgl.exe || good=false
                verbose "$SELF" release-getbinary Xonotic/xonotic-dedicated.exe || good=false
                $good
                ;;
@@ -264,7 +262,7 @@ case "$cmd" in
                ;;
        release-qc)
                release_common
-               verbose make -C "$d0/gmqcc" all
+               verbose make -C "$d0/gmqcc" gmqcc
                verbose env GIT_DIR="$d0/data/xonotic-data.pk3dir/.git" make -C Xonotic/source QCC="$d0/gmqcc/gmqcc" XON_BUILDSYSTEM=1 clean all
                ;;
        release-buildpk3-transform-raw)
@@ -394,6 +392,10 @@ case "$cmd" in
                        verbose cp ../source/progs.dat .
                        verbose cp ../source/csprogs.dat .
                        verbose cp ../source/menu.dat .
+                       # Include line numbers in qc errors
+                       verbose cp ../source/progs.lno .
+                       verbose cp ../source/csprogs.lno .
+                       verbose cp ../source/menu.lno .
                        verbose rm -rf qcsrc
                        getversion .
                        case "$RELEASETYPE" in
@@ -409,21 +411,21 @@ case "$cmd" in
                                        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
+                               " < xonotic-common.cfg > xonotic-common.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
+                               " < xonotic-common.cfg > xonotic-common.cfg.new
                        fi
-                       mv defaultXonotic.cfg.new defaultXonotic.cfg
+                       mv xonotic-common.cfg.new xonotic-common.cfg
                        case "$RELEASETYPE" in
                                release)
-                                       echo "" >> defaultXonotic.cfg
-                                       echo "// nicer menu" >> defaultXonotic.cfg
-                                       echo "set menu_watermark \"\"" >> defaultXonotic.cfg
+                                       echo "" >> xonotic-common.cfg
+                                       echo "// nicer menu" >> xonotic-common.cfg
+                                       echo "set menu_watermark \"\"" >> xonotic-common.cfg
                                        ;;
                        esac
                        (
@@ -482,7 +484,7 @@ case "$cmd" in
                verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir             low '-low' normaldds ''                    normal '-high'
                verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir             low '-low' normaldds '' mapping '-mapping' normal '-high'
                verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir     raw '' low '-low'
-               verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                   normaldds ''
+               verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir        low '-low' normaldds ''                    normal '-high'
                ;;
        release-pack-needsx11)
                release_common
@@ -543,12 +545,14 @@ case "$cmd" in
                        verbose mkzip0 Xonotic-$stamp-low$suffix.zip \
                                Xonotic/data/xonotic-$pk3stamp-data-low.pk3 \
                                Xonotic/data/xonotic-$pk3stamp-maps-low.pk3 \
-                               Xonotic/data/xonotic-$pk3stamp-music-low.pk3
+                               Xonotic/data/xonotic-$pk3stamp-music-low.pk3 \
+                               Xonotic/data/xonotic-$pk3stamp-nexcompat-low.pk3
                        verbose mv Xonotic-$stamp-common$suffix.zip Xonotic-$stamp-high$suffix.zip
                        verbose mkzip0 Xonotic-$stamp-high$suffix.zip \
                                Xonotic/data/xonotic-$pk3stamp-data-high.pk3 \
                                Xonotic/data/xonotic-$pk3stamp-maps-high.pk3 \
-                               Xonotic/data/xonotic-$pk3stamp-music.pk3
+                               Xonotic/data/xonotic-$pk3stamp-music.pk3 \
+                               Xonotic/data/xonotic-$pk3stamp-nexcompat-high.pk3
                        # let's pass crypto import laws of some nasty countries
                        find Xonotic -name \*d0_rijndael\*.so -o -name \*d0_rijndael\*.dylib -o -name \*d0_rijndael\*.dll -o -name \*d0_rijndael\*.c -delete
                done