Skip to content

Commit c4e0d95

Browse files
neoasceticest31
authored andcommitted
Implement OSX Travis builds
1 parent 99c905c commit c4e0d95

File tree

3 files changed

+37
-18
lines changed

3 files changed

+37
-18
lines changed

.travis.yml

+10-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ language: cpp
22
compiler:
33
- gcc
44
- clang
5+
os:
6+
- osx
7+
- linux
58
env:
69
- PLATFORM=Win32
710
- PLATFORM=Win64
8-
- PLATFORM=Linux
11+
- PLATFORM=Unix
912
before_install: ./util/travis/before_install.sh
1013
script: ./util/travis/script.sh
1114
sudo: required
@@ -18,3 +21,9 @@ matrix:
1821
compiler: clang
1922
- env: PLATFORM=Win64
2023
compiler: clang
24+
- env: PLATFORM=Win32
25+
os: osx
26+
- env: PLATFORM=Win64
27+
os: osx
28+
- compiler: gcc
29+
os: osx

util/travis/before_install.sh

+23-16
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,30 @@
11
#!/bin/bash -e
22

3-
if [[ $CC == "clang" ]]; then
4-
export PATH="/usr/bin/:$PATH"
5-
sudo sh -c 'echo "deb http://ppa.launchpad.net/eudoxos/llvm-3.1/ubuntu precise main" >> /etc/apt/sources.list'
6-
sudo apt-key adv --keyserver pool.sks-keyservers.net --recv-keys 92DE8183
3+
if [[ $TRAVIS_OS_NAME == "linux" ]]; then
4+
if [[ $CC == "clang" ]]; then
5+
export PATH="/usr/bin/:$PATH"
6+
sudo sh -c 'echo "deb http://ppa.launchpad.net/eudoxos/llvm-3.1/ubuntu precise main" >> /etc/apt/sources.list'
7+
sudo apt-key adv --keyserver pool.sks-keyservers.net --recv-keys 92DE8183
8+
sudo apt-get update
9+
sudo apt-get install llvm-3.1
10+
sudo apt-get install clang
11+
fi
712
sudo apt-get update
8-
sudo apt-get install llvm-3.1
9-
sudo apt-get install clang
13+
sudo apt-get install p7zip-full
1014
fi
11-
sudo apt-get update
12-
sudo apt-get install p7zip-full
13-
if [[ $PLATFORM == "Linux" ]]; then
14-
sudo apt-get install libirrlicht-dev cmake libbz2-dev libpng12-dev \
15-
libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \
16-
libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev gettext
17-
# Linking to LevelDB is broken, use a custom build
18-
wget http://minetest.kitsunemimi.pw/libleveldb-1.18-ubuntu12.04.7z
19-
sudo 7z x -o/usr libleveldb-1.18-ubuntu12.04.7z
15+
16+
if [[ $PLATFORM == "Unix" ]]; then
17+
if [[ $TRAVIS_OS_NAME == "linux" ]]; then
18+
sudo apt-get install libirrlicht-dev cmake libbz2-dev libpng12-dev \
19+
libjpeg-dev libxxf86vm-dev libgl1-mesa-dev libsqlite3-dev \
20+
libhiredis-dev libogg-dev libgmp-dev libvorbis-dev libopenal-dev gettext
21+
# Linking to LevelDB is broken, use a custom build
22+
wget http://minetest.kitsunemimi.pw/libleveldb-1.18-ubuntu12.04.7z
23+
sudo 7z x -o/usr libleveldb-1.18-ubuntu12.04.7z
24+
else
25+
brew update
26+
brew install freetype gettext hiredis irrlicht jpeg leveldb libogg libvorbis luajit
27+
fi
2028
elif [[ $PLATFORM == "Win32" ]]; then
2129
wget http://minetest.kitsunemimi.pw/mingw_w64_i686_ubuntu12.04_4.9.1.7z -O mingw.7z
2230
sed -e "s|%PREFIX%|i686-w64-mingw32|" \
@@ -30,4 +38,3 @@ elif [[ $PLATFORM == "Win64" ]]; then
3038
< util/travis/toolchain_mingw.cmake.in > util/buildbot/toolchain_mingw64.cmake
3139
sudo 7z x -y -o/usr mingw.7z
3240
fi
33-

util/travis/script.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash -e
22

3-
if [[ $PLATFORM == "Linux" ]]; then
3+
if [[ $PLATFORM == "Unix" ]]; then
44
mkdir -p travisbuild
55
cd travisbuild
66
CMAKE_FLAGS='-DCMAKE_BUILD_TYPE=Debug \
@@ -10,6 +10,9 @@ if [[ $PLATFORM == "Linux" ]]; then
1010
if [[ $CC == "clang" ]]; then
1111
CMAKE_FLAGS+=' -DENABLE_FREETYPE=FALSE'
1212
fi
13+
if [[ $TRAVIS_OS_NAME == "osx" ]]; then
14+
CMAKE_FLAGS+=' -DCUSTOM_GETTEXT_PATH=/usr/local/opt/gettext'
15+
fi
1316
cmake $CMAKE_FLAGS ..
1417
make -j2
1518
echo "Running unit tests."

0 commit comments

Comments
 (0)