X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=73b1e0456007bf9a8241a27dde3dfcd0064a466e;hp=52766b678da2d15a681bd00e4905cc5ac80962d1;hb=01e631a5e946740d7a90378f2b0facf2ad985ad5;hpb=3300a7a4e6241b9352dfbbf312df7276a7e753bb diff --git a/all b/all index 52766b67..73b1e045 100755 --- a/all +++ b/all @@ -16,7 +16,7 @@ while ! [ -f ./all ]; do fi cd .. done -d0=`pwd` +export d0=`pwd` SELF="$d0/all" # If we are on WINDOWS: @@ -117,7 +117,7 @@ data/xonotic-nexcompat.pk3dir | mediasource | | master | darkplaces | | div0-stable | svn fteqcc | git://github.com/Blub/qclib.git | master | -div0-gittools | git://git.icculus.org/divverent/div0-gittools.git | master | +div0-gittools | | master | netradiant | | master | " # todo: in darkplaces, change repobranch to div0-stable @@ -256,7 +256,7 @@ case "$cmd" in r=${r#refs/heads/} if git config branch.$r.remote >/dev/null 2>&1; then if ! verbose git pull; then - fix_upstream_rebase_mergefailed || true + fix_upstream_rebase_mergefail || true check_mergeconflict "$d" echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort." read -r DUMMY @@ -860,11 +860,12 @@ case "$cmd" in # release building goes here release-prepare) #"$SELF" each git clean -fxd - rm -rf Xonotic + rm -rf Xonotic Xonotic*.zip mkdir -p Xonotic + date +%Y%m%d > Xonotic/stamp.txt git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | { cd Xonotic - mkdir data fteqcc + mkdir data fteqcc darkplaces-src fteqcc-src tar xvf - rm -rf misc/builddeps mv misc/buildfiles/win32/* . || true @@ -872,6 +873,20 @@ case "$cmd" in mv misc/buildfiles/osx/* . || true rm -rf misc/buildfiles } + { + cd darkplaces + git archive --format=tar HEAD + } | { + cd Xonotic/darkplaces-src + tar xvf - + } + { + cd fteqcc + git archive --format=tar HEAD + } | { + cd Xonotic/fteqcc-src + tar xvf - + } ;; release-compile-run) host=$1 @@ -885,17 +900,17 @@ case "$cmd" in rsync --delete -zvaSHPAX "$srcdir"/ "$buildpath/" ( cd $buildpath - eval make clean $maketargets $makeflags + verbose eval make clean $maketargets $makeflags ) for f in $targetfiles; do - mv "$buildpath/${f%:*}" "${f##*:}" + verbose mv "$buildpath/${f%:*}" "${f##*:}" done ;; *) rsync --delete -zvaSHPAX "$srcdir"/ "$host:$buildpath/" - ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags" + verbose ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags" for f in $targetfiles; do - rsync -zvaSHPAX "$host:$buildpath/${f%:*}" "${f##*:}" + verbose rsync -zvaSHPAX "$host:$buildpath/${f%:*}" "${f##*:}" done ;; esac @@ -907,20 +922,20 @@ case "$cmd" in fteqcc_files=$4 darkplaces_maketargets=$5 darkplaces_files=$6 - "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/fteqcc.build."$suffix" "$fteqcc_maketargets" "$makeflags" "fteqcc" "$fteqcc_files" - "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "darkplaces" "$darkplaces_files" + "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/fteqcc.build."$suffix" "$fteqcc_maketargets" "$makeflags" "Xonotic/fteqcc-src" "$fteqcc_files" + "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "Xonotic/darkplaces-src" "$darkplaces_files" ;; release-engine-win32) "$SELF" release-compile win32 \ - '"DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win32/include -L$HOME/dp.win32/lib" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win32/bin/sdl-config"' \ + 'DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win32/include -L$HOME/dp.win32/lib" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win32/bin/sdl-config"' \ win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \ - debug 'darkplaces.exe:xonotic.exe darkplaces-sdl.exe:xonotic-sdl.exe darkplaces-dedicated.exe:xonotic-dedicated.exe' + debug 'darkplaces.exe:Xonotic/xonotic.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe' ;; release-engine-win64) "$SELF" release-compile win64 \ - '"DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win64/include -L$HOME/dp.win64/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win64/bin/sdl-config" LDFLAGS_WINCOMMON=""' \ + 'DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win64/include -L$HOME/dp.win64/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win64/bin/sdl-config" LDFLAGS_WINCOMMON=""' \ win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-64.exe' \ - debug 'darkplaces.exe:xonotic-64.exe darkplaces-sdl.exe:xonotic-sdl-64.exe darkplaces-dedicated.exe:xonotic-dedicated-64.exe' + debug 'darkplaces.exe:Xonotic/xonotic-64.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl-64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-64.exe' ;; release-engine-osx) "$SELF" release-compile osx \ @@ -932,17 +947,17 @@ case "$cmd" in "$SELF" release-compile linux32 \ 'CC="gcc -m32 -g -Wl,--hash-style=sysv -I$HOME/dp.linux32/include -L$HOME/dp.linux32/lib" DP_MODPLUG_STATIC_LIBDIR=$HOME/dp.linux32/lib DP_LINK_TO_LIBJPEG=1' \ all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \ - debug 'darkplaces-glx:Xonotic/xonotic-linux-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated' + debug 'darkplaces-glx:Xonotic/xonotic-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated' ;; release-engine-linux64) "$SELF" release-compile linux64 \ 'CC="gcc -m64 -g -Wl,--hash-style=sysv -I$HOME/dp.linux64/include -L$HOME/dp.linux64/lib" DP_MODPLUG_STATIC_LIBDIR=$HOME/dp.linux64/lib DP_LINK_TO_LIBJPEG=1' \ all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux64' \ - debug 'darkplaces-glx:Xonotic/xonotic-linux-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated' + debug 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated' ;; release-engine) "$SELF" release-engine-win32 & - # "$SELF" release-engine-win64 & + "$SELF" release-engine-win64 & "$SELF" release-engine-osx & "$SELF" release-engine-linux32 & "$SELF" release-engine-linux64 & @@ -951,9 +966,6 @@ case "$cmd" in release-maps) "$SELF" update-maps ;; - release-finish) - # version numnber and stuff like that - ;; release-qc) verbose make -C data/xonotic-data.pk3dir FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK= ;; @@ -970,7 +982,8 @@ case "$cmd" in export do_dds=true export dds_flags= export do_ogg=false - find textures -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh + export del_src=true + find . -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh ;; release-buildpk3-transform-low) dir=$1 @@ -978,12 +991,32 @@ case "$cmd" in # texture: convert to jpeg and dds # music: reduce bitrate export do_jpeg=true - export jpeg_qual_rgb=95 - export jpeg_qual_a=99 + export jpeg_qual_rgb=80 + export jpeg_qual_a=95 export do_dds=false export do_ogg=true export ogg_qual=1 - find textures sound/cdtracks -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh + export del_src=true + find . -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh + ;; + release-buildpk3-transform-lowdds) + dir=$1 + cd "$dir" + # texture: convert to jpeg and dds + # music: reduce bitrate + export do_jpeg=false + export do_jpeg_if_not_dds=true + export jpeg_qual_rgb=80 + export jpeg_qual_a=95 + export do_dds=true + export dds_flags= + export do_ogg=true + export ogg_qual=1 + export del_src=true + find . -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh + if [ -f "quake.rc" ]; then + echo "r_texture_dds_load 1" >> quake.rc + fi ;; release-buildpk3) src=$1 @@ -1014,12 +1047,24 @@ case "$cmd" in for X in data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do if [ -f "$X" ]; then ( - cd Xonotic/data/xonotic-maps.pk3dir - unzip ../../../"$X" + cd Xonotic/temp + unzip ../../"$X" ) fi done fi + if [ -f "defaultXonotic.cfg" ]; then + gv=`grep "^gameversion " "defaultXonotic.cfg" | awk '{ print $2 }'` + major=$(($gv / 10000)) + minor=$(($gv / 100 - $major * 100)) + patch=$(($gv - $major * 10000 - $minor * 100)) + sed -i " + s/^set g_xonoticversion [^ ]* /set g_xonoticversion $major.$minor.$patch /; + s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/; + s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/; + " defaultXonotic.cfg + echo "r_texture_dds_load 1" >> quake.rc + fi "$SELF" release-buildpk3-transform-$transform "Xonotic/temp" cd Xonotic/temp zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" . @@ -1027,28 +1072,88 @@ case "$cmd" in rm -rf Xonotic/temp ;; release-buildpk3s) + stamp=`cat Xonotic/stamp.txt` src=$1 shift + dst=${src%.pk3dir} + case "$dst" in + data/xonotic-*) + dst="data/xonotic-$stamp-${dst#data/xonotic-}" + ;; + *) + dst="$dst-$stamp" + ;; + esac while [ "$#" -gt 1 ]; do - "$SELF" release-buildpk3 "$src" "Xonotic/${src%.pk3dir}$2.pk3" "$1" + "$SELF" release-buildpk3 "$src" "Xonotic/$dst$2.pk3" "$1" shift shift done ;; release-pack) "$SELF" release-buildpk3s data/font-nimbussansl.pk3dir raw '' - "$SELF" release-buildpk3s data/xonotic-data.pk3dir normal '' raw '-raw' low '-low' - "$SELF" release-buildpk3s data/xonotic-maps.pk3dir normal '' raw '-raw' low '-low' - "$SELF" release-buildpk3s data/xonotic-music.pk3dir normal '' raw '-raw' low '-low' + "$SELF" release-buildpk3s data/xonotic-data.pk3dir normal '' raw '-raw' low '-low' lowdds '-lowdds' + "$SELF" release-buildpk3s data/xonotic-maps.pk3dir normal '' raw '-raw' low '-low' lowdds '-lowdds' + "$SELF" release-buildpk3s data/xonotic-music.pk3dir raw '' low '-low' "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir low '' ;; + release-pack-needsx11) + case "$DISPLAY" in + '') + startx "$SELF" release-pack -- /usr/bin/Xvfb :7 + ;; + *) + "$SELF" release-pack + ;; + esac + ;; + release-zip) + stamp=`cat Xonotic/stamp.txt` + zip -9r Xonotic-common.zip \ + Xonotic/*.dll \ + Xonotic/darkplaces-src \ + Xonotic/Docs \ + Xonotic/fteqcc-src \ + Xonotic/misc \ + Xonotic/fteqcc \ + Xonotic/server \ + Xonotic/*.app \ + Xonotic/xonotic-* \ + Xonotic/data/font-nimbussansl-$stamp.pk3 + cp Xonotic-common.zip Xonotic.zip + zip -0r Xonotic.zip \ + Xonotic/data/xonotic-$stamp-data.pk3 \ + Xonotic/data/xonotic-$stamp-maps.pk3 \ + Xonotic/data/xonotic-$stamp-music.pk3 \ + Xonotic/data/xonotic-$stamp-nexcompat.pk3 + cp Xonotic-common.zip Xonotic-low.zip + zip -0r Xonotic-low.zip \ + Xonotic/data/xonotic-$stamp-data-low.pk3 \ + Xonotic/data/xonotic-$stamp-maps-low.pk3 \ + Xonotic/data/xonotic-$stamp-music-low.pk3 \ + Xonotic/data/xonotic-$stamp-nexcompat.pk3 + cp Xonotic-common.zip Xonotic-lowdds.zip + zip -0r Xonotic-lowdds.zip \ + Xonotic/data/xonotic-$stamp-data-lowdds.pk3 \ + Xonotic/data/xonotic-$stamp-maps-lowdds.pk3 \ + Xonotic/data/xonotic-$stamp-music-low.pk3 \ + Xonotic/data/xonotic-$stamp-nexcompat.pk3 + cp Xonotic-common.zip Xonotic-high.zip + zip -0r Xonotic-high.zip \ + Xonotic/data/xonotic-$stamp-data-raw.pk3 \ + Xonotic/data/xonotic-$stamp-maps-raw.pk3 \ + Xonotic/data/xonotic-$stamp-music.pk3 \ + Xonotic/data/xonotic-$stamp-nexcompat.pk3 + rm -f Xonotic-common.zip + ;; release) "$SELF" release-prepare - "$SELF" release-maps - "$SELF" release-finish - "$SELF" release-engine + "$SELF" release-maps & + "$SELF" release-engine & + wait "$SELF" release-qc - "$SELF" release-pack + "$SELF" release-pack-needsx11 + "$SELF" release-zip ;; *)