Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed same shell issue in travis file

Browse Source
This commit is contained in:
xawotihs
2014-08-05 23:38:10 +02:00
parent 8458745bc4
commit 1cb20e4138
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+5 -6
View File
@@ -14,34 +14,33 @@ branches:
before_install: before_install:
- sudo apt-get update -qq - sudo apt-get update -qq
# Building for PSP here # Building for PSP here
- if [ "$BUILD_TYPE" == "PSP"]; then - if [ "$BUILD_TYPE" == "PSP" ]; then
export PSPDEV="$TRAVIS_BUILD_DIR/opt/pspsdk" export PSPDEV="$TRAVIS_BUILD_DIR/opt/pspsdk"
export PSPSDK="$PSPDEV/psp/sdk" export PSPSDK="$PSPDEV/psp/sdk"
export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" 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 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 fi
# Building for Android here # Building for Android here
- if [ "$BUILD_TYPE" == "Android"]; then - if [ "$BUILD_TYPE" == "Android" ]; then
export ANDROID="android-sdk-linux/tools/android" 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 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/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv
wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz -nv wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz -nv
fi fi
# Building for Qt here # Building for Qt here
- if [ "$BUILD_TYPE" == "Qt"]; then - if [ "$BUILD_TYPE" == "Qt" ]; then
sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulseaudio libpulse-dev sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulseaudio libpulse-dev
export QMAKE="qmake -qt=qt5" export QMAKE="qmake -qt=qt5"
fi fi
install: install:
# Building for PSP here # Building for PSP here
- if [ "$BUILD_TYPE" == "PSP"]; then - if [ "$BUILD_TYPE" == "PSP" ]; then
tar -x --xz -f sdk.lzma tar -x --xz -f sdk.lzma
fi fi
- if [ "$BUILD_TYPE" == "Android"]; then - if [ "$BUILD_TYPE" == "Android" ]; then
tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2
tar -zxf android-sdk_r23.0.2-linux.tgz tar -zxf android-sdk_r23.0.2-linux.tgz
$ANDROID list sdk --extended -a $ANDROID list sdk --extended -a