X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=9d718df320140c31545b74401dae8247fdaad09d;hp=1f939e9e66fbee40e9d1716f9915fff87aa38d8e;hb=11f523efd249be0dec7534ae539a6de65678379c;hpb=347996194d709cf4bfd4fa95fd349d977047f733;ds=sidebyside diff --git a/all b/all index 1f939e9e..9d718df3 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: @@ -104,7 +104,7 @@ yesno() enter() { - $2 cd "$1" + $2 cd "$1" || exit 1 check_mergeconflict "$1" } @@ -117,8 +117,9 @@ 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 | +d0_blind_id | http://github.com/divVerent/d0_blind_id.git | master | " # todo: in darkplaces, change repobranch to div0-stable @@ -184,7 +185,58 @@ fi cmd=$1 shift +fix_upstream_rebase() +{ + if [ -z "$r_me" ] || [ -z "$r_other" ]; then + return + fi + r_base=`git merge-base "$r_me" "$r_other"` + + # no merge-base? upstream did filter-branch + if [ -n "$r_base" ]; then + # otherwise, check if the two histories are "similar" + r_l_me=`git log --pretty="format:%s" "$r_other".."$r_me" | grep -v "^Merge" | sort -u` + r_l_other=`git log --pretty="format:%s" "$r_me".."$r_other" | grep -v "^Merge" | sort -u` + + # heuristics: upstream rebase/filter-branch if more than 50% of the commits of one of the sides are in the other too + r_lc_me=`echo "$r_l_me" | wc -l` + r_lc_other=`echo "$r_l_other" | wc -l` + r_lc_together=`{ echo "$r_l_me"; echo "$r_l_other"; } | sort -u | wc -l` + r_lc_same=$(($r_lc_me + $r_lc_other - $r_lc_together)) + + if [ $(( $r_lc_same * 2 )) -gt $(( $r_lc_me )) ] || [ $(( $r_lc_same * 2 )) -gt $(( $r_lc_other )) ]; then + if yesno "Probable upstream rebase detected, automatically fix?" 'git log --oneline --graph --date-order --left-right "$r_other"..."$r_me"'; then + git reset --hard "$r_me" + git pull --rebase + return 1 + fi + fi + fi + + return 0 +} + +fix_upstream_rebase_mergeok() +{ + r_me=`git rev-parse --revs-only HEAD^1 2>/dev/null || true` + r_other=`git rev-parse --revs-only HEAD^2 2>/dev/null || true` + fix_upstream_rebase +} + +fix_upstream_rebase_mergefail() +{ + r_me=`git rev-parse --revs-only HEAD 2>/dev/null || true` + r_other=`git rev-parse --revs-only MERGE_HEAD 2>/dev/null || true` + fix_upstream_rebase +} + case "$cmd" in + fix_upstream_rebase) + for d in $repos; do + enter "$d0/$d" verbose + verbose fix_upstream_rebase_mergefail && verbose fix_upstream_rebase_mergeok + done + ;; update|pull) allow_pull=true if [ x"$1" = x"-N" ]; then @@ -199,13 +251,18 @@ case "$cmd" in verbose git config remote.origin.url "$url" verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" + verbose git config remote.origin.autocrlf input + r=`git symbolic-ref HEAD` r=${r#refs/heads/} if git config branch.$r.remote >/dev/null 2>&1; then if ! verbose git pull; then + fix_upstream_rebase_mergefail || true check_mergeconflict "$d" echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort." read -r DUMMY + else + fix_upstream_rebase_mergeok || true fi fi @@ -319,7 +376,7 @@ case "$cmd" in branches) for d in $repos; do cd "$d0/$d" # am in a pipe, shouldn't use enter - git branch -a -v -v | cut -c 3- | sed "s,^,$d ," + git branch -a -v -v | cut -c 3- | sed "s/^(no branch)/(no_branch)/" | sed "s,^,$d ," cd "$d0" done | { branches_list= @@ -398,7 +455,7 @@ case "$cmd" in fi rem=`git config "branch.$r.remote" || echo origin` bra=`git config "branch.$r.merge" || echo "$r"` - upstream="$rem/$bra" + upstream="$rem/${bra#refs/heads/}" if ! git rev-parse "$upstream" >/dev/null 2>&1; then upstream="origin/`repobranch "$d"`" fi @@ -424,51 +481,73 @@ case "$cmd" in if [ -z "$CC" ]; then export CC=gcc fi - elif [ x"`uname`" = x"Darwin" ] && [ x"`uname -r`" = x"10.3.0" ]; then - TARGETS="sv-debug sdl-debug" - # AGL is broken in Snow Leopard, so default to SDL. - if [ x"`uname -r`" != x"10.3.0" ]; then - TARGETS="$TARGETS cl-debug" - fi + elif [ x"`uname`" = x"Darwin" ]; then + case "`uname -r`" in + ?.*) + TARGETS="sv-debug cl-debug sdl-debug" + ;; + *) + # AGL cannot be compiled on systems with a kernel > 10.x (Snow Leopard) + TARGETS="sv-debug sdl-debug" + ;; + esac export CC="gcc -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks" else TARGETS="sv-debug cl-debug sdl-debug" fi case "$1" in -c) + cleand0=true cleandp=true cleanqcc=true cleanqc=true shift ;; -n) + cleand0=false cleandp=false cleanqcc=false cleanqc=false shift ;; *) + cleand0=false cleandp=false cleanqcc=false cleanqc=true # version info ;; esac - if [ -n "$1" ]; then + if [ $# -gt 0 ] && [ x"$1" = x"" ]; then + # if we give the command make the arg "", it will surely fail (invalid filename), + # so better handle it as an empty client option + BAD_TARGETS=" " + shift + elif [ -n "$1" ]; then + BAD_TARGETS= + TARGETS_SAVE=$TARGETS TARGETS= for X in $1; do case "$X" in sdl) - TARGETS="sdl-debug $TARGETS" + TARGETS="$TARGETS sdl-debug" ;; glx|agl|wgl) - TARGETS="cl-debug $TARGETS" + TARGETS="$TARGETS cl-debug" ;; dedicated) - TARGETS="sv-debug $TARGETS" + TARGETS="$TARGETS sv-debug" + ;; + *) + BAD_TARGETS="$BAD_TARGETS $X" ;; esac done - shift + if [ -n "$TARGETS" ]; then # at least a valid client + shift + else # no valid client, let's assume this option is not meant to be a client then + TARGETS=$TARGETS_SAVE + BAD_TARGETS= + fi fi if [ -z "$MAKEFLAGS" ]; then if [ -f /proc/cpuinfo ]; then @@ -487,6 +566,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 @@ -500,24 +589,31 @@ case "$cmd" in verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS enter "$d0/darkplaces" verbose + if [ x"$BAD_TARGETS" = x" " ]; then + echo "Warning: invalid empty client, default clients will be used." + fi if $cleandp; then verbose make $MAKEFLAGS clean fi for T in $TARGETS; do verbose make $MAKEFLAGS "$@" "$T" done + for T in $BAD_TARGETS; do + echo "Warning: discarded invalid client $T." + done verbose "$SELF" update-maps ;; run) if [ -n "$WE_HATE_OUR_USERS" ]; then client= - export PATH="$d0/misc/buildfiles/w32:$PATH" + export PATH="$d0/misc/buildfiles/win64:$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 @@ -705,13 +801,13 @@ case "$cmd" in git push origin :"${ref#refs/remotes/origin/}" reportecho4 "--> branch deleted" fi - elif [ -n "$note" ]; then + elif [ -z "$branch" ] && [ -n "$note" ]; then reportdo4 echo "$note" reportecho4 "--> not merging, already had this one rejected before" elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ echo "$logdata"; echo "$diffdata"; } | less -r'; then git checkout "$realbase" org=`git rev-parse HEAD` - if ! git merge "$ref" 2>&1 | tee "$t" && ! { git ls-files -u | grep ' 1 ' >/dev/null; }; then + if ! git merge --no-ff "$ref" 2>&1 | tee "$t" && ! { git ls-files -u | grep ' 1 ' >/dev/null; }; then git reset --hard "$org" GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref" reportdo4 cat "$t" @@ -723,7 +819,7 @@ case "$cmd" in reportecho4 "--> compile failed" elif ! yesno "Still merge \"$ref\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then git reset --hard "$org" - git notes edit "$ref" + GIT_NOTES_REF=refs/notes/admin-merge git notes edit "$ref" note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true` if [ x"$note" = x"del" ]; then git push origin :"${ref#refs/remotes/origin/}" @@ -777,22 +873,20 @@ case "$cmd" in ;; # release building goes here - release-mkdir) - mkdir -p Xonotic/"$1" - ;; release-prepare) -#"$SELF" each git clean -fxd + #"$SELF" each git clean -fxd + rm -rf Xonotic mkdir -p Xonotic - "$SELF" release-copy Docs/ - "$SELF" release-copy misc/ - "$SELF" release-copy server/ - "$SELF" release-copy xonotic-linux-glx.sh - "$SELF" release-copy xonotic-linux-sdl.sh - "$SELF" release-mkdir data - "$SELF" release-mkdir fteqcc - ;; - release-copy) - rsync --exclude=.git -vaSHPAX "$1" Xonotic/"$1" + git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | { + cd Xonotic + mkdir data fteqcc + tar xvf - + rm -rf misc/builddeps + mv misc/buildfiles/win32/* . + mv misc/buildfiles/win64/* . + mv misc/buildfiles/osx/* . + rm -rf misc/buildfiles + } ;; release-compile-run) host=$1 @@ -801,11 +895,25 @@ case "$cmd" in makeflags=$4 srcdir=$5 targetfiles=$6 - rsync --delete -zvaSHPAX "$srcdir"/ "$host:$buildpath/" - ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags" - for f in $targetfiles; do - rsync -zvaSHPAX "$host:$buildpath/${f%:*}" "${f##*:}" - done + case " $HOSTS_THAT_ARE_MYSELF " in + *\ $host\ *) + rsync --delete -zvaSHPAX "$srcdir"/ "$buildpath/" + ( + cd $buildpath + verbose eval make clean $maketargets $makeflags + ) + for f in $targetfiles; do + verbose mv "$buildpath/${f%:*}" "${f##*:}" + done + ;; + *) + rsync --delete -zvaSHPAX "$srcdir"/ "$host:$buildpath/" + verbose ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags" + for f in $targetfiles; do + verbose rsync -zvaSHPAX "$host:$buildpath/${f%:*}" "${f##*:}" + done + ;; + esac ;; release-compile) suffix=$1 @@ -815,24 +923,21 @@ case "$cmd" in 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" "fteqcc" "$darkplaces_files" + "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "darkplaces" "$darkplaces_files" ;; release-engine-win32) - rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/w32/* Xonotic/ "$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/db.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) - rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/w32/* Xonotic/ - "$SELF" release-compile win32 \ - '"DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win64/include -L$HOME/db.win64/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win64/bin/sdl-config"' \ - win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \ - debug 'darkplaces.exe:xonotic-64.exe darkplaces-sdl.exe:xonotic-sdl-64.exe darkplaces-dedicated.exe:xonotic-dedicated-64.exe' + "$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=""' \ + win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-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) - rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/osx/* Xonotic/ "$SELF" release-compile osx \ 'CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib"' \ all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \ @@ -842,13 +947,13 @@ 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-linux-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux-linux32-dedicated' + debug 'darkplaces-glx:Xonotic/xonotic-linux-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-linux-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux-linux64-dedicated' + debug 'darkplaces-glx:Xonotic/xonotic-linux-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated' ;; release-engine) "$SELF" release-engine-win32 & @@ -872,7 +977,7 @@ case "$cmd" in # version numnber and stuff like that ;; release-qc) - verbose make -C Xonotic/data/xonotic-data.pk3dir FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK= + verbose make -C data/xonotic-data.pk3dir FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK= ;; release-buildpk3-transform-raw) dir=$1 @@ -914,7 +1019,19 @@ case "$cmd" in ;; esac rm -rf Xonotic/temp - rsync --exclude=.git -vaSHPAX "$src"/ "Xonotic/temp" + mkdir -p Xonotic/temp + { + cd "$src" + git archive --format=tar HEAD + } | { + cd Xonotic/temp + tar xvf - + } + if [ x"$src" = x"data/xonotic-data.pk3dir" ]; then + cp "$src"/progs.dat Xonotic/temp/ + cp "$src"/csprogs.dat Xonotic/temp/ + cp "$src"/menu.dat Xonotic/temp/ + fi "$SELF" release-buildpk3-transform-$transform "Xonotic/temp" cd Xonotic/temp zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" . @@ -939,12 +1056,13 @@ case "$cmd" in ;; release) "$SELF" release-prepare + "$SELF" release-engine "$SELF" release-maps "$SELF" release-finish "$SELF" release-qc "$SELF" release-pack - "$SELF" release-engine ;; + *) echo "Usage:" echo " $SELF pull"