X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=fe9bb4168184dd660edb417edd9a628354dcac10;hp=ccc9667ea16dea4543244ed67fdff55869ea333f;hb=9d2449295f95cee984723793823afc3515afcfa2;hpb=9fa81db68661140629c5f0227b070d98ccd36c67 diff --git a/all b/all index ccc9667e..fe9bb416 100755 --- a/all +++ b/all @@ -434,11 +434,21 @@ case "$cmd" in fi case "$1" in -c) - clean=true + cleandp=true + cleanqcc=true + cleanqc=true + shift + ;; + -n) + cleandp=false + cleanqcc=false + cleanqc=false shift ;; *) - clean=false + cleandp=false + cleanqcc=false + cleanqc=true # version info ;; esac case "$1" in @@ -471,28 +481,28 @@ case "$cmd" in MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw" fi fi + enter "$d0/fteqcc" verbose - if $clean; then + if $cleanqcc; then verbose make $MAKEFLAGS clean fi verbose make $MAKEFLAGS + enter "$d0/data/xonotic-data.pk3dir" verbose - if $clean; then - verbose make $MAKEFLAGS clean + if $cleanqc; then + verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean fi - verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS + enter "$d0/darkplaces" verbose - if $clean; then + if $cleandp; then verbose make $MAKEFLAGS clean fi for T in $TARGETS; do verbose make $MAKEFLAGS "$@" "$T" done + verbose "$SELF" update-maps - ;; - makebuild) - ;; run) if [ -n "$WE_HATE_OUR_USERS" ]; then @@ -617,29 +627,7 @@ case "$cmd" in rm -rf "$patchdir" ;; admin-merge) - if [ "$#" = 1 ]; then - set -- "${1%%/*}" "${1#*/}" - fi - for d in $repos; do - enter "$d0/$d" verbose - git rev-parse "$1/$2" || continue - # 1. review - { - git log HEAD.."$1/$2" - git diff HEAD..."$1/$2" - } | less - if yesno "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"; then - git merge "$1/$2" - if "$SELF" compile && yesno "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then - git push origin HEAD - git push "$1" :"$2" - else - git reset --hard HEAD@{1} - fi - fi - done - ;; - admin-merge-2) + branch=$1 t=`mktemp` report="" reportecho() @@ -670,14 +658,33 @@ case "$cmd" in continue ;; */*) - ;; + ;; *) continue ;; esac + if [ -n "$branch" ]; then + if [ x"$branch" != x"${ref#refs/remotes/origin/}" ]; then + continue + fi + fi + case "$base" in + master) + realbase=$base + ;; + *) + l0=`git rev-list "$base".."$ref" | wc -l` + l1=`git rev-list master.."$ref" | wc -l` + if [ $l0 -gt $l1 ]; then + realbase=master + else + realbase=$base + fi + ;; + esac reportecho " Branch $ref:" note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true` - logdata=`git log --color "$base".."$ref"` + logdata=`git log --color "$realbase".."$ref"` if [ -z "$logdata" ]; then reportecho4 "--> not merging, no changes vs master" if yesno "Branch \"$ref\" probably should get deleted. Do it?" ''; then @@ -685,7 +692,7 @@ case "$cmd" in reportecho4 "--> branch deleted" fi else - diffdata=`git diff --color --find-copies-harder --ignore-space-change "$base"..."$ref"` + diffdata=`git diff --color --find-copies-harder --ignore-space-change "$realbase"..."$ref"` if [ -z "$diffdata" ]; then reportecho4 "--> not merging, no changes vs master, branch contains redundant history" if yesno "Branch \"$ref\" probably should get deleted. Do it?" '{ echo "$logdata"; } | less -r'; then @@ -696,14 +703,14 @@ case "$cmd" in 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 "$base" + 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 git reset --hard "$org" GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref" reportdo4 cat "$t" reportecho4 "--> merge failed" - elif ! "$SELF" compile 2>&1 | tee "$t"; then + elif ! "$SELF" compile -n 2>&1 | tee "$t"; then git reset --hard "$org" GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Compile failed:$LF`cat "$t"`" "$ref" reportdo4 cat "$t" @@ -806,10 +813,17 @@ case "$cmd" in release-engine-win32) rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/w32/* Xonotic/ "$SELF" release-compile win32 \ - '"DP_MAKE_TARGET=mingw CC="$HOME/mingw32/bin/i386-mingw32-gcc -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dxheaders" WINDRES="$HOME/mingw32/bin/i386-mingw32-windres" SDL_CONFIG="$HOME/sdl-win32/SDL-1.2.13/bin/sdl-config"' \ + '"DP_MAKE_TARGET=mingw CC="i586-mingw32-gcc -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dxheaders" WINDRES="i586-mingw32-windres" SDL_CONFIG="$HOME/sdl-win32/SDL-1.2.13/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' ;; + release-engine-win64) + rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/w32/* Xonotic/ + "$SELF" release-compile win32 \ + '"DP_MAKE_TARGET=mingw CC="amd64-mingw32-gcc -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dxheaders" WINDRES="amd64-mingw32-windres" SDL_CONFIG="$HOME/sdl-win32/SDL-1.2.13/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' + ;; release-engine-osx) rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/osx/* Xonotic/ "$SELF" release-compile osx \ @@ -819,21 +833,23 @@ case "$cmd" in ;; release-engine-linux32) "$SELF" release-compile linux32 \ - 'CC="gcc -g -Wl,--hash-style=sysv" DP_MODPLUG_STATIC_LIBDIR=$HOME/modplug-i386/lib DP_LINK_TO_LIBJPEG=1 LDFLAGS_LIBJPEG="$HOME/jpeg7/lib/libjpeg.a" CFLAGS_LIBJPEG="-I$HOME/jpeg7/include"' \ + 'CC="gcc -m32 -g -Wl,--hash-style=sysv" DP_MODPLUG_STATIC_LIBDIR=$HOME/darkplaces-deps/lib DP_LINK_TO_LIBJPEG=1 LDFLAGS_LIBJPEG="$HOME/darkplaces-deps/lib/libjpeg.a" CFLAGS_LIBJPEG="-I$HOME/darkplaces-deps/include"' \ 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' ;; release-engine-linux64) "$SELF" release-compile linux64 \ - 'CC="gcc -g -Wl,--hash-style=sysv" DP_MODPLUG_STATIC_LIBDIR=$HOME/modplug-x86_64/lib DP_LINK_TO_LIBJPEG=1 LDFLAGS_LIBJPEG="$HOME/jpeg7/lib/libjpeg.a" CFLAGS_LIBJPEG="-I$HOME/jpeg7/include"' \ + 'CC="gcc -m64 -g -Wl,--hash-style=sysv" DP_MODPLUG_STATIC_LIBDIR=$HOME/darkplaces-deps/lib DP_LINK_TO_LIBJPEG=1 LDFLAGS_LIBJPEG="$HOME/darkplaces-deps/lib/libjpeg.a" CFLAGS_LIBJPEG="-I$HOME/darkplaces-deps/include"' \ 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' ;; release-engine) - "$SELF" release-engine-win32 - "$SELF" release-engine-osx - "$SELF" release-engine-linux32 - "$SELF" release-engine-linux64 + "$SELF" release-engine-win32 & + "$SELF" release-engine-win64 & + "$SELF" release-engine-osx & + "$SELF" release-engine-linux32 & + "$SELF" release-engine-linux64 & + wait ;; release-maps) "$SELF" update-maps @@ -848,6 +864,9 @@ case "$cmd" in release-finish) # version numnber and stuff like that ;; + release-qc) + verbose make -C Xonotic/data/xonotic-data.pk3dir FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK= + ;; release-buildpk3-transform-raw) dir=$1 ;; @@ -915,6 +934,7 @@ case "$cmd" in "$SELF" release-prepare "$SELF" release-maps "$SELF" release-finish + "$SELF" release-qc "$SELF" release-pack "$SELF" release-engine ;; @@ -927,7 +947,7 @@ case "$cmd" in echo " $SELF branch [] " echo " $SELF branch " echo " $SELF checkout [] " - echo " $SELF compile [-c] [] " + echo " $SELF compile [-c|-n] [] " echo " $SELF run [] " echo " $SELF each " ;;