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)))
# - .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++
release_common
binary=$1
basename=${binary##*/}
+ dpname=darkplaces${basename#xonotic}
rev=`( cd "$d0/darkplaces" && git rev-parse HEAD )`
- verbose wget "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"
;;
esac
;;
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-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-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
;;
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)
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
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
(
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
;;
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 '' webp '-high'
- verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir low '-low' normaldds '' mapping '-mapping' webp '-high'
+ 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
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 \
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