X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=.travis-script-xonotic.sh;h=d511662b06f67f211c60ca8827ff61f1748a1fb1;hb=57073ad18687c89fad109bb6293bdb75546d78bd;hp=a8a19b977522bd0331ce2280855fdaf1bfcc32dd;hpb=d2e14a4b7c95b0cd90fe509c2127e9fd0ce65eee;p=xonotic%2Fdarkplaces.git

diff --git a/.travis-script-xonotic.sh b/.travis-script-xonotic.sh
index a8a19b97..d511662b 100755
--- a/.travis-script-xonotic.sh
+++ b/.travis-script-xonotic.sh
@@ -1,12 +1,15 @@
 #!/bin/sh
 
-set -ex
+set -e
+
+openssl aes-256-cbc -K $encrypted_eeb6f7a14a8e_key -iv $encrypted_eeb6f7a14a8e_iv -in .travis-id_rsa-xonotic -out id_rsa-xonotic -d
+
+set -x
 
-openssl aes-256-cbc \
-  -K $encrypted_08aaf016324d_key -iv $encrypted_08aaf016324d_iv \
-  -in .travis-id_rsa-xonotic -out id_rsa-xonotic -d
 chmod 0600 id_rsa-xonotic
-ssh-keygen -y -f id_rsa-xonotic
+# ssh-keygen -y -f id_rsa-xonotic
+
+export USRLOCAL="$PWD"/usrlocal
 
 rev=`git rev-parse HEAD`
 
@@ -19,47 +22,109 @@ for os in "$@"; do
   deps=".deps/${os}"
   case "${os}" in
     linux32)
-      chroot="sudo chroot ${PWD}/buildroot.i386"
-      makeflags='STRIP=: CC="${CC} -m32 -march=i686 -g1 -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6" SDL_CONFIG=sdl2-config LIB_JPEG=../../../${deps}/lib/libjpeg.a LIB_CRYPTO="../../../${deps}/lib/libd0_blind_id.a ../../../${deps}/lib/libgmp.a" DP_LINK_ZLIB=shared DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=dlopen'
+      chroot=
+      makeflags='STRIP=:
+        CC="${CC} -m32 -march=i686 -g1 -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
+        SDL_CONFIG=$USRLOCAL/bin/sdl2-config
+        DP_LINK_CRYPTO=shared
+          LIB_CRYPTO="../../../${deps}/lib/libd0_blind_id.a ../../../${deps}/lib/libgmp.a"
+        DP_LINK_CRYPTO_RIJNDAEL=dlopen
+        DP_LINK_JPEG=shared
+          LIB_JPEG=../../../${deps}/lib/libjpeg.a
+        DP_LINK_ODE=shared
+          CFLAGS_ODE="-DUSEODE -DLINK_TO_LIBODE -DdDOUBLE"
+          LIB_ODE="../../../${deps}/lib/libode.a -lstdc++"
+        DP_LINK_ZLIB=shared'
       maketargets='release'
-      outputs='darkplaces-glx:xonotic-linux32-glx darkplaces-sdl:xonotic-linux32-sdl darkplaces-dedicated:xonotic-linux32-dedicated'
+      outputs='darkplaces-sdl:darkplaces-linux32-sdl darkplaces-dedicated:darkplaces-linux32-dedicated'
       ;;
     linux64)
       chroot=
-      makeflags='STRIP=: CC="${CC} -m64 -g1 -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6" SDL_CONFIG=sdl2-config LIB_JPEG=../../../${deps}/lib/libjpeg.a LIB_CRYPTO="../../../${deps}/lib/libd0_blind_id.a ../../../${deps}/lib/libgmp.a" DP_LINK_ZLIB=shared DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=dlopen'
+      makeflags='STRIP=:
+        CC="${CC} -m64 -g1 -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
+        SDL_CONFIG=$USRLOCAL/bin/sdl2-config
+        DP_LINK_CRYPTO=shared
+          LIB_CRYPTO="../../../${deps}/lib/libd0_blind_id.a ../../../${deps}/lib/libgmp.a"
+        DP_LINK_CRYPTO_RIJNDAEL=dlopen
+        DP_LINK_JPEG=shared
+          LIB_JPEG="../../../${deps}/lib/libjpeg.a"
+        DP_LINK_ODE=shared
+          CFLAGS_ODE="-DUSEODE -DLINK_TO_LIBODE -DdDOUBLE"
+          LIB_ODE="../../../${deps}/lib/libode.a -lstdc++"
+        DP_LINK_ZLIB=shared'
       maketargets='release'
-      outputs='darkplaces-glx:xonotic-linux64-glx darkplaces-sdl:xonotic-linux64-sdl darkplaces-dedicated:xonotic-linux64-dedicated'
+      outputs='darkplaces-sdl:darkplaces-linux64-sdl darkplaces-dedicated:darkplaces-linux64-dedicated'
       ;;
     win32)
       chroot=
-      makeflags='STRIP=: DP_MAKE_TARGET=mingw UNAME=MINGW32 CC="i686-w64-mingw32-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i686-w64-mingw32-windres" SDL_CONFIG="../../../${deps}/bin/sdl2-config" DP_LINK_ZLIB=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen WIN32RELEASE=1 D3D=1'
+      # Need to use -mstackrealign as nothing guarantees that callbacks from
+      # other Win32 DLLs - including SDL2 - retain 16 bytes alignment.
+      makeflags='STRIP=:
+        D3D=1
+        DP_MAKE_TARGET=mingw
+        UNAME=MINGW32
+        WIN32RELEASE=1
+        CC="i686-w64-mingw32-gcc -static -g1 -mstackrealign -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
+        WINDRES="i686-w64-mingw32-windres"
+        SDL_CONFIG="../../../${deps}/bin/sdl2-config"
+        DP_LINK_CRYPTO=dlopen
+        DP_LINK_CRYPTO_RIJNDAEL=dlopen
+        DP_LINK_JPEG=dlopen
+        DP_LINK_ODE=dlopen
+        DP_LINK_ZLIB=dlopen'
       maketargets='release'
-      outputs='darkplaces.exe:xonotic.exe darkplaces-sdl.exe:xonotic-sdl.exe darkplaces-dedicated.exe:xonotic-dedicated.exe'
+      outputs='darkplaces-sdl.exe:darkplaces-x86.exe darkplaces-dedicated.exe:darkplaces-x86-dedicated.exe'
       ;;
     win64)
       chroot=
-      makeflags='STRIP=: DP_MAKE_TARGET=mingw UNAME=MINGW32 CC="x86_64-w64-mingw32-gcc -g1 -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6" WINDRES="x86_64-w64-mingw32-windres" SDL_CONFIG="../../../${deps}/bin/sdl2-config" DP_LINK_ZLIB=dlopen DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen WIN64RELEASE=1 D3D=1'
+      makeflags='STRIP=:
+        D3D=1
+        DP_MAKE_TARGET=mingw
+        UNAME=MINGW32
+        WIN64RELEASE=1
+        CC="x86_64-w64-mingw32-gcc -static -g1 -Wl,--dynamicbase -Wl,--nxcompat -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
+        WINDRES="x86_64-w64-mingw32-windres"
+        SDL_CONFIG="../../../${deps}/bin/sdl2-config"
+        DP_LINK_CRYPTO=dlopen
+        DP_LINK_CRYPTO_RIJNDAEL=dlopen
+        DP_LINK_JPEG=dlopen
+        DP_LINK_ODE=dlopen
+        DP_LINK_ZLIB=dlopen'
       maketargets='release'
-      outputs='darkplaces.exe:xonotic-x64.exe darkplaces-sdl.exe:xonotic-x64-sdl.exe darkplaces-dedicated.exe:xonotic-x64-dedicated.exe'
+      outputs='darkplaces-sdl.exe:darkplaces.exe darkplaces-dedicated.exe:darkplaces-dedicated.exe'
       ;;
     osx)
       chroot=
-      makeflags='STRIP=: CC="gcc -g1 -arch x86_64 -arch i386 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk -mmacosx-version-min=10.5 -I../../../${deps}/include -L../../../${deps}/lib -I${PWD}/SDL.framework/Headers -F${PWD} -DSUPPORTIPV6" DP_LINK_ZLIB=shared DP_LINK_JPEG=dlopen DP_LINK_ODE=dlopen DP_LINK_CRYPTO=dlopen DP_LINK_CRYPTO_RIJNDAEL=dlopen'
+      makeflags='STRIP=:
+        CC="gcc -g1 -arch x86_64 -mmacosx-version-min=10.6 -Wl,-rpath -Wl,@loader_path/../Frameworks -Wl,-rpath -Wl,@loader_path -I../../../${deps}/include -L../../../${deps}/lib -DSUPPORTIPV6"
+        SDLCONFIG_MACOSXCFLAGS="-I${PWD}/SDL2.framework/Headers"
+        SDLCONFIG_MACOSXLIBS="-F${PWD} -framework SDL2 -framework Cocoa -I${PWD}/SDL2.framework/Headers"
+        SDLCONFIG_MACOSXSTATICLIBS="-F${PWD} -framework SDL2 -framework Cocoa -I${PWD}/SDL2.framework/Headers"
+        DP_LINK_CRYPTO=dlopen
+        DP_LINK_CRYPTO_RIJNDAEL=dlopen
+        DP_LINK_JPEG=dlopen
+        DP_LINK_ODE=dlopen
+        DP_LINK_ZLIB=shared'
       maketargets='sv-release sdl-release'
-      outputs='darkplaces-sdl:xonotic-osx-sdl-bin darkplaces-dedicated:xonotic-osx-dedicated'
+      outputs='darkplaces-sdl:darkplaces-osx-sdl-bin darkplaces-dedicated:darkplaces-osx-dedicated'
       ;;
   esac
 
+  # Condense whitespace in makeflags.
+  makeflags=$(
+    printf "%s\n" "$makeflags" | tr '\n' ' '
+  )
+
   (
-  trap "${chroot} make -C ${PWD} ${makeflags} clean" EXIT
-  eval "${chroot} make -C ${PWD} ${makeflags} ${maketargets}"
-  for o in $outputs; do
-    src=${o%%:*}
-    dst=${o#*:}
-    sftp -oStrictHostKeyChecking=no -i id_rsa-xonotic -P 2222 -b - autobuild-bin-uploader@beta.xonotic.org <<EOF
+    trap "${chroot} make -C ${PWD} ${makeflags} clean" EXIT
+    eval "${chroot} make -C ${PWD} ${makeflags} ${maketargets}"
+    for o in $outputs; do
+      src=${o%%:*}
+      dst=${o#*:}
+      sftp -oStrictHostKeyChecking=no -i id_rsa-xonotic -P 2222 -b - autobuild-bin-uploader@beta.xonotic.org <<EOF
 put ${src} ${rev}/${dst}
 EOF
-  done
+    done
   )
 
 done