handle a weird error case

[xonotic/xonotic.git] / all

diff --git a/all b/all
index b4f38b8849dfba794ab5bfdf8bb6cae663aae3c5..9d718df320140c31545b74401dae8247fdaad09d 100755 (executable)
--- 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:
@@ -119,6 +119,7 @@ darkplaces                    |
 fteqcc                        | git://github.com/Blub/qclib.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
 
@@ -256,7 +257,7 @@ case "$cmd" in
                                        r=${r#refs/heads/}
                                        if git config branch.$r.remote >/dev/null 2>&1; then
                                                if ! verbose git pull; then
-                                                       fix_upstream_rebase_mergefailed || true
+                                                       fix_upstream_rebase_mergefail || true
                                                        check_mergeconflict "$d"
                                                        echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort."
                                                        read -r DUMMY
@@ -496,18 +497,21 @@ case "$cmd" in
                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
@@ -562,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
@@ -593,12 +607,13 @@ case "$cmd" in
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        client=
-                       export PATH="$d0/misc/buildfiles/win64:$d0/misc/buildfiles/win32:$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
@@ -885,17 +900,17 @@ case "$cmd" in
                                rsync --delete -zvaSHPAX "$srcdir"/ "$buildpath/"
                                (
                                        cd $buildpath
-                                       eval make clean $maketargets $makeflags
+                                       verbose eval make clean $maketargets $makeflags
                                )
                                for f in $targetfiles; do
-                                       mv "$buildpath/${f%:*}" "${f##*:}"
+                                       verbose mv "$buildpath/${f%:*}" "${f##*:}"
                                done
                                ;;
                        *)
                                rsync --delete -zvaSHPAX "$srcdir"/ "$host:$buildpath/"
-                               ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags"
+                               verbose ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags"
                                for f in $targetfiles; do
-                                       rsync -zvaSHPAX "$host:$buildpath/${f%:*}" "${f##*:}"
+                                       verbose rsync -zvaSHPAX "$host:$buildpath/${f%:*}" "${f##*:}"
                                done
                                ;;
                esac
@@ -912,15 +927,15 @@ case "$cmd" in
                ;;
        release-engine-win32)
                "$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/dp.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)
                "$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=""' \
+                       '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-64.exe darkplaces-sdl.exe:xonotic-sdl-64.exe darkplaces-dedicated.exe:xonotic-dedicated-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)
                "$SELF" release-compile osx \