X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=all;h=381e9f7fb5c3206983e35e7481b15357fbe83faf;hb=c8b899ef1adc8e88174085a04bd42698271f0ad7;hp=02fb854c67df82aa49699e2ea2e2abca590beea7;hpb=1b2c9a2d1c8380ec613fc007e098eb7634204e00;p=xonotic%2Fxonotic.git diff --git a/all b/all index 02fb854c..381e9f7f 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 @@ -346,10 +355,20 @@ fix_git_config() verbose git config filter.mapclean.smudge "cat" } +mkzipr() +{ + archive=$1; shift + find "$@" -exec touch -d "2001-01-01 01:01:01 +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 @@ -359,7 +378,8 @@ mkzip() mkzip0() { - zip -0y "$@" + archive=$1; shift + zip -0ry "$archive" "$@" } mirrorspeed() @@ -376,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 @@ -543,7 +564,6 @@ case "$cmd" in case "$location" in current) if [ x"`git config xonotic.all.mirrorselection 2>/dev/null || true`" != x"done" ]; then - git config xonotic.all.mirrorselection done location=best fi ;; @@ -561,7 +581,7 @@ case "$cmd" in 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 @@ -608,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` @@ -663,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 @@ -844,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]*) @@ -877,7 +912,7 @@ case "$cmd" in TARGETS="sv-$debug sdl-$debug" ;; esac - export CC="$CC -fno-reorder-blocks -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks" + export CC="$CC -fno-reorder-blocks -I$PWD/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks" else TARGETS="sv-$debug cl-$debug sdl-$debug" fi @@ -931,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... @@ -984,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 @@ -1018,8 +1053,8 @@ case "$cmd" in client= export PATH="$d0/misc/buildfiles/win32:$d0/d0_blind_id/.libs:$PATH" elif [ x"`uname`" = x"Darwin" ]; then - export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS:$d0/d0_blind_id/.libs" - export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks" + export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic.app/Contents/MacOS:$d0/d0_blind_id/.libs" + export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks" client=-sdl else export LD_LIBRARY_PATH="$d0/d0_blind_id/.libs" @@ -1043,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 @@ -1378,7 +1413,6 @@ case "$cmd" in msg "Unknown arg: $X" fi found=true - shift done if ! $found; then rmuntracked=true @@ -1507,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 source/d0_blind_id + 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 @@ -1546,6 +1580,16 @@ case "$cmd" in 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 @@ -1575,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" "[ -f /etc/profile ] && . /etc/profile; [ -f ~/.profile ] && . ~/.profile; 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 @@ -1587,15 +1631,6 @@ case "$cmd" in case "${f##*:}" in 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 @@ -1614,44 +1649,40 @@ case "$cmd" in ;; release-engine-win32) verbose "$SELF" release-compile win32 \ - 'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -march=i686 -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-gcc -march=i686 -g1 -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' \ win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \ '' '' verbose "$SELF" release-compile win32 \ - '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' \ + 'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-g++ -g1 -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' ;; release-engine-win64) verbose "$SELF" release-compile win64 \ - 'STRIP=: DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DSUPPORTIPV6" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=0' \ + 'STRIP=: DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DSUPPORTIPV6" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=0' \ 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-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' \ + 'STRIP=: DP_MAKE_TARGET=mingw CC="x86_64-w64-mingw32-g++ -g1 -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' ;; release-engine-osx) # gcc on OSX is buggy, needs -fno-reorder-blocks for a release build to succeed verbose "$SELF" release-compile osx \ - 'STRIP=: CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I.deps/include -L.deps/lib -fno-reorder-blocks -DSUPPORTIPV6"' \ + 'STRIP=: CC="gcc -g1 -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I.deps/include -L.deps/lib -fno-reorder-blocks -DSUPPORTIPV6"' \ all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \ - 'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated' - verbose "$SELF" release-compile osx \ - 'STRIP=: CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I.deps/include -L.deps/lib -fno-reorder-blocks -DSUPPORTIPV6"' \ - '' '' \ - 'cl-release' 'darkplaces-agl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin' + 'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated' ;; release-engine-linux32) verbose "$SELF" release-compile linux32 \ - 'STRIP=: CC="gcc -m32 -march=i686 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \ + 'STRIP=: CC="gcc -m32 -march=i686 -g1 -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \ all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \ release 'darkplaces-glx:Xonotic/xonotic-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated' ;; release-engine-linux64) verbose "$SELF" release-compile linux64 \ - 'STRIP=: CC="gcc -m64 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \ + 'STRIP=: CC="gcc -m64 -g1 -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \ all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux64' \ release 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated' ;; @@ -1802,7 +1833,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 ;; @@ -1871,7 +1902,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 \ @@ -1889,6 +1921,10 @@ case "$cmd" in 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 @@ -1909,7 +1945,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"