diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2018-05-21 21:04:18 +0200 |
|---|---|---|
| committer | SmallJoker <mk939@ymail.com> | 2018-06-03 17:32:00 +0200 |
| commit | 04fe8cc0a2563f9ea7566323679e7b4de177c9ec (patch) | |
| tree | d21a489b22fece27001ebaa563de5f499618bcc2 | |
| parent | 24abdf45b98be8d7120d722be8279d268a16f65a (diff) | |
| download | minetest-04fe8cc0a2563f9ea7566323679e7b4de177c9ec.tar.gz minetest-04fe8cc0a2563f9ea7566323679e7b4de177c9ec.tar.bz2 minetest-04fe8cc0a2563f9ea7566323679e7b4de177c9ec.zip | |
Update macosx build from master
| -rwxr-xr-x | util/travis/before_install.sh | 4 | ||||
| -rw-r--r-- | util/travis/common.sh | 47 |
2 files changed, 47 insertions, 4 deletions
diff --git a/util/travis/before_install.sh b/util/travis/before_install.sh index af69f78ca..b87668cce 100755 --- a/util/travis/before_install.sh +++ b/util/travis/before_install.sh @@ -33,9 +33,7 @@ if [[ $PLATFORM == "Unix" ]]; then fi else - brew update - brew install freetype gettext hiredis irrlicht jpeg leveldb libogg libvorbis luajit - #brew upgrade postgresql + install_macosx_deps fi elif [[ $PLATFORM == "Win32" ]]; then sudo apt-get update diff --git a/util/travis/common.sh b/util/travis/common.sh index 35ceec08d..949540967 100644 --- a/util/travis/common.sh +++ b/util/travis/common.sh @@ -1,9 +1,54 @@ #!/bin/bash -e +set_linux_compiler_env() { + if [[ "${COMPILER}" == "gcc-5.1" ]]; then + export CC=gcc-5.1 + export CXX=g++-5.1 + elif [[ "${COMPILER}" == "gcc-6" ]]; then + export CC=gcc-6 + export CXX=g++-6 + elif [[ "${COMPILER}" == "gcc-7" ]]; then + export CC=gcc-7 + export CXX=g++-7 + elif [[ "${COMPILER}" == "clang-3.6" ]]; then + export CC=clang-3.6 + export CXX=clang++-3.6 + elif [[ "${COMPILER}" == "clang-5.0" ]]; then + export CC=clang-5.0 + export CXX=clang++-5.0 + fi +} + +# Linux build only +install_linux_deps() { + sudo apt-get update + 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 libpq-dev libleveldb-dev +} + +# Mac OSX build only +install_macosx_deps() { + brew update + brew install freetype gettext hiredis irrlicht leveldb libogg libvorbis luajit + if brew ls | grep -q jpeg; then + brew upgrade jpeg + else + brew install jpeg + fi + #brew upgrade postgresql +} + # Relative to git-repository root: TRIGGER_COMPILE_PATHS="src/.*\.(c|cpp|h)|CMakeLists.txt|cmake/Modules/|util/travis/|util/buildbot/" needs_compile() { - git diff --name-only $TRAVIS_COMMIT_RANGE | egrep -q "^($TRIGGER_COMPILE_PATHS)" + RANGE="$TRAVIS_COMMIT_RANGE" + if [[ "$(git diff --name-only $RANGE -- 2>/dev/null)" == "" ]]; then + RANGE="$TRAVIS_COMMIT^...$TRAVIS_COMMIT" + echo "Fixed range: $RANGE" + fi + git diff --name-only $RANGE -- | egrep -q "^($TRIGGER_COMPILE_PATHS)" } |