Deactivated PSP build and refactored build conditions

2014-12-07 20:29:27 +01:00
parent 1f77243881
commit 51d5b166a6
2 changed files with 81 additions and 57 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,25 +4,43 @@ branches:
    - latest-master

 before_install:
- export PSPDEV="$TRAVIS_BUILD_DIR/opt/pspsdk"
- export PSPSDK="$PSPDEV/psp/sdk"
- export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin"
- export ANDROID="android-sdk-linux/tools/android"
- sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
- sudo apt-get update -qq
- if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi
- sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulseaudio libpulse-dev
- export QMAKE="qmake -qt=qt5"
- 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 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 BUILD_PSP=YES
+  - export BUILD_ANDROID=YES
+  - export BUILD_Qt=YES
+  - export BUILD_MAC=YES
+  - sudo apt-get update -qq
+# Building for PSP here
+  - if [ "$BUILD_PSP" == "YES" ]; 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;
+    fi
+# Building for Android here
+  - if [ "$BUILD_ANDROID" == "YES" ]; 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;
+    fi
+# Building for Qt here
+  - if [ "$BUILD_Qt" == "YES" ]; 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";
+    fi

 install:
- tar -x --xz -f sdk.lzma
- 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-21.1.1,android-10 --no-ui --force --no-https
+- if [ "$BUILD_PSP" == "YES" ]; then
+    tar -x --xz -f sdk.lzma;
+  fi
+- if [ "$BUILD_ANDROID" == "YES" ]; 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-21.1.1,android-10 --no-ui --force --no-https;
+  fi
 - sudo pip install pyjavaproperties
 - sudo pip install github3.py

--- a/tools/travis-script.sh
+++ b/tools/travis-script.sh
@@ -1,8 +1,6 @@
 #!/bin/sh -ex

 # let's dump some info to debug a bit
-echo PSPDEV = $PSPDEV
-echo psp-config = `psp-config --psp-prefix`
 echo ls = `ls`
 echo pwd = `pwd`
 # computing potential release name
@@ -35,47 +33,55 @@ mv core_*.zip ../../../../core.zip
 cd ../../../..

 # we're building a PSP binary here
-cd JGE
-make -j 4
-cd ..
-cd projects/mtg
-mkdir objs
-make -j 4
-mkdir WTH
-mkdir WTH/Res
-mv EBOOT.PBP WTH/
-mv ../../JGE/exceptionHandler/prx/exception.prx WTH/
-cp ../../core.zip WTH/Res
-cd WTH/Res
-unzip core.zip
-rm core.zip
-cd ..
-chmod -R 775 Res
-cd ..
-zip psprelease.zip -r WTH/
-cd ../..
+if [ "$BUILD_PSP" = "YES" ]; then
+    echo PSPDEV = $PSPDEV
+    echo psp-config = `psp-config --psp-prefix`
+    cd JGE
+    make -j 4
+    cd ..
+    cd projects/mtg
+    mkdir objs
+    make -j 4
+    mkdir WTH
+    mkdir WTH/Res
+    mv EBOOT.PBP WTH/
+    mv ../../JGE/exceptionHandler/prx/exception.prx WTH/
+    cp ../../core.zip WTH/Res
+    cd WTH/Res
+    unzip core.zip
+    rm core.zip
+    cd ..
+    chmod -R 775 Res
+    cd ..
+    zip psprelease.zip -r WTH/
+    cd ../..
+fi

 # we're building an Android binary here
-android-ndk-r9/ndk-build -C projects/mtg/Android -j4
-$ANDROID list targets
-$ANDROID update project -t 1 -p projects/mtg/Android
-ant debug -f projects/mtg/Android/build.xml
+if [ "$BUILD_ANDROID" = "YES" ]; then
+    android-ndk-r9/ndk-build -C projects/mtg/Android -j4
+    $ANDROID list targets
+    $ANDROID update project -t 1 -p projects/mtg/Android
+    ant debug -f projects/mtg/Android/build.xml
+fi

 # we're building a Qt version with GUI here
-mkdir qt-gui-build
-cd qt-gui-build
-$QMAKE ../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics
-make -j 4
-cd ..
-
-# let's try an Intel linux binary in debug text-mode-only
-$QMAKE projects/mtg/wagic-qt.pro CONFIG+=console CONFIG+=debug DEFINES+=CAPTURE_STDERR
-make -j 4
-
-# Now we run the testsuite (Res needs to be in the working directory)
-cd projects/mtg
-../../wagic
-cd ../..
+if [ "$BUILD_Qt" = "YES" ]; then
+    mkdir qt-gui-build
+    cd qt-gui-build
+    $QMAKE ../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics
+    make -j 4
+    cd ..
+    # let's try an Intel linux binary in debug text-mode-only
+    $QMAKE projects/mtg/wagic-qt.pro CONFIG+=console CONFIG+=debug DEFINES+=CAPTURE_STDERR
+    make -j 4
+    # Now we run the testsuite (Res needs to be in the working directory)
+    cd projects/mtg
+    ../../wagic
+    cd ../..
+fi

 # Let's launch de Mac cross-compilation
-./tools/build-macos-script.sh
+if [ "$BUILD_MAC" = "YES" ]; then
+    ./tools/build-macos-script.sh
+fi