X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=4e0e9460b1ad9133921afe5551690d1f196822fa;hp=da755b7d6cc2a5ee55a8daea8e8cebe8f86016f0;hb=2a8628fbe7b9c13fab9bf353af09311ffc156bcb;hpb=561a08c232da26e916aa3dbc71b628177cb3d241 diff --git a/all b/all index da755b7d..4e0e9460 100755 --- a/all +++ b/all @@ -2,40 +2,175 @@ set -e -repos=" +d00=`pwd` +while ! [ -f ./all ]; do + if [ x"`pwd`" = x"/" ]; then + echo "Cannot find myself." + echo "Please run this script with the working directory inside a Xonotic checkout." + exit 1 + fi + cd .. +done +d0=`pwd` +SELF="$d0/all" + +# If we are on WINDOWS: +case "$0" in + all|*/all) + case "`uname`" in + MINGW*|Win*) + # Windows hates users. So this script has to copy itself elsewhere first... + tname= + cp "$SELF" ../all.xonotic.sh + exec ../all.xonotic.sh "$@" + ;; + esac + ;; +esac + +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"` +checkself() +{ + self_new=`checksum "$SELF"` + if [ x"$self" != x"$self_new" ]; then + msg "./all has changed." + if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then + msg "Rerunning the requested operation to make sure." + export XONOTIC_FORBID_RERUN_ALL=1 + exec "$SELF" "$@" + else + msg "Please try $SELF update, and then retry your requested operation." + exit 1 + fi + fi + return 0 +} + +verbose() +{ + msg "+ $*" + "$@" +} + +visible_repo_name() +{ + case "$1" in + .) + echo "the root directory" + ;; + *) + echo "\"$1\"" + ;; + esac +} + +check_mergeconflict() +{ + if git ls-files -u | grep ' 1 '; then + echo + echo "MERGE CONFLICT." + echo "change into the \"$1\" project directory, and then:" + echo "- edit the files mentioned above with your favorite editor," + echo " and fix the conflicts (marked with <<<<<<< blocks)" + echo "- for binary files, you can select the files using" + echo " git checkout --ours or git checkout --theirs" + echo "- when done with a file, 'git add' the file" + echo "- when done, 'git commit'" + echo + exit 1 + fi +} + +enter() +{ + verbose cd "$1" + check_mergeconflict "$1" +} + +repos_urls=" . data/xonotic-data.pk3dir data/xonotic-maps.pk3dir data/xonotic-music.pk3dir data/xonotic-nexcompat.pk3dir darkplaces + fteqcc@git://github.com/Blub/qclib.git + div0-gittools@git://git.icculus.org/divverent/div0-gittools.git + netradiant " +repos=`for X in $repos_urls; do echo "${X%%@*}"; done` + if [ "$#" = 0 ]; then set -- help fi cmd=$1 shift -d0=`pwd` case "$cmd" in update|pull) base=`git config remote.origin.url` base=${base%xonotic.git} - for d in $repos; do + for dcomplete in $repos_urls; do + case "$dcomplete" in + *@*) + d=${dcomplete%%@*} + url=${dcomplete#*@} + switch=false + ;; + *) + d=${dcomplete%%@*} + url=$base${d##*/}.git + switch=true + ;; + esac if [ -d "$d0/$d" ]; then - cd "$d0/$d" + enter "$d0/$d" case "$d" in .) ;; *) - git config remote.origin.url "$base${d##*/}.git" + if $switch; then + verbose git config remote.origin.url "$url" + fi ;; esac - git pull + verbose git config remote.origin.fetch "refs/heads/*:refs/remotes/origin/*" + + 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 + check_mergeconflict "$d" + exit 1 # FATAL + fi + fi + + cd "$d00" + checkself "$cmd" "$@" + cd "$d0/$d" + verbose git remote prune origin cd "$d0" else - git clone "$base${d##*/}.git" "$d0/$d" + verbose git clone "$url" "$d0/$d" fi done ;; @@ -48,30 +183,39 @@ case "$cmd" in fi exists=false for d in $repos; do - cd "$d0/$d" + enter "$d0/$d" if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then exists=true - git checkout "$branch" + verbose git checkout "$branch" elif git rev-parse "refs/remotes/$remote/$branch" >/dev/null 2>&1; then exists=true - git checkout --track -b "$branch" "$remote/$branch" + verbose git checkout --track -b "$branch" "$remote/$branch" else - git checkout master + verbose git checkout master fi + cd "$d00" + checkself "$cmd" "$@" cd "$d0" done - "$0" branch + if ! $exists; then + echo "The requested branch was not found in any repository." + fi + exec "$SELF" branch ;; branch) remote=$1 branch=$2 + srcbranch=$3 if [ -z "$branch" ]; then branch=$remote remote=origin fi + if [ -z "$srcbranch" ]; then + srcbranch=master + fi if [ -z "$branch" ]; then for d in $repos; do - cd "$d0/$d" + enter "$d0/$d" r=`git symbolic-ref HEAD` r=${r#refs/heads/} echo "$d is at $r" @@ -79,66 +223,100 @@ case "$cmd" in done else for d in $repos; do - cd "$d0/$d" + dv=`visible_repo_name "$d"` + enter "$d0/$d" a= while [ x"$a" != x"y" -a x"$a" != x"n" ]; do - echo "Branch in $d?" + echo "Branch in $dv?" read -r a done if [ x"$a" = x"y" ]; then - git push "$remote" HEAD:"$branch" - git checkout --track -b "$branch" "$remote/$branch" + verbose git push "$remote" "$srcbranch":"$branch" + verbose git checkout --track -b "$branch" "$remote/$branch" fi cd "$d0" done - "$0" branch + "$SELF" branch fi ;; branches) for d in $repos; do - cd "$d0/$d" + enter "$d0/$d" echo "In $d:" git branch -a | sed 's/^/ /; /->/d' cd "$d0" done ;; - push) + merge) for d in $repos; do - cd "$d0/$d" + dv=`visible_repo_name "$d"` + enter "$d0/$d" r=`git symbolic-ref HEAD` r=${r#refs/heads/} - a= + if git log HEAD..origin/master | grep .; then + # we have uncommitted changes + a= + while [ x"$a" != x"y" -a x"$a" != x"n" ]; do + echo "Could merge from \"master\" into \"$r\" in $dv. Do it?" + read -r a + done + if [ x"$a" = x"y" ]; then + if ! verbose git merge origin/master; then + check_mergeconflict "$d" + exit 1 # this should ALWAYS be fatal + fi + fi + fi + cd "$d0" + done + ;; + push|commit) + for d in $repos; do + dv=`visible_repo_name "$d"` + enter "$d0/$d" + r=`git symbolic-ref HEAD` + r=${r#refs/heads/} + if git diff HEAD | grep .; then + # we have uncommitted changes + a= + while [ x"$a" != x"y" -a x"$a" != x"n" ]; do + echo "Uncommitted changes in \"$r\" in $dv. Commit?" + read -r a + done + if [ x"$a" = x"y" ]; then + verbose git commit -a + fi + fi if git log "origin/$r".."$r" | grep .; then + a= while [ x"$a" != x"y" -a x"$a" != x"n" ]; do - echo "Push $r in $d?" + echo "Push \"$r\" in $dv?" read -r a done if [ x"$a" = x"y" ]; then - git push `git config "branch.$r.remote" || echo origin` HEAD + verbose git push `git config "branch.$r.remote" || echo origin` HEAD fi fi cd "$d0" done ;; compile) - ( - cd data/xonotic-data.pk3dir - make $MAKEFLAGS - ) || exit $? - ( - if [ -z "$MAKEFLAGS" ]; then - if [ -f /proc/cpuinfo ]; then - ncpus=$((`grep -c '^processor :' /proc/cpuinfo`+0)) - if [ $ncpus -gt 1 ]; then - MAKEFLAGS=-j$ncpus - fi + if [ -z "$MAKEFLAGS" ]; then + if [ -f /proc/cpuinfo ]; then + ncpus=$((`grep -c '^processor :' /proc/cpuinfo`+0)) + if [ $ncpus -gt 1 ]; then + MAKEFLAGS=-j$ncpus fi fi - cd darkplaces - make $MAKEFLAGS sv-debug - make $MAKEFLAGS cl-debug - make $MAKEFLAGS sdl-debug - ) || exit $? + fi + enter "$d0/fteqcc" + verbose make $MAKEFLAGS + enter "$d0/data/xonotic-data.pk3dir" + verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" $MAKEFLAGS + enter "$d0/darkplaces" + verbose make $MAKEFLAGS sv-debug + verbose make $MAKEFLAGS cl-debug + verbose make $MAKEFLAGS sdl-debug ;; run) client=-sdl @@ -160,24 +338,27 @@ case "$cmd" in exit 1 fi fi - exec "darkplaces/darkplaces$client" -xonotic $@ + #verbose "darkplaces/darkplaces$client" -xonotic "$@" + verbose "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@" ;; - each) + each|foreach) for d in $repos; do - cd "$d0/$d" - "$@" + enter "$d0/$d" + verbose "$@" cd "$d0" done ;; *) echo "Usage:" - echo " $0 pull" - echo " $0 push" - echo " $0 branches" - echo " $0 branch " - echo " $0 checkout" - echo " $0 compile" - echo " $0 run " - echo " $0 each " + echo " $SELF pull" + echo " $SELF merge" + echo " $SELF push" + echo " $SELF branches" + echo " $SELF branch [] " + echo " $SELF branch " + echo " $SELF checkout [] " + echo " $SELF compile" + echo " $SELF run " + echo " $SELF each " ;; esac