X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=09292ee0d19a0cf22d8e25041925523fa6247814;hp=593736e7e2a392d81acbe5b5e738a58c920a04a7;hb=a0e309ae13592c3b140c791d8f65c2edadbce220;hpb=740a38b25a4637627123304d6355a355376a1979 diff --git a/all b/all index 593736e7..09292ee0 100755 --- a/all +++ b/all @@ -119,6 +119,16 @@ repos_urls=" netradiant " +repos_urls=` + for X in $repos_urls; do + d="${X%%@*}" + p="${d%dir}" + if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! [ -f "$p" ]; then + echo "$X" + fi + done +` + repos=`for X in $repos_urls; do echo "${X%%@*}"; done` if [ "$#" = 0 ]; then @@ -321,7 +331,7 @@ case "$cmd" in fi fi rem=`git config "branch.$r.remote" || echo origin` - if git log "$rem/$r".."$r" | grep .; then + if { git log "$rem/$r".."$r" || git log origin/master.."$r"; } | grep .; then a= while [ x"$a" != x"y" -a x"$a" != x"n" ]; do echo "Push \"$r\" in $dv?" @@ -342,6 +352,25 @@ case "$cmd" in done ;; compile) + if [ -n "$WE_HATE_OUR_USERS" ]; then + TARGETS="sv-debug cl-debug" + else + TARGETS="sv-debug cl-debug sdl-debug" + fi + case "$1" in + sdl) + TARGETS="sdl-debug" + shift + ;; + glx|agl|wgl) + TARGETS="cl-debug" + shift + ;; + dedicated) + TARGETS="sv-debug" + shift + ;; + esac if [ -z "$MAKEFLAGS" ]; then if [ -f /proc/cpuinfo ]; then ncpus=$((`grep -c '^processor :' /proc/cpuinfo`+0)) @@ -355,15 +384,14 @@ case "$cmd" in enter "$d0/data/xonotic-data.pk3dir" verbose verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" $MAKEFLAGS enter "$d0/darkplaces" verbose - verbose make $MAKEFLAGS sv-debug - verbose make $MAKEFLAGS cl-debug - if ! [ -n "$WE_HATE_OUR_USERS" ]; then - verbose make $MAKEFLAGS sdl-debug - fi + for T in $TARGETS; do + verbose make $MAKEFLAGS "$T" + done ;; run) if [ -n "$WE_HATE_OUR_USERS" ]; then client= + export PATH="$d0/misc/buildfiles/w32:$PATH" else client=-sdl fi