Moves the ccache clang wrapper scripts to utils/travis/.

Also clears the ccache statistics after printing them. This means the hit/miss count will be shown per run, rather than cumulatively.
This commit is contained in:
pentarctagon 2018-02-24 01:20:30 -06:00 committed by Pentarctagon
parent 726b1be0d0
commit b71f7cdc3c
4 changed files with 6 additions and 3 deletions

View file

@ -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;

View file

@ -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