From c4920fa62a98d4962b053fe3c6a5ff4b4003ba72 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 24 Sep 2016 14:38:40 -0700 Subject: [PATCH] Remove Symbian from Travis. --- .travis.sh | 22 ---------------------- .travis.yml | 3 --- 2 files changed, 25 deletions(-) diff --git a/.travis.sh b/.travis.sh index 8e41c8f4d1..c8dce4fccd 100644 --- a/.travis.sh +++ b/.travis.sh @@ -78,23 +78,6 @@ travis_install() { sed -i 's/-g../&-4.8.2/g' Blackberry/bb.toolchain.cmake fi - # Symbian NDK: Belle + GCC: 4.8.3 - if [ "$PPSSPP_BUILD_TYPE" = "Symbian" ]; then - 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 - - 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 - # Ensure we're using ccache if [[ "$CXX" = "clang" && "$CC" == "clang" ]]; then export CXX="ccache clang" CC="ccache clang" @@ -135,11 +118,6 @@ travis_script() { ./b.sh --release --no-package fi - if [ "$PPSSPP_BUILD_TYPE" = "Symbian" ]; then - 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 ./b.sh --ios pushd build diff --git a/.travis.yml b/.travis.yml index dc03801ee9..396cb8443f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,9 +62,6 @@ matrix: compiler: "gcc blackberry" env: PPSSPP_BUILD_TYPE=Blackberry CMAKE=TRUE - - os: linux - compiler: "gcc symbian" - env: PPSSPP_BUILD_TYPE=Symbian - os: linux compiler: "clang linux" env: PPSSPP_BUILD_TYPE=Linux