Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divVerent@alientrap.org>
Fri, 27 Aug 2010 08:35:06 +0000 (10:35 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Fri, 27 Aug 2010 08:35:06 +0000 (10:35 +0200)
1  2 
all

diff --combined all
--- 1/all
--- 2/all
+++ b/all
@@@ -119,7 -119,6 +119,7 @@@ darkplaces                    
  fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
  div0-gittools                 |                                                   | master      | no
  netradiant                    |                                                   | master      |
 +d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |
  "
  # todo: in darkplaces, change repobranch to div0-stable
  
@@@ -544,21 -543,18 +544,21 @@@ case "$cmd" i
                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
                        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
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        client=
 -                      export PATH="$d0/misc/buildfiles/win32:$PATH"
 +                      export PATH="$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
                        force=true
                fi
                for d in $repos; do
-                       enter "$d0/$d" verbose
+                       verbose cd "$d0/$d"
                        if $force; then
-                               verbose git checkout-index -fa
+                               verbose git reset --hard
+                               #redundant# verbose git checkout-index -fa
                        fi
                        case "$d" in
                                .)
                verbose rm -rf Xonotic Xonotic*.zip
                verbose mkdir -p Xonotic
                verbose date +%Y%m%d > Xonotic/stamp.txt
 -              verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | {
 +              verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles key_0.d0pk | {
                        verbose cd Xonotic
                        verbose mkdir data fteqcc source source/darkplaces source/fteqcc
                        verbose tar xvf -
                        verbose mv misc/buildfiles/win64 bin64 || true
                        verbose mv misc/buildfiles/osx/* . || true
                        verbose rm -rf misc/buildfiles
 +                      verbose rm -rf misc/pki
                }
                {
                        verbose cd darkplaces
                        verbose cd Xonotic/source
                        verbose tar xvf -
                }
 +              rm -f Xonotic/key_15.d0pk
                ;;
        release-compile-run)
                host=$1
                ;;
        release-engine-linux32)
                verbose "$SELF" release-compile linux32 \
 -                      'STRIP=: 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 LIB_JPEG=$HOME/dp.linux32/lib/libjpeg.a' \
 +                      'STRIP=: 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 LIB_JPEG=$HOME/dp.linux32/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=$HOME/dp.linux32' \
                        all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \
                        release 'darkplaces-glx:Xonotic/xonotic-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated'
                ;;
        release-engine-linux64)
                verbose "$SELF" release-compile linux64 \
 -                      'STRIP=: 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 LIB_JPEG=$HOME/dp.linux64/lib/libjpeg.a' \
 +                      'STRIP=: 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 LIB_JPEG=$HOME/dp.linux64/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=$HOME/dp.linux64' \
                        all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux64' \
                        release 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated'
                ;;