]> git.xonotic.org Git - xonotic/xonotic.git/blobdiff - misc/tools/all/release.subr
projects / xonotic / xonotic.git / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
rename all the configs
[xonotic/xonotic.git] / misc / tools / all / release.subr
diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index 60e6940661ef0f7ea91f53c453004d4bf424c357..0b30a9bdc55fdc646d8860766abf82716425686e 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)))
@@ -130,7 +130,6 @@ case "$cmd" in
                                # - .ssh/config must be configured so the following
                                #   host names are reachable and have a compile
                                #   infrastructure set up:
-                               #   - xonotic-build-linux32 (with gcc on x86)
                                #   - xonotic-build-linux64 (with gcc on x86_64)
                                #   - xonotic-build-win32 (with i586-mingw32msvc-g++)
                                #   - xonotic-build-win64 (with amd64-mingw32msvc-g++
@@ -207,13 +206,12 @@ case "$cmd" in
                release_common
                binary=$1
                basename=${binary##*/}
+               dpname=darkplaces${basename#xonotic}
                rev=`( cd "$d0/darkplaces" && git rev-parse HEAD )`
-               verbose wget -O "$binary" "http://beta.xonotic.org/autobuild-bin/$rev/$basename"
-               # TODO eventually do the rebranding on travis too.
+               verbose wget -O "$binary" "http://beta.xonotic.org/autobuild-bin/$rev/$dpname"
+               [ -s "$binary" ] || rm -f "$binary"
+               [ -f "$binary" ]
                case "$binary" in
-                       Xonotic/xonotic*.exe)
-                               verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "$binary"
-                               ;;
                        Xonotic/*osx*|Xonotic/*linux*)
                                chmod +x "$binary"
                                ;;
@@ -221,41 +219,44 @@ case "$cmd" in
                ;;
        release-engine-win32)
                release_common
-               verbose "$SELF" release-getbinary Xonotic/xonotic.exe || true
-               verbose "$SELF" release-getbinary Xonotic/xonotic-sdl.exe || true
-               verbose "$SELF" release-getbinary Xonotic/xonotic-dedicated.exe || true
+               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
                ;;
        release-engine-win64)
                release_common
-               verbose "$SELF" release-getbinary Xonotic/xonotic-x64.exe || true
-               verbose "$SELF" release-getbinary Xonotic/xonotic-x64-sdl.exe || true
-               verbose "$SELF" release-getbinary Xonotic/xonotic-x64-dedicated.exe || true
+               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
                ;;
        release-engine-osx)
                release_common
-               verbose "$SELF" release-getbinary Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin || true
-               verbose "$SELF" release-getbinary Xonotic/xonotic-osx-dedicated || true
-               ;;
-       release-engine-linux32)
-               release_common
-               verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-glx || true
-               verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-sdl || true
-               verbose "$SELF" release-getbinary Xonotic/xonotic-linux32-dedicated || true
+               good=true
+               verbose "$SELF" release-getbinary Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin || good=false
+               verbose "$SELF" release-getbinary Xonotic/xonotic-osx-dedicated || good=false
+               $good
                ;;
        release-engine-linux64)
                release_common
-               verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-glx || true
-               verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-sdl || true
-               verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-dedicated || true
+               good=true
+               verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-sdl || good=false
+               verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-glx || good=false
+               verbose "$SELF" release-getbinary Xonotic/xonotic-linux64-dedicated || good=false
+               $good
                ;;
        release-engine)
                release_common
                # TODO report failures here.
-               verbose "$SELF" release-engine-linux32 || true
-               verbose "$SELF" release-engine-linux64 || true
-               verbose "$SELF" release-engine-win32 || true
-               verbose "$SELF" release-engine-win64 || true
-               verbose "$SELF" release-engine-osx || true
+               good=false
+               verbose "$SELF" release-engine-linux64 && good=true
+               verbose "$SELF" release-engine-win32 && good=true
+               verbose "$SELF" release-engine-win64 && good=true
+               verbose "$SELF" release-engine-osx && good=true
+               $good
                ;;
        release-maps)
                release_common
@@ -408,21 +409,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
                        (
@@ -432,6 +433,7 @@ case "$cmd" in
                                verbose "$d0"/mediasource/gfx/menu/luminos_versionbuilder/versionbuilder "$versionstr"
                                verbose rm background_l2.svg
                        )
+                       verbose "$d0"/mediasource/gfx/luma/render-version.sh "$d0/mediasource/gfx/luma" "$PWD" "$versionstr"
                fi
                if [ x"$src" = x"data/xonotic-maps.pk3dir" ]; then
                        for X in ../../data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
@@ -475,6 +477,7 @@ case "$cmd" in
                ;;
        release-pack)
                release_common
+               verbose "$SELF" release-buildpk3s data/font-unifont.pk3dir      raw ''
                verbose "$SELF" release-buildpk3s data/font-xolonium.pk3dir     raw ''
                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'
@@ -522,6 +525,7 @@ case "$cmd" in
                                Xonotic/gmqcc \
                                Xonotic/server \
                                Xonotic/key_0.d0pk \
+                               Xonotic/data/font-unifont-$pk3stamp.pk3 \
                                Xonotic/data/font-xolonium-$pk3stamp.pk3
                        verbose cp Xonotic-$stamp-enginesource$suffix.zip Xonotic-$stamp-source$suffix.zip
                        verbose mkzip Xonotic-$stamp-source$suffix.zip \