X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=bd561dde72a4ca59ef025b5719363aed50f15d00;hp=ba0fd468722a6a258ea1f5b179060b17f57f2c44;hb=cb2a4b93c1c72c8eb8d3d7cdd3b19947893d73e6;hpb=6cac5de9871f54236f608812582ca5ef3160e634 diff --git a/all b/all index ba0fd468..bd561dde 100755 --- a/all +++ b/all @@ -113,12 +113,13 @@ repos_urls=" data/xonotic-data.pk3dir | | master | data/xonotic-maps.pk3dir | | master | data/xonotic-music.pk3dir | | master | -data/xonotic-nexcompat.pk3dir | | master | -mediasource | | master | +data/xonotic-nexcompat.pk3dir | | master | no +mediasource | | master | no darkplaces | | div0-stable | svn fteqcc | git://github.com/Blub/qclib.git | master | -div0-gittools | | master | +div0-gittools | | master | no netradiant | | master | +d0_blind_id | http://github.com/divVerent/d0_blind_id.git | master | " # todo: in darkplaces, change repobranch to div0-stable @@ -171,12 +172,47 @@ repoflags() echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' ' } -repos=`for d in $repos; do - p="${d%dir}" - if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! { [ -f "$d.no" ] || [ -f "$p" ]; }; then +listrepos() +{ + for d in $repos; do + p="${d%dir}" + f="`repoflags "$d"`" + # if we have the dir, always keep it + if [ -d "$d" ]; then + msg "Repository $d enabled because it already exists" + echo "$d" + continue + fi + # if .yes file exists, always keep it + if [ -f "$d.yes" ]; then + msg "Repository $d enabled by a .yes file" + echo "$d" + continue + 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" + continue + fi + # if we have matching pk3, skip + if [ x"$p" != x"$d" ] && [ -f "$p" ]; then + msg "Repository $d disabled by matching .pk3 file, delete $p or create $d.yes to enable" + continue + fi + # if "no" flag is set, skip + case ",$f," in + *,no,*) + msg "Repository $d disabled by default, create $d.yes to enable" + continue + ;; + esac + # default: enable + msg "Repository $d enabled by default" echo "$d" - fi -done` + done +} + +repos=`listrepos` if [ "$#" = 0 ]; then set -- help @@ -229,6 +265,14 @@ fix_upstream_rebase_mergefail() fix_upstream_rebase } +fix_git_config() +{ + verbose git config core.autocrlf input + if [ -z "`git config push.default`" ]; then + verbose git config push.default current # or is tracking better? + fi +} + case "$cmd" in fix_upstream_rebase) for d in $repos; do @@ -247,11 +291,9 @@ case "$cmd" in if [ -d "$d0/$d" ]; then if $allow_pull; then enter "$d0/$d" verbose + fix_git_config verbose git config remote.origin.url "$url" verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" - - verbose git config core.autocrlf input - r=`git symbolic-ref HEAD` r=${r#refs/heads/} if git config branch.$r.remote >/dev/null 2>&1; then @@ -274,6 +316,7 @@ case "$cmd" in else verbose git clone "$url" "$d0/$d" enter "$d0/$d" verbose + fix_git_config if [ "$branch" != "master" ]; then verbose git checkout --track -b "$branch" origin/"$branch" fi @@ -501,21 +544,17 @@ case "$cmd" in fi case "$1" in -c) + cleand0=true cleandp=true cleanqcc=true cleanqc=true shift ;; - -n) - cleandp=false - cleanqcc=false - cleanqc=false - shift - ;; *) + cleand0=false cleandp=false cleanqcc=false - cleanqc=true # version info + cleanqc=false ;; esac if [ $# -gt 0 ] && [ x"$1" = x"" ]; then @@ -562,6 +601,16 @@ case "$cmd" in fi fi + enter "$d0/d0_blind_id" verbose + if ! [ -f Makefile ]; then + verbose sh autogen.sh + verbose ./configure + fi + if $cleand0; then + verbose make $MAKEFLAGS clean + fi + verbose make $MAKEFLAGS + enter "$d0/fteqcc" verbose if $cleanqcc; then verbose make $MAKEFLAGS clean @@ -593,12 +642,13 @@ case "$cmd" in run) if [ -n "$WE_HATE_OUR_USERS" ]; then client= - export PATH="$d0/misc/buildfiles/win32:$PATH" + 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" + 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" client=-sdl else + export LD_LIBRARY_PATH="$d0/d0_blind_id/.libs" client=-sdl fi case "$1" in @@ -862,9 +912,10 @@ case "$cmd" in force=true fi for d in $repos; do - enter "$d0/$d" verbose + verbose cd "$d0/$d" if $force; then - verbose git checkout-index -fa + verbose git reset --hard + #redundant# verbose git checkout-index -fa fi case "$d" in .) @@ -894,8 +945,12 @@ case "$cmd" in esac verbose rm -rf Xonotic Xonotic*.zip verbose mkdir -p Xonotic - verbose date +%Y%m%d > Xonotic/stamp.txt - verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | { + if [ -n "$RELEASEDATE" ]; then + verbose echo "$RELEASEDATE" > Xonotic/stamp.txt + else + verbose date +%Y%m%d > Xonotic/stamp.txt + 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 tar xvf - @@ -904,6 +959,7 @@ case "$cmd" in verbose mv misc/buildfiles/win64 bin64 || true verbose mv misc/buildfiles/osx/* . || true verbose rm -rf misc/buildfiles + verbose rm -rf misc/pki } { verbose cd darkplaces @@ -926,6 +982,7 @@ case "$cmd" in verbose cd Xonotic/source verbose tar xvf - } + rm -f Xonotic/key_15.d0pk ;; release-compile-run) host=$1 @@ -985,14 +1042,14 @@ case "$cmd" in 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$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks"' \ 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-osx-dedicated' + 'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated' ;; release-engine-osx-agl) # 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 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks"' \ '' '' \ - 'cl-release' 'darkplaces-glx:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin' + 'cl-release' 'darkplaces-agl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin' ;; release-engine-osx) verbose "$SELF" release-engine-osx-sv-sdl @@ -1000,13 +1057,13 @@ case "$cmd" in ;; release-engine-linux32) verbose "$SELF" release-compile linux32 \ - 'STRIP=: 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 LIB_JPEG=$HOME/dp.linux32/lib/libjpeg.a' \ + 'STRIP=: 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 LIB_JPEG=$HOME/dp.linux32/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=$HOME/dp.linux32/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 -Wl,--hash-style=sysv -I$HOME/dp.linux64/include -L$HOME/dp.linux64/lib" DP_MODPLUG_STATIC_LIBDIR=$HOME/dp.linux64/lib LIB_JPEG=$HOME/dp.linux64/lib/libjpeg.a' \ + 'STRIP=: 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 LIB_JPEG=$HOME/dp.linux64/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=$HOME/dp.linux64/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' ;; @@ -1173,6 +1230,7 @@ case "$cmd" in Xonotic/*.app \ Xonotic/xonotic-* \ Xonotic/xonotic.exe \ + Xonotic/key_0.d0pk \ Xonotic/data/font-nimbussansl-$stamp.pk3 verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip verbose zip -0yr Xonotic-$stamp.zip \