From 136f2dfa096ac07245e55d2cbba4211105a446d7 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 22 May 2016 07:27:54 -0700 Subject: [PATCH] Enable ccache for Symbian. Also, disable fork irc notifications. Yay. --- .travis.sh | 24 +++++++++++++++++++++--- .travis.yml | 5 ++++- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.travis.sh b/.travis.sh index 9f87ddbaa8..0833be1cd3 100644 --- a/.travis.sh +++ b/.travis.sh @@ -36,6 +36,16 @@ travis_before_install() { fi } +setup_ccache_script() { + if [ ! -e "$1" ]; then + mkdir "$1" + fi + + echo "#!/bin/bash" > "$1/$3" + echo "ccache $2/$3 \$*" >> "$1/$3" + chmod +x "$1/$3" +} + travis_install() { # Ubuntu Linux + GCC 4.8 if [ "$PPSSPP_BUILD_TYPE" = "Linux" ]; then @@ -78,7 +88,15 @@ travis_install() { sudo apt-get install lib32stdc++6 lib32bz2-1.0 -qq download_extract https://github.com/xsacha/SymbianGCC/releases/download/4.8.3/gcc4.8.3_x86-64.tar.bz2 compiler.tar.bz2 download_extract https://github.com/xsacha/SymbianGCC/releases/download/4.8.3/ndk-new.tar.bz2 ndk.tar.bz2 - export EPOCROOT=$(pwd)/SDKs/SymbianSR1Qt474/ SBS_GCCE483BIN=$(pwd)/gcc4.8.3_x86-64/bin + + setup_ccache_script $(pwd)/gcce-ccache $(pwd)/gcc4.8.3_x86-64/bin arm-none-symbianelf-gcc-4.8.3 + setup_ccache_script $(pwd)/gcce-ccache $(pwd)/gcc4.8.3_x86-64/bin arm-none-symbianelf-gcc + setup_ccache_script $(pwd)/gcce-ccache $(pwd)/gcc4.8.3_x86-64/bin arm-none-symbianelf-g++ + setup_ccache_script $(pwd)/gcce-ccache $(pwd)/gcc4.8.3_x86-64/bin arm-none-symbianelf-c++ + + ln -s $(pwd)/gcc4.8.3_x86-64/bin/arm-none-symbianelf-{strip,strings,size,readelf,ranlib,objdump,objcopy,nm,ld,gprof,gcov,gcc-ranlib,gcc-nm,gcc-ar,elfedit,cpp,c++filt,as,ar,addr2line} $(pwd)/gcce-ccache + + export EPOCROOT=$(pwd)/SDKs/SymbianSR1Qt474/ SBS_GCCE483BIN="$(pwd)/gcce-ccache" cp ffmpeg/symbian/armv6/lib/* $EPOCROOT/epoc32/release/armv5/urel/ fi @@ -123,8 +141,8 @@ travis_script() { ./b.sh --release --no-package fi if [ "$PPSSPP_BUILD_TYPE" = "Symbian" ]; then - export EPOCROOT=$(pwd)/SDKs/SymbianSR1Qt474/ SBS_GCCE483BIN=$(pwd)/gcc4.8.3_x86-64/bin - PATH=$SBS_GCCE483BIN:$(pwd)/tools/sbs/bin:$EPOCROOT/epoc32/tools:$EPOCROOT/bin:$(pwd)/tools/sbs/linux-x86_64-libc2_15/bin:$PATH + export EPOCROOT=$(pwd)/SDKs/SymbianSR1Qt474/ SBS_GCCE483BIN="$(pwd)/gcce-ccache" + PATH=$SBS_GCCE483BIN:$(pwd)/gcc4.8.3_x86-64/bin:$(pwd)/tools/sbs/bin:$EPOCROOT/epoc32/tools:$EPOCROOT/bin:$(pwd)/tools/sbs/linux-x86_64-libc2_15/bin:$PATH QMAKE_ARGS="CONFIG+=no_assets" ./b.sh --debug --no-package fi if [ "$PPSSPP_BUILD_TYPE" = "iOS" ]; then diff --git a/.travis.yml b/.travis.yml index 6334297705..dc03801ee9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,9 +24,12 @@ cache: - apt - ccache +# By encrypting the channel name, we disable notifications from forks by default. +# It's not actually a big secret. notifications: irc: - channels: "chat.freenode.net#ppsspp" + channels: + - secure: "anmDihJ1uPnDSNDsEe3WQ5o4BsPApJbw6NupsAebt6kBxJm7WYKrSyUVmu/9GXgFvy756HBDVA6eikPtcak1+jLFfyOZqGw3ei69ZNnA+R7aoAzfiXilFqf53Yy2tzydEnF2nBYhJjQZgMBZUVWUD6pdKSXtVg/VZRhVqiDlb+A=" on_success: change on_failure: always skip_join: true