zone: Use the generic linked list

[xonotic/darkplaces.git] / .travis-before_install-xonotic.sh

diff --git a/.travis-before_install-xonotic.sh b/.travis-before_install-xonotic.sh
index adb87e901bc0830d2ce054c569a9cea7c0939264..dc3cccea5c457b1e601914f0fbbe860bd6773564 100755 (executable)
--- a/.travis-before_install-xonotic.sh
+++ b/.travis-before_install-xonotic.sh
@@ -2,63 +2,54 @@
 
 set -ex
 
-if [ "`uname`" = 'Linux' ]; then
-  sudo apt-get update -qq
-fi
+export USRLOCAL="$PWD"/usrlocal
+mkdir "$USRLOCAL"
 
 for os in "$@"; do
+  git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \
+    --prefix=".deps/${os}/" master:"misc/builddeps/${os}" | tar xvf -
+
   case "$os" in
     linux32)
-      # Prepare an i386 chroot. This is required as we otherwise can't install
-      # our dependencies to be able to compile a 32bit binary. Ubuntu...
-      chroot="$PWD"/buildroot.i386
-      mkdir -p "$chroot$PWD"
-      sudo apt-get install -y debootstrap
-      sudo i386 debootstrap --arch=i386 precise "$chroot"
-      sudo mount --rbind "$PWD" "$chroot$PWD"
-      sudo i386 chroot "$chroot" apt-get install -y \
-        build-essential
-      # Now install our dependencies.
-      sudo i386 chroot "$chroot" apt-get install -y \
-        libxpm-dev libsdl1.2-dev libxxf86vm-dev
-      wget https://www.libsdl.org/release/SDL2-2.0.3.tar.gz
-      tar xf SDL2-2.0.3.tar.gz
+      wget https://www.libsdl.org/release/SDL2-2.0.10.tar.gz
+      tar xf SDL2-2.0.10.tar.gz
       (
-      cd SDL2-2.0.3
-      sudo i386 chroot "$chroot" sh -c "cd $PWD && ./configure --enable-static --disable-shared"
-      sudo i386 chroot "$chroot" make -C "$PWD"
-      sudo i386 chroot "$chroot" make -C "$PWD" install
+      cd SDL2-2.0.10
+      export CC="gcc -m32"
+      i386 ./configure --enable-static --disable-shared --prefix="$USRLOCAL" \
+        --enable-video-x11-xinput --enable-video-x11-xrandr ||\ cat config.log
+      i386 make
+      i386 make install
       )
       ;;
     linux64)
-      sudo apt-get install -y \
-        libxpm-dev libsdl1.2-dev libxxf86vm-dev
-      wget https://www.libsdl.org/release/SDL2-2.0.3.tar.gz
-      tar xf SDL2-2.0.3.tar.gz
+      wget https://www.libsdl.org/release/SDL2-2.0.10.tar.gz
+      tar xf SDL2-2.0.10.tar.gz
       (
-      cd SDL2-2.0.3
-      ./configure --enable-static --disable-shared
+      cd SDL2-2.0.10
+      ./configure --enable-static --disable-shared --prefix="$USRLOCAL" \
+        --enable-video-x11-xinput --enable-video-x11-xrandr ||\ cat config.log
       make
-      sudo make install
+      make install
       )
       ;;
     win32)
-      sudo apt-get install -y \
-        mingw-w64 mingw32- mingw32-binutils-
+      git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \
+        --prefix=".icons/" master:"misc/logos/icons_ico" | tar xvf -
+      mv .icons/xonotic.ico darkplaces.ico
       ;;
     win64)
-      sudo apt-get install -y \
-        mingw-w64 mingw32- mingw32-binutils-
+      git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \
+        --prefix=".icons/" master:"misc/logos/icons_ico" | tar xvf -
+      mv .icons/xonotic.ico darkplaces.ico
       ;;
     osx)
       git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \
-        --prefix=SDL.framework/ master:misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework | tar xvf -
+        --prefix=SDL2.framework/ master:misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL2.framework | tar xvf -
       ;;
   esac
 done
 
-git archive --format=tar --remote=git://de.git.xonotic.org/xonotic/xonotic.git \
-  --prefix=.deps/ master:misc/builddeps | tar xvf -
 for X in .deps/*; do
   rsync --remove-source-files -aL "$X"/*/ "$X"/ || true
 done