Merge branch 'master' into divVerent/crypto2

[xonotic/xonotic.git] / all

diff --git a/all b/all
index fea01c2c5411a6ec4599b8ff5551e39bd82a093d..4a39eed57fd55f1fb12ccc9fc49bff64b8476697 100755 (executable)
--- a/all
+++ b/all
@@ -116,6 +116,7 @@ data/xonotic-nexcompat.pk3dir |
 darkplaces                    |                                                   | div0-stable | svn
 netradiant                    |                                                   | master      |
 div0-gittools                 |                                                   | master      | no
 darkplaces                    |                                                   | div0-stable | svn
 netradiant                    |                                                   | master      |
 div0-gittools                 |                                                   | master      | no

+d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |

 data/xonotic-maps.pk3dir      |                                                   | master      |
 mediasource                   |                                                   | master      | no
 fteqcc                        | http://github.com/Blub/qclib.git                  | master      |
 data/xonotic-maps.pk3dir      |                                                   | master      |
 mediasource                   |                                                   | master      | no
 fteqcc                        | http://github.com/Blub/qclib.git                  | master      |


@@ -573,6 +574,7 @@ case "$cmd" in
                done
                ;;
        compile)
                done
                ;;
        compile)

+               cleand0=false

                cleandp=false
                cleanqcc=false
                cleanqc=false
                cleandp=false
                cleanqcc=false
                cleanqc=false


@@ -580,6 +582,7 @@ case "$cmd" in
                while :; do
                        case "$1" in
                                -c)
                while :; do
                        case "$1" in
                                -c)

+                                       cleand0=true

                                        cleandp=true
                                        cleanqcc=true
                                        cleanqc=true
                                        cleandp=true
                                        cleanqcc=true
                                        cleanqc=true


@@ -657,6 +660,16 @@ case "$cmd" in
                        fi
                fi
 
                        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
                enter "$d0/fteqcc" verbose
                if $cleanqcc; then
                        verbose make $MAKEFLAGS clean


@@ -688,12 +701,13 @@ case "$cmd" in
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        client=
        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
                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 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
                        client=-sdl
                fi
                case "$1" in


@@ -1103,7 +1117,7 @@ case "$cmd" in
                else
                        verbose date +%Y%m%d > Xonotic/stamp.txt
                fi
                else
                        verbose date +%Y%m%d > Xonotic/stamp.txt
                fi

-               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 cd Xonotic
                        verbose mkdir data fteqcc source source/darkplaces source/fteqcc
                        verbose tar xvf -


@@ -1112,6 +1126,7 @@ case "$cmd" in
                        verbose mv misc/buildfiles/win64 bin64 || true
                        verbose mv misc/buildfiles/osx/* . || true
                        verbose rm -rf misc/buildfiles
                        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 darkplaces


@@ -1134,6 +1149,7 @@ case "$cmd" in
                        verbose cd Xonotic/source
                        verbose tar xvf -
                }
                        verbose cd Xonotic/source
                        verbose tar xvf -
                }

+               rm -f Xonotic/key_15.d0pk

                ;;
        release-compile-run)
                host=$1
                ;;
        release-compile-run)
                host=$1


@@ -1233,13 +1249,13 @@ case "$cmd" in
                ;;
        release-engine-linux32)
                verbose "$SELF" release-compile linux32 \
                ;;
        release-engine-linux32)
                verbose "$SELF" release-compile linux32 \

-                       'STRIP=: CC="gcc -m32 -march=i686 -mtune=generic -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
+                       'STRIP=: CC="gcc -m32 -march=i686 -mtune=generic -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \

                        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 \
                        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 -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
+                       'STRIP=: CC="gcc -m64 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \

                        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'
                ;;
                        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'
                ;;


@@ -1418,7 +1434,14 @@ case "$cmd" in
                stamp=`cat Xonotic/stamp.txt`
                # exe and dll files do not need +x, so this makes them eligible for 7zip compression too
                chmod a-x Xonotic/*.exe Xonotic/*.dll || true
                stamp=`cat Xonotic/stamp.txt`
                # exe and dll files do not need +x, so this makes them eligible for 7zip compression too
                chmod a-x Xonotic/*.exe Xonotic/*.dll || true

-               # need to use infozip for these (+x bits)
+               # let's pass crypto import laws of some nasty countries
+               crypto_libs=`find Xonotic -name \*d0_rijndael\*`
+               if [ -n "$crypto_libs" ]; then
+                       verbose mkzip Xonotic-$stamp-crypto.zip \
+                               $crypto_libs
+                       rm -f $crypto_libs
+               fi
+               # build the archives

                verbose mkzip Xonotic-$stamp-engine.zip \
                        Xonotic/*.dll \
                        Xonotic/bin64/*.dll \
                verbose mkzip Xonotic-$stamp-engine.zip \
                        Xonotic/*.dll \
                        Xonotic/bin64/*.dll \


@@ -1434,6 +1457,7 @@ case "$cmd" in
                        Xonotic/misc \
                        Xonotic/fteqcc \
                        Xonotic/server \
                        Xonotic/misc \
                        Xonotic/fteqcc \
                        Xonotic/server \

+                       Xonotic/key_0.d0pk \

                        Xonotic/data/font-nimbussansl-$stamp.pk3
                verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip
                verbose mkzip0 Xonotic-$stamp.zip \
                        Xonotic/data/font-nimbussansl-$stamp.pk3
                verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip
                verbose mkzip0 Xonotic-$stamp.zip \