diff --git a/.travis.yml b/.travis.yml index 52e0f3eed..f00c97688 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,36 +15,36 @@ before_install: - sudo apt-get update -qq # Building for PSP here - if [ "$BUILD_TYPE" == "PSP" ]; then - export PSPDEV="$TRAVIS_BUILD_DIR/opt/pspsdk" - export PSPSDK="$PSPDEV/psp/sdk" - export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" - wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download + export PSPDEV="$TRAVIS_BUILD_DIR/opt/pspsdk" && + export PSPSDK="$PSPDEV/psp/sdk" && + export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" && + wget -O sdk.lzma http://sourceforge.net/projects/minpspw/files/SDK%20%2B%20devpak/pspsdk%200.11.2/minpspw_0.11.2-amd64.tar.lzma/download; fi # Building for Android here - if [ "$BUILD_TYPE" == "Android" ]; then - export ANDROID="android-sdk-linux/tools/android" - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi - wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv - wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz -nv + export ANDROID="android-sdk-linux/tools/android" && + if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi && + wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv && + wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz -nv; fi # Building for Qt here - if [ "$BUILD_TYPE" == "Qt" ]; then - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa - sudo apt-get update -qq - sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulseaudio libpulse-dev - export QMAKE="qmake -qt=qt5" + sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa && + sudo apt-get update -qq && + sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulseaudio libpulse-dev && + export QMAKE="qmake -qt=qt5"; fi install: # Building for PSP here - if [ "$BUILD_TYPE" == "PSP" ]; then - tar -x --xz -f sdk.lzma + tar -x --xz -f sdk.lzma; fi - if [ "$BUILD_TYPE" == "Android" ]; then - tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 - tar -zxf android-sdk_r23.0.2-linux.tgz - $ANDROID list sdk --extended -a - echo yes | $ANDROID update sdk --filter tools,platform-tools,build-tools-20.0.0,android-10 --no-ui --force --no-https + tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 && + tar -zxf android-sdk_r23.0.2-linux.tgz && + $ANDROID list sdk --extended -a && + echo yes | $ANDROID update sdk --filter tools,platform-tools,build-tools-20.0.0,android-10 --no-ui --force --no-https; fi - sudo pip install pyjavaproperties script: ./travis-script.sh