X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=all;h=06101152eda1e38c3aa8f0a81b6a294f1735774b;hb=501f9c229ffbe74c044771a4ee26ba2bcf66ad3b;hp=9e4dd0dc5043882a168f9cd3032e2dc948cfbf14;hpb=558130f85d9017e69d284bec11b78971497f0a9d;p=xonotic%2Fxonotic.git diff --git a/all b/all index 9e4dd0dc..06101152 100755 --- a/all +++ b/all @@ -108,7 +108,10 @@ yesno() while [ x"$yesno" != x"y" -a x"$yesno" != x"n" ]; do eval "$2" $ECHO "$1" - IFS= read -r yesno + if ! IFS= read -r yesno; then + yesno=n + break + fi done [ x"$yesno" = x"y" ] } @@ -235,7 +238,7 @@ listrepos() fi # if we have .no file, skip if [ -f "$d.no" ]; then - msg "Repository $d disabled by a .no file, delete $p.no to enable" + msg "Repository $d disabled by a .no file, delete $d.no to enable" continue fi # if we have matching pk3, skip @@ -264,6 +267,12 @@ fi cmd=$1 shift +case "$cmd" in + release-*) + export LC_ALL=C + ;; +esac + fix_upstream_rebase() { if [ -z "$r_me" ] || [ -z "$r_other" ]; then @@ -275,6 +284,7 @@ fix_upstream_rebase() r_r=${r_r#refs/heads/} r_rem=`git config "branch.$r_rem.remote" || $ECHO origin` r_bra=`git config "branch.$r_bra.merge" || $ECHO "$r_r"` + r_bra=${r_bra#refs/heads/} if [ x"$r_me" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then if [ x"$r_other" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then return @@ -345,10 +355,20 @@ fix_git_config() verbose git config filter.mapclean.smudge "cat" } +mkzipr() +{ + archive=$1; shift + find "$@" -exec touch -d "1970-01-01 00:00:00 +0000" {} \+ # ugly hack to make the pk3 files rsync-friendly + ziplist=`mktemp` + find "$@" -xtype f \( -executable -or -type l \) -print > "$ziplist" + 7za a -tzip -mx=9 -x@"$ziplist" "$archive" "$@" || true + zip -9y -@<"$ziplist" "$archive" || true + rm -f "$ziplist" +} + mkzip() { - archive=$1 - shift + archive=$1; shift ziplist=`mktemp` find "$@" -xtype f \( -executable -or -type l \) -print > "$ziplist" 7za a -tzip -mx=9 -x@"$ziplist" "$archive" "$@" || true @@ -358,7 +378,8 @@ mkzip() mkzip0() { - zip -0y "$@" + archive=$1; shift + zip -0ry "$archive" "$@" } mirrorspeed() @@ -375,6 +396,7 @@ bestmirror() suf=$1; shift if ! { time -p true; } >/dev/null 2>&1; then + msg "Cannot do timing in this shell" return 1 fi @@ -395,7 +417,7 @@ bestmirror() if t=`mirrorspeed "$m"`; then if [ -n "$t" ]; then tt=$(($t$op)) # fudge factor - msg "$m -> $t$op=$tt ticks" + msg "$m -> $t$op = $tt ticks" if [ -z "$bestt" ] || [ "$tt" -lt "$bestt" ]; then bestin=$in bestt=$tt @@ -497,13 +519,16 @@ case "$cmd" in allow_pull=false elif [ x"$1" = x"-p" ]; then fix_config=true - if [ x"$base" != x"ssh://xonotic@git.xonotic.org/" ]; then - pushbase=ssh://xonotic@git.xonotic.org/ - fi + pushbase=ssh://xonotic@git.xonotic.org/ + elif [ x"$1" = x"-ps" ]; then + fix_config=true + pushbase=ssh://xonotic@git.xonotic.org/ + elif [ x"$1" = x"-ph" ]; then + fix_config=true + pushbase=http://git.xonotic.org/login/xonotic/ elif [ x"$1" = x"-s" ]; then fix_config=true base=ssh://xonotic@git.xonotic.org/ - pushbase= elif [ x"$1" = x"-g" ]; then fix_config=true base=git://git.xonotic.org/xonotic/ @@ -536,13 +561,27 @@ case "$cmd" in fi shift done + case "$location" in + current) + if [ x"`git config xonotic.all.mirrorselection 2>/dev/null || true`" != x"done" ]; then + location=best + fi + ;; + esac case "$location" in best) + # if we fetched via ssh://, switch to git:// for fetching and keep using ssh:// for pushing + case "$base" in + ssh://*|*/login/*) + pushbase=$base + base=git://git.xonotic.org/xonotic/ + ;; + esac newbase=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,:// .git.xonotic.org/,"` case "$newbase" in *\ *) if location=`bestmirror $newbase"xonotic.git" de us nl:'*6/5'`; then # 20% malus to the NL server to not overload it too much - : + git config xonotic.all.mirrorselection done else location=current fi @@ -589,6 +628,11 @@ case "$cmd" in pushurl=`repopushurl "$d"` branch=`repobranch "$d"` if [ -d "$d0/$d" ]; then + # if we have .no file, skip + if [ -f "$d0/$d.no" ]; then + msg "Repository $d disabled by a .no file, delete $d.no to enable; thus, not updated" + continue + fi if $allow_pull; then enter "$d0/$d" verbose r=`git symbolic-ref HEAD` @@ -644,6 +688,9 @@ case "$cmd" in ;; esac fi + if [ -n "$checkoutflags" ]; then + set -- -f "$@" # to make checkself work again + fi exists=false for d in $repos; do enter "$d0/$d" verbose @@ -825,8 +872,15 @@ case "$cmd" in cleanqc=true shift ;; - -r) - debug=release + -r|-p) + case "$1" in + -p) + debug=profile + ;; + -r) + debug=release + ;; + esac export CC="$CC -g" case "`$CC -dumpversion`" in [5-9]*|[1-9][0-9]*|4.[3-9]*|4.[1-9][0-9]*) @@ -912,7 +966,7 @@ case "$cmd" in fi fi - enter "$d0/d0_blind_id" verbose + verbose cd "$d0/d0_blind_id" if ! $compiled0; then # compilation of crypto library failed # use binaries then, if we can... @@ -965,20 +1019,20 @@ case "$cmd" in verbose make $MAKEFLAGS fi - enter "$d0/fteqcc" verbose + verbose cd "$d0/fteqcc" if $cleanqcc; then verbose make $MAKEFLAGS clean fi verbose make $MAKEFLAGS - enter "$d0/data/xonotic-data.pk3dir" verbose + verbose cd "$d0/data/xonotic-data.pk3dir" if $cleanqc; then verbose make FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean fi verbose make FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS # 4 levels up: data, xonotic-data, qcsrc, server - enter "$d0/darkplaces" verbose + verbose cd "$d0/darkplaces" if [ x"$BAD_TARGETS" = x" " ]; then $ECHO "Warning: invalid empty client, default clients will be used." fi @@ -1024,7 +1078,7 @@ case "$cmd" in exit 1 fi fi - set -- "darkplaces/darkplaces$client" -xonotic -mygames "$@" + set -- "darkplaces/darkplaces$client" -xonotic "$@" # if pulseaudio is running: USE IT if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then @@ -1140,6 +1194,13 @@ case "$cmd" in ;; admin-merge) branch=$1 + only_delete=false + case "$branch" in + -d) + branch= + only_delete=true + ;; + esac t=`mktemp` report="" reportecho() @@ -1217,6 +1278,8 @@ case "$cmd" in git push origin :"${ref#refs/remotes/origin/}" reportecho4 "--> branch deleted" fi + elif $only_delete; then + reportecho4 "--> skipped in delete-only run" elif [ -z "$branch" ] && [ -n "$note" ]; then reportdo4 $ECHO "$note" reportecho4 "--> not merging, already had this one rejected before" @@ -1350,7 +1413,6 @@ case "$cmd" in msg "Unknown arg: $X" fi found=true - shift done if ! $found; then rmuntracked=true @@ -1421,13 +1483,7 @@ case "$cmd" in release-prepare) #"$SELF" each git clean -fxd case "$RELEASETYPE" in - beta) - msg "Building a BETA" - ;; - release) - msg "Building a RELEASE" - ;; - *) + '') $ECHO >&2 -n "$ESC[2J$ESC[H" msg "" msg "" @@ -1469,6 +1525,12 @@ case "$cmd" in # (YYYYMMDD) exit 1 ;; + release) + msg "Building a FINISHED RELEASE" + ;; + *) + msg "Building a $RELEASETYPE" + ;; esac verbose rm -rf Xonotic Xonotic*.zip verbose mkdir -p Xonotic @@ -1479,7 +1541,7 @@ case "$cmd" in fi verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles key_0.d0pk | { verbose cd Xonotic - verbose mkdir data fteqcc source source/darkplaces source/fteqcc + verbose mkdir data fteqcc source source/darkplaces source/fteqcc source/d0_blind_id mapping verbose tar xvf - verbose rm -rf misc/builddeps verbose mv misc/buildfiles/win32/* . || true @@ -1509,7 +1571,25 @@ case "$cmd" in verbose cd Xonotic/source verbose tar xvf - } + { + verbose cd d0_blind_id + verbose git archive --format=tar HEAD + } | { + verbose cd Xonotic/source/d0_blind_id + verbose tar xvf - + verbose sh autogen.sh + } rm -f Xonotic/key_15.d0pk + { + verbose cd Xonotic/mapping + verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110223.tar.bz2 + verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110223-win32-7z.exe + for X in *-7z.exe; do + 7za x "$X" + rm -f "$X" + done + # TODO possibly include other tools? + } ;; release-compile-run) host=$1 @@ -1539,7 +1619,7 @@ case "$cmd" in *) verbose rsync --delete -zLvaSHP "$srcdir"/ "$host:$buildpath/" verbose rsync --delete -zLvaSHP "$depsdir"/ "$host:$buildpath.deps/" - verbose ssh "$host" "ln -snf $buildpath.deps $buildpath/.deps && cd $buildpath && nice -`nice` make clean $maketargets $makeflags" + verbose ssh "$host" "export LC_ALL=C; ln -snf $buildpath.deps $buildpath/.deps && cd $buildpath && nice -`nice` make clean $maketargets $makeflags" for f in $targetfiles; do verbose rsync -zvaSHP "$host:$buildpath/${f%:*}" "${f##*:}" || true done @@ -1549,17 +1629,8 @@ case "$cmd" in for f in $targetfiles; do #verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true case "${f##*:}" in - xonotic*.exe) + Xonotic/xonotic*.exe) verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "${f##*:}" - ( - d=`mktemp -d -t rebrand.XXXXXX` - cd "$d" - $ECHO "-mygames" > darkplaces.opt - zip -9r darkplaces.zip darkplaces.opt - cat darkplaces.zip - cd "$d0" - rm -rf "$d" - ) >> "${f##*:}" ;; esac done @@ -1582,7 +1653,7 @@ case "$cmd" in win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \ '' '' verbose "$SELF" release-compile win32 \ - 'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=0' \ + 'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-g++ -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=1' \ '' '' \ release 'darkplaces.exe:Xonotic/xonotic.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe' ;; @@ -1592,7 +1663,7 @@ case "$cmd" in win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-x64.exe' \ 'sv-release sdl-release' 'darkplaces-sdl.exe:Xonotic/xonotic-x64-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-x64-dedicated.exe' verbose "$SELF" release-compile win64 \ - 'STRIP=: DP_MAKE_TARGET=mingw CC="x86_64-w64-mingw32-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DSUPPORTIPV6" WINDRES="x86_64-w64-mingw32-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=0' \ + 'STRIP=: DP_MAKE_TARGET=mingw CC="x86_64-w64-mingw32-g++ -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DSUPPORTIPV6" WINDRES="x86_64-w64-mingw32-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=1' \ '' '' \ cl-release 'darkplaces.exe:Xonotic/xonotic-x64.exe' ;; @@ -1636,16 +1707,8 @@ case "$cmd" in verbose "$SELF" update-maps ;; release-qc) - case "$RELEASETYPE" in - beta) - verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all - # back out of: source/qcsrc/server - ;; - release) - verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 FTEQCCFLAGS_WATERMARK= clean all - ;; - esac - verbose rm -f Xonotic/source/*/fteqcc.log + verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all + verbose rm -f Xonotic/source/qcsrc/*/fteqcc.log ;; release-buildpk3-transform-raw) dir=$1 @@ -1655,11 +1718,25 @@ case "$cmd" in verbose cd "$dir" # texture: convert to jpeg and dds verbose export do_jpeg=true + verbose export jpeg_qual_rgb=97 + verbose export jpeg_qual_a=99 + verbose export do_dds=false + verbose export do_ogg=false + verbose export del_src=true + find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh + ;; + release-buildpk3-transform-normaldds) + dir=$1 + verbose cd "$dir" + # texture: convert to jpeg and dds + # music: reduce bitrate + verbose export do_jpeg=false + verbose export do_jpeg_if_not_dds=true verbose export jpeg_qual_rgb=95 verbose export jpeg_qual_a=99 verbose export do_dds=true verbose export dds_flags= - verbose export do_ogg=false + verbose export do_ogg=true verbose export del_src=true find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh ;; @@ -1721,12 +1798,14 @@ case "$cmd" in verbose rm -rf qcsrc gv=`grep "^gameversion " "defaultXonotic.cfg" | awk '{ print $2 }'` major=$(($gv / 10000)) - minor=$(($gv / 100 - $major * 100)) - patch=$(($gv - $major * 10000 - $minor * 100)) + minor=$((($gv / 100) - ($major * 100))) + patch=$(($gv - ($major * 10000) - ($minor * 100))) versionstr="$major.$minor.$patch" case "$RELEASETYPE" in - beta) - versionstr="$versionstr""beta" + release) + ;; + *) + versionstr="$versionstr$RELEASETYPE" ;; esac verbose sed -i " @@ -1734,6 +1813,13 @@ case "$cmd" in s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/; s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/; " defaultXonotic.cfg + case "$RELEASETYPE" in + release) + echo "" >> defaultXonotic.cfg + echo "// nicer menu" >> defaultXonotic.cfg + echo "set menu_watermark \"\"" >> defaultXonotic.cfg + ;; + esac ( verbose cd gfx/menu/luminos verbose cp "$d0"/mediasource/gfx/menu/luminos_versionbuilder/background_l2.svg . @@ -1751,7 +1837,7 @@ case "$cmd" in fi verbose export git_src_repo="$d0/$src" # skip hash-object verbose "$SELF" release-buildpk3-transform-$transform "Xonotic/temp" - verbose mkzip "../../$dst" * + verbose mkzipr "../../$dst" * verbose cd ../.. verbose rm -rf Xonotic/temp ;; @@ -1775,11 +1861,12 @@ case "$cmd" in done ;; release-pack) - verbose "$SELF" release-buildpk3s data/font-nimbussansl.pk3dir raw '' - verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir normal '' low '-low' lowdds '-lowdds' - verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir normal '' low '-low' lowdds '-lowdds' - verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir raw '' low '-low' - verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir low '' + verbose "$SELF" release-buildpk3s data/font-nimbussansl.pk3dir raw '' + verbose "$SELF" release-buildpk3s data/font-xolonium.pk3dir raw '' + verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir normal '-high' low '-low' normaldds '' + verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir normal '-high' low '-low' normaldds '' + verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir raw '' low '-low' + verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir normal '-high' normaldds '' ;; release-pack-needsx11) case "$DISPLAY" in @@ -1796,7 +1883,7 @@ case "$cmd" in # exe and dll files do not need +x, so this makes them eligible for 7zip compression too chmod a-x Xonotic/*.exe Xonotic/*.dll || true # let's pass crypto import laws of some nasty countries - crypto_libs=`find Xonotic -name \*d0_rijndael\*` + crypto_libs=`find Xonotic -name \*d0_rijndael\*.so -o -name \*d0_rijndael\*.dylib -o -name \*d0_rijndael\*.dll -o -name \*d0_rijndael\*.c` if [ -n "$crypto_libs" ]; then verbose mkzip Xonotic-$stamp-crypto.zip \ $crypto_libs @@ -1819,7 +1906,8 @@ case "$cmd" in Xonotic/fteqcc \ Xonotic/server \ Xonotic/key_0.d0pk \ - Xonotic/data/font-nimbussansl-$stamp.pk3 + Xonotic/data/font-nimbussansl-$stamp.pk3 \ + Xonotic/data/font-xolonium-$stamp.pk3 verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip verbose mkzip0 Xonotic-$stamp.zip \ Xonotic/data/xonotic-$stamp-data.pk3 \ @@ -1831,17 +1919,16 @@ case "$cmd" in Xonotic/data/xonotic-$stamp-data-low.pk3 \ Xonotic/data/xonotic-$stamp-maps-low.pk3 \ Xonotic/data/xonotic-$stamp-music-low.pk3 -# verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp-high.zip -# verbose mkzip0 Xonotic-$stamp-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 - verbose mv Xonotic-$stamp-common.zip Xonotic-$stamp-lowdds.zip - verbose mkzip0 Xonotic-$stamp-lowdds.zip \ - Xonotic/data/xonotic-$stamp-data-lowdds.pk3 \ - Xonotic/data/xonotic-$stamp-maps-lowdds.pk3 \ - Xonotic/data/xonotic-$stamp-music-low.pk3 + verbose mv Xonotic-$stamp-common.zip Xonotic-$stamp-high.zip + verbose mkzip0 Xonotic-$stamp-high.zip \ + Xonotic/data/xonotic-$stamp-data-high.pk3 \ + Xonotic/data/xonotic-$stamp-maps-high.pk3 \ + Xonotic/data/xonotic-$stamp-music.pk3 \ + Xonotic/data/xonotic-$stamp-nexcompat-high.pk3 + verbose mkzip Xonotic-$stamp-mappingsupport.zip \ + Xonotic/mapping + verbose mkzip0 Xonotic-$stamp-mappingsupport.zip \ + Xonotic/data/xonotic-$stamp-maps-low.pk3 # TODO add a Radiant build ;; release) verbose "$SELF" release-prepare @@ -1862,7 +1949,7 @@ case "$cmd" in $ECHO " $SELF checkout|switch /" $ECHO " $SELF clean [-m] [-f | -fu | -fU] [-r] [-D]" $ECHO " $SELF clean --reclone" - $ECHO " $SELF compile [-c] [-r] [-0]" + $ECHO " $SELF compile [-c] [-r|-p] [-0]" $ECHO " $SELF each|foreach [-k] command..." $ECHO " $SELF fix_upstream_rebase" $ECHO " $SELF keygen"