X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=e62d477af4a63ed4726675cc1fdf6878b3781a9f;hp=197111614edb42d2fbf72ede7d5cfd29e7f0ebe1;hb=88631385ef6deb8591295833dab816a04c44c5ed;hpb=0697dbc8ea167290e2cf3c3cae075b957737e943 diff --git a/all b/all index 19711161..e62d477a 100755 --- a/all +++ b/all @@ -39,23 +39,10 @@ msg() echo "$*" } -checksum() -{ - if [ -x /usr/bin/md5sum ]; then - /usr/bin/md5sum "$@" - elif [ -x /bin/md5sum ]; then - /bin/md5sum "$@" - elif [ -x /usr/bin/cksum ]; then - /usr/bin/cksum "$@" - else - echo "NOCHECKSUM" - fi -} - -self=`checksum "$SELF"` +self=`git hash-object "$SELF"` checkself() { - self_new=`checksum "$SELF"` + self_new=`git hash-object "$SELF"` if [ x"$self" != x"$self_new" ]; then msg "./all has changed." if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then @@ -133,6 +120,7 @@ darkplaces | fteqcc | git://github.com/Blub/qclib.git | master | div0-gittools | git://git.icculus.org/divverent/div0-gittools.git | master | netradiant | | master | +d0_blind_id | http://github.com/divVerent/d0_blind_id.git | master | " # todo: in darkplaces, change repobranch to div0-stable @@ -151,14 +139,14 @@ esac repourl() { - t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '` - if [ -n "$t" ]; then - case "$t" in + repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '` + if [ -n "$repo_t" ]; then + case "$repo_t" in *://*) - echo "$t" + echo "$repo_t" ;; *) - echo "$base$t" + echo "$base$repo_t" ;; esac else @@ -172,9 +160,9 @@ repourl() repobranch() { - t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '` - if [ -n "$t" ]; then - echo "$t" + repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '` + if [ -n "$repo_t" ]; then + echo "$repo_t" else echo "master" fi @@ -183,12 +171,11 @@ repobranch() repoflags() { echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' ' - echo "$t" } repos=`for d in $repos; do p="${d%dir}" - if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! [ -f "$p" ]; then + if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! { [ -f "$d.no" ] || [ -f "$p" ]; }; then echo "$d" fi done` @@ -404,20 +391,22 @@ case "$cmd" in enter "$d0/$d" verbose r=`git symbolic-ref HEAD` r=${r#refs/heads/} - if git diff HEAD | grep .; then + diffdata=`git diff --color HEAD` + if [ -n "$diffdata" ]; then # we have uncommitted changes - if yesno "Uncommitted changes in \"$r\" in $dv. Commit?"; then + if yesno "Uncommitted changes in \"$r\" in $dv. Commit?" 'echo "$diffdata" | less -r'; then verbose git commit -a fi fi rem=`git config "branch.$r.remote" || echo origin` bra=`git config "branch.$r.merge" || echo "$r"` upstream="$rem/$bra" - if ! [ git rev-parse "$upstream" ]; then - upstream="`repobranch "$d"`" + if ! git rev-parse "$upstream" >/dev/null 2>&1; then + upstream="origin/`repobranch "$d"`" fi - if git log "$upstream".."$r" | grep .; then - if yesno "Push \"$r\" in $dv?"; then + logdata=`git log --color "$upstream".."$r"` + if [ -n "$logdata" ]; then + if yesno "Push \"$r\" in $dv?" 'echo "$logdata" | less -r'; then verbose git push "$rem" HEAD fi fi @@ -437,7 +426,7 @@ case "$cmd" in if [ -z "$CC" ]; then export CC=gcc fi - elif [ x"`uname`" = x"Darwin" ] && ( [ -d /Library/Frameworks/SDL.framework ] || [ -d $(HOME)/Library/Frameworks/SDL.framework ] ); then + elif [ x"`uname`" = x"Darwin" ] && { [ -d /Library/Frameworks/SDL.framework ] || [ -d "$HOME/Library/Frameworks/SDL.framework" ]; }; then # AGL is broken in Snow Leopard, so let's default to SDL if it is available. TARGETS="sv-debug sdl-debug" else @@ -445,27 +434,43 @@ case "$cmd" in fi case "$1" in -c) - clean=true - shift - ;; - *) - clean=false - ;; - esac - case "$1" in - sdl) - TARGETS="sdl-debug" + cleand0=true + cleandp=true + cleanqcc=true + cleanqc=true shift ;; - glx|agl|wgl) - TARGETS="cl-debug" + -n) + cleand0=false + cleandp=false + cleanqcc=false + cleanqc=false shift ;; - dedicated) - TARGETS="sv-debug" - shift + *) + cleand0=false + cleandp=false + cleanqcc=false + cleanqc=true # version info ;; esac + if [ -n "$1" ]; then + TARGETS= + for X in $1; do + case "$X" in + sdl) + TARGETS="sdl-debug $TARGETS" + ;; + glx|agl|wgl) + TARGETS="cl-debug $TARGETS" + ;; + dedicated) + TARGETS="sv-debug $TARGETS" + ;; + esac + done + shift + fi if [ -z "$MAKEFLAGS" ]; then if [ -f /proc/cpuinfo ]; then ncpus=$((`grep -c '^processor :' /proc/cpuinfo`+0)) @@ -482,37 +487,48 @@ case "$cmd" in MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw" 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 $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 client= - export PATH="$d0/misc/buildfiles/w32:$PATH" + export PATH="$d0/misc/buildfiles/w32:$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" client=-sdl else + export LD_LIBRARY_PATH="$d0/d0_blind_id/.libs" client=-sdl fi case "$1" in @@ -628,29 +644,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() @@ -680,68 +674,109 @@ case "$cmd" in HEAD|master) 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"` - diffdata=`git diff --color --find-copies-harder --ignore-space-change "$base"..."$ref"` + logdata=`git log --color "$realbase".."$ref"` if [ -z "$logdata" ]; then reportecho4 "--> not merging, no changes vs master" - elif [ -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 + if yesno "Branch \"$ref\" probably should get deleted. Do it?" ''; then git push origin :"${ref#refs/remotes/origin/}" reportecho4 "--> branch deleted" fi - elif [ -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 "$base" - org=`git rev-parse HEAD` - if ! git merge "$ref" 2>&1 | tee "$t"; 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 - git reset --hard "$org" - GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Compile failed:$LF`cat "$t"`" "$ref" - reportdo4 cat "$t" - 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" - note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true` - reportdo4 echo "$note" - reportecho4 "--> test failed" - else - case ",`repoflags "$d"`," in - *,svn,*) - # we do quite a mess here... luckily we know $org - git pull # svn needs to be current - git rebase -i --onto master "$org" - git svn dcommit --add-author-from - git reset --hard "$org" - ;; - *) - git push origin HEAD - ;; - esac - reportecho4 "--> MERGED" - if yesno "Delete original branch \"$ref\"?"; then + else + 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 git push origin :"${ref#refs/remotes/origin/}" reportecho4 "--> branch deleted" fi - fi - else - 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 [ -n "$note" ]; then + elif [ -n "$note" ]; then reportdo4 echo "$note" - reportecho4 "--> rejected" + 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 + 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 -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" + 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" + 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/}" + reportecho4 "--> test failed, branch deleted" + elif [ -n "$note" ]; then + reportdo4 echo "$note" + reportecho4 "--> test failed" + else + reportecho4 "--> test failed, postponed" + fi + else + echo "MERGING" + case ",`repoflags "$d"`," in + *,svn,*) + # we do quite a mess here... luckily we know $org + git fetch # svn needs to be current + git rebase -i --onto origin/master "$org" + git svn dcommit --add-author-from + git reset --hard "$org" + ;; + *) + git push origin HEAD + ;; + esac + reportecho4 "--> MERGED" + if yesno "Delete original branch \"$ref\"?"; then + git push origin :"${ref#refs/remotes/origin/}" + reportecho4 "--> branch deleted" + fi + fi else - reportecho4 "--> postponed" + 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/}" + reportecho4 "--> branch deleted" + elif [ -n "$note" ]; then + reportdo4 echo "$note" + reportecho4 "--> rejected" + else + reportecho4 "--> postponed" + fi fi fi reportecho "" @@ -765,25 +800,74 @@ case "$cmd" in "$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" ;; + release-compile-run) + host=$1 + buildpath=$2 + maketargets=$3 + 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 + ;; + release-compile) + suffix=$1 + makeflags=$2 + fteqcc_maketargets=$3 + fteqcc_files=$4 + 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" + ;; 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"' \ + 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-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' ;; 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' \ + sdl-debug 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin' ;; release-engine-linux32) + "$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' ;; 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' ;; 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 @@ -798,14 +882,36 @@ 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 ;; release-buildpk3-transform-normal) - # texture: convert to jpeg + dir=$1 + cd "$dir" + # texture: convert to jpeg and dds + export do_jpeg=true + export jpeg_qual_rgb=95 + export jpeg_qual_a=99 + export do_dds=true + export dds_flags= + export do_ogg=false + find textures -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh ;; release-buildpk3-transform-low) - # texture: convert to jpeg and downscale + dir=$1 + cd "$dir" + # texture: convert to jpeg and dds # music: reduce bitrate + export do_jpeg=true + export jpeg_qual_rgb=95 + export jpeg_qual_a=99 + export do_dds=false + export do_ogg=true + export ogg_qual=1 + find textures sound/cdtracks -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh ;; release-buildpk3) src=$1 @@ -821,7 +927,9 @@ case "$cmd" in rm -rf Xonotic/temp rsync --exclude=.git -vaSHPAX "$src"/ "Xonotic/temp" "$SELF" release-buildpk3-transform-$transform "Xonotic/temp" - 7za a -tzip -mx=9 "$dst" . + cd Xonotic/temp + zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" . + cd ../.. rm -rf Xonotic/temp ;; release-buildpk3s) @@ -829,25 +937,25 @@ case "$cmd" in shift while [ "$#" -gt 1 ]; do "$SELF" release-buildpk3 "$src" "Xonotic/${src%.pk3dir}$2.pk3" "$1" + shift + shift done - rm -rf "$src" ;; release-pack) - "$SELF" release-buildpk3s data/font-dejavu.pk3dir raw '' - "$SELF" release-buildpk3s data/xonotic-data.pk3dir normal '' raw '-raw' low '-low' - "$SELF" release-buildpk3s data/xonotic-maps.pk3dir normal '' raw '-raw' low '-low' - "$SELF" release-buildpk3s data/xonotic-music.pk3dir normal '' raw '-raw' low '-low' - "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir low '' + "$SELF" release-buildpk3s data/font-dejavu.pk3dir raw '' + "$SELF" release-buildpk3s data/xonotic-data.pk3dir normal '' raw '-raw' low '-low' + "$SELF" release-buildpk3s data/xonotic-maps.pk3dir normal '' raw '-raw' low '-low' + "$SELF" release-buildpk3s data/xonotic-music.pk3dir normal '' raw '-raw' low '-low' + "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir low '' ;; release) "$SELF" release-prepare - "$SELF" release-engine - "$SELF" release-gamedata "$SELF" release-maps "$SELF" release-finish + "$SELF" release-qc "$SELF" release-pack + "$SELF" release-engine ;; - *) echo "Usage:" echo " $SELF pull" @@ -857,7 +965,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 " ;;