Move variable exports to the install step.

This commit is contained in:
Pentarctagon 2020-02-19 20:39:54 -06:00 committed by Pentarctagon
parent dbe2eeabde
commit 0f163825e6
2 changed files with 5 additions and 7 deletions

View File

@ -20,6 +20,11 @@ fi
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache scons
export PATH="/usr/local/opt/gettext/bin:/usr/local/opt/ccache/libexec:$PWD/utils/travis:$PATH"
export CC=ccache-clang
export CXX=ccache-clang++
export CCACHE_MAXSIZE=3000M
export CCACHE_COMPILERCHECK=content
travis_wait ./projectfiles/Xcode/Fix_Xcode_Dependencies
elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
start=`pwd`

View File

@ -1,17 +1,10 @@
#!/bin/bash
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
export PATH="/usr/local/opt/gettext/bin:/usr/local/opt/ccache/libexec:$PWD/utils/travis:$PATH"
export CC=ccache-clang
export CXX=ccache-clang++
scons translations build=release --debug=time nls=true jobs=2 || exit 1
cd ./projectfiles/Xcode
export CCACHE_MAXSIZE=500M
export CCACHE_COMPILERCHECK=content
xcodebuild CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -project "The Battle for Wesnoth.xcodeproj" -target "The Battle for Wesnoth" -configuration "$OPT"
BUILD_RET=$?