aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorPavel Puchkin <i@neoascetic.me>2016-01-29 16:15:58 +0200
committerest31 <MTest31@outlook.com>2016-02-04 13:22:32 +0100
commitc4e0d95c87a3aec22ad52ae427b704a9f3a22d21 (patch)
tree821bf04e77a6bcc6afc88f46928b0403976a90f5 /util
parent99c905c5633ebb5aef0ed8af13553c38b892c5e2 (diff)
downloadminetest-c4e0d95c87a3aec22ad52ae427b704a9f3a22d21.tar.gz
minetest-c4e0d95c87a3aec22ad52ae427b704a9f3a22d21.tar.bz2
minetest-c4e0d95c87a3aec22ad52ae427b704a9f3a22d21.zip
Implement OSX Travis builds
Diffstat (limited to 'util')
-rwxr-xr-xutil/travis/before_install.sh39
-rwxr-xr-xutil/travis/script.sh5
2 files changed, 27 insertions, 17 deletions
diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh
index e3276e0db..58dc42b17 100755
--- a/util/travis/before_install.sh
+++ b/util/travis/before_install.sh
@@ -1,22 +1,30 @@
#!/bin/bash -e
-if [[ $CC == "clang" ]]; then
- export PATH="/usr/bin/:$PATH"
- sudo sh -c 'echo "deb http://ppa.launchpad.net/eudoxos/llvm-3.1/ubuntu precise main" >> /etc/apt/sources.list'
- sudo apt-key adv --keyserver pool.sks-keyservers.net --recv-keys 92DE8183
+if [[ $TRAVIS_OS_NAME == "linux" ]]; then
+ if [[ $CC == "clang" ]]; then
+ export PATH="/usr/bin/:$PATH"
+ sudo sh -c 'echo "deb http://ppa.launchpad.net/eudoxos/llvm-3.1/ubuntu precise main" >> /etc/apt/sources.list'
+ sudo apt-key adv --keyserver pool.sks-keyservers.net --recv-keys 92DE8183
+ sudo apt-get update
+ sudo apt-get install llvm-3.1
+ sudo apt-get install clang
+ fi
sudo apt-get update
- sudo apt-get install llvm-3.1
- sudo apt-get install clang
+ sudo apt-get install p7zip-full
fi
-sudo apt-get update
-sudo apt-get install p7zip-full
-if [[ $PLATFORM == "Linux" ]]; then
- sudo apt-get install libirrlicht-dev cmake libbz2-dev libpng12-dev \
- libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \
- libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev gettext
- # Linking to LevelDB is broken, use a custom build
- wget http://minetest.kitsunemimi.pw/libleveldb-1.18-ubuntu12.04.7z
- sudo 7z x -o/usr libleveldb-1.18-ubuntu12.04.7z
+
+if [[ $PLATFORM == "Unix" ]]; then
+ if [[ $TRAVIS_OS_NAME == "linux" ]]; then
+ sudo apt-get install libirrlicht-dev cmake libbz2-dev libpng12-dev \
+ libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \
+ libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev gettext
+ # Linking to LevelDB is broken, use a custom build
+ wget http://minetest.kitsunemimi.pw/libleveldb-1.18-ubuntu12.04.7z
+ sudo 7z x -o/usr libleveldb-1.18-ubuntu12.04.7z
+ else
+ brew update
+ brew install freetype gettext hiredis irrlicht jpeg leveldb libogg libvorbis luajit
+ fi
elif [[ $PLATFORM == "Win32" ]]; then
wget http://minetest.kitsunemimi.pw/mingw_w64_i686_ubuntu12.04_4.9.1.7z -O mingw.7z
sed -e "s|%PREFIX%|i686-w64-mingw32|" \
@@ -30,4 +38,3 @@ elif [[ $PLATFORM == "Win64" ]]; then
< util/travis/toolchain_mingw.cmake.in > util/buildbot/toolchain_mingw64.cmake
sudo 7z x -y -o/usr mingw.7z
fi
-
diff --git a/util/travis/script.sh b/util/travis/script.sh
index 756cc1de8..5be747e51 100755
--- a/util/travis/script.sh
+++ b/util/travis/script.sh
@@ -1,6 +1,6 @@
#!/bin/bash -e
-if [[ $PLATFORM == "Linux" ]]; then
+if [[ $PLATFORM == "Unix" ]]; then
mkdir -p travisbuild
cd travisbuild
CMAKE_FLAGS='-DCMAKE_BUILD_TYPE=Debug \
@@ -10,6 +10,9 @@ if [[ $PLATFORM == "Linux" ]]; then
if [[ $CC == "clang" ]]; then
CMAKE_FLAGS+=' -DENABLE_FREETYPE=FALSE'
fi
+ if [[ $TRAVIS_OS_NAME == "osx" ]]; then
+ CMAKE_FLAGS+=' -DCUSTOM_GETTEXT_PATH=/usr/local/opt/gettext'
+ fi
cmake $CMAKE_FLAGS ..
make -j2
echo "Running unit tests."