X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=58e1ea40bf8011ec3a6b4d971287cbc4df4f3403;hp=050516b519b871edd3364f5d4f9356bab770f435;hb=6a6224ed323fdb7442d1a878e00456ef52d58715;hpb=c4af07662d9336a8e4fe3547d8de22c9037eb181 diff --git a/all b/all index 050516b5..58e1ea40 100755 --- a/all +++ b/all @@ -205,6 +205,9 @@ listrepos() continue ;; esac + # default: enable + msg "Repository $d enabled by default" + echo "$d" done } @@ -545,16 +548,10 @@ case "$cmd" in cleanqc=true shift ;; - -n) - cleandp=false - cleanqcc=false - cleanqc=false - shift - ;; *) cleandp=false cleanqcc=false - cleanqc=true # version info + cleanqc=false ;; esac if [ $# -gt 0 ] && [ x"$1" = x"" ]; then @@ -901,9 +898,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 .) @@ -933,7 +931,11 @@ case "$cmd" in esac verbose rm -rf Xonotic Xonotic*.zip verbose mkdir -p Xonotic - verbose date +%Y%m%d > Xonotic/stamp.txt + 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 | { verbose cd Xonotic verbose mkdir data fteqcc source source/darkplaces source/fteqcc @@ -1031,7 +1033,7 @@ case "$cmd" in 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