diff --git a/.travis.yml b/.travis.yml index a28fd5e8c637..53187db5f3b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,11 +70,11 @@ install: script: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then if [ "$TOOL" = "xcodebuild" ]; then - cd ./projectfiles/Xcode; - + export PATH="/usr/local/opt/ccache/libexec:$PWD/utils/travis:$PATH"; export CC=ccache-clang; export CXX=ccache-clang++; - export PATH="/usr/local/opt/ccache/libexec:$PWD:$PATH"; + + cd ./projectfiles/Xcode; export CCACHE_MAXSIZE=2G; export CCACHE_COMPILERCHECK=content; @@ -82,6 +82,7 @@ script: xcodebuild -project Wesnoth.xcodeproj -target Wesnoth; ccache -s; + ccache -z; else ln -s build-cache/ build; ./utils/travis/check_utf8.sh; diff --git a/docker_run.sh b/docker_run.sh index 6c09c950f886..d13ba012126c 100755 --- a/docker_run.sh +++ b/docker_run.sh @@ -57,6 +57,8 @@ else # print ccache statistics ccache -s +# clear ccache statistics, so only per run info is printed rather than cumulative + ccache -z else scons wesnoth wesnothd campaignd boost_unit_tests build=release ctool=$CC cxxtool=$CXX --debug=time extra_flags_config="-pipe" extra_flags_release="$EXTRA_FLAGS_RELEASE" strict="$STRICT" cxx_std=$CXXSTD nls=false jobs=2 enable_lto=false fi diff --git a/projectfiles/Xcode/ccache-clang b/utils/travis/ccache-clang similarity index 100% rename from projectfiles/Xcode/ccache-clang rename to utils/travis/ccache-clang diff --git a/projectfiles/Xcode/ccache-clang++ b/utils/travis/ccache-clang++ similarity index 100% rename from projectfiles/Xcode/ccache-clang++ rename to utils/travis/ccache-clang++