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

Deactivated PSP build and refactored build conditions

Browse Source
This commit is contained in:
xawotihs
2014-12-07 20:29:27 +01:00
parent 1f77243881
commit 51d5b166a6
2 changed files with 81 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+35 -17
View File
@@ -4,25 +4,43 @@ branches:
- latest-master - latest-master
before_install: before_install:
- export PSPDEV="$TRAVIS_BUILD_DIR/opt/pspsdk" # - export BUILD_PSP=YES
- export PSPSDK="$PSPDEV/psp/sdk" - export BUILD_ANDROID=YES
- export PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" - export BUILD_Qt=YES
- export ANDROID="android-sdk-linux/tools/android" - export BUILD_MAC=YES
- sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa - sudo apt-get update -qq
- sudo apt-get update -qq # Building for PSP here
- if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch jq; fi - if [ "$BUILD_PSP" == "YES" ]; then
- sudo apt-get install -qq qt5-qmake qtbase5-dev qtdeclarative5-dev qttools5-dev qtmultimedia5-dev pulseaudio libpulse-dev export PSPDEV="$TRAVIS_BUILD_DIR/opt/pspsdk" &&
- export QMAKE="qmake -qt=qt5" export PSPSDK="$PSPDEV/psp/sdk" &&
- 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 PATH="$PATH:$PSPDEV/bin:$PSPSDK/bin" &&
- wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 -nv 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/android-sdk_r23.0.2-linux.tgz -nv 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: install:
- tar -x --xz -f sdk.lzma - if [ "$BUILD_PSP" == "YES" ]; then
- tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 tar -x --xz -f sdk.lzma;
- tar -zxf android-sdk_r23.0.2-linux.tgz fi
- $ANDROID list sdk --extended -a - if [ "$BUILD_ANDROID" == "YES" ]; then
- echo yes | $ANDROID update sdk --filter tools,platform-tools,build-tools-21.1.1,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-21.1.1,android-10 --no-ui --force --no-https;
fi
- sudo pip install pyjavaproperties - sudo pip install pyjavaproperties
- sudo pip install github3.py - sudo pip install github3.py
tools/travis-script.sh
+46 -40
View File
@@ -1,8 +1,6 @@
#!/bin/sh -ex #!/bin/sh -ex
# let's dump some info to debug a bit # let's dump some info to debug a bit
echo PSPDEV = $PSPDEV
echo psp-config = `psp-config --psp-prefix`
echo ls = `ls` echo ls = `ls`
echo pwd = `pwd` echo pwd = `pwd`
# computing potential release name # computing potential release name
@@ -35,47 +33,55 @@ mv core_*.zip ../../../../core.zip
cd ../../../.. cd ../../../..
# we're building a PSP binary here # we're building a PSP binary here
cd JGE if [ "$BUILD_PSP" = "YES" ]; then
make -j 4 echo PSPDEV = $PSPDEV
cd .. echo psp-config = `psp-config --psp-prefix`
cd projects/mtg cd JGE
mkdir objs make -j 4
make -j 4 cd ..
mkdir WTH cd projects/mtg
mkdir WTH/Res mkdir objs
mv EBOOT.PBP WTH/ make -j 4
mv ../../JGE/exceptionHandler/prx/exception.prx WTH/ mkdir WTH
cp ../../core.zip WTH/Res mkdir WTH/Res
cd WTH/Res mv EBOOT.PBP WTH/
unzip core.zip mv ../../JGE/exceptionHandler/prx/exception.prx WTH/
rm core.zip cp ../../core.zip WTH/Res
cd .. cd WTH/Res
chmod -R 775 Res unzip core.zip
cd .. rm core.zip
zip psprelease.zip -r WTH/ cd ..
cd ../.. chmod -R 775 Res
cd ..
zip psprelease.zip -r WTH/
cd ../..
fi
# we're building an Android binary here # we're building an Android binary here
android-ndk-r9/ndk-build -C projects/mtg/Android -j4 if [ "$BUILD_ANDROID" = "YES" ]; then
$ANDROID list targets android-ndk-r9/ndk-build -C projects/mtg/Android -j4
$ANDROID update project -t 1 -p projects/mtg/Android $ANDROID list targets
ant debug -f projects/mtg/Android/build.xml $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 # we're building a Qt version with GUI here
mkdir qt-gui-build if [ "$BUILD_Qt" = "YES" ]; then
cd qt-gui-build mkdir qt-gui-build
$QMAKE ../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics cd qt-gui-build
make -j 4 $QMAKE ../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics
cd .. make -j 4
cd ..
# let's try an Intel linux binary in debug text-mode-only # 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 $QMAKE projects/mtg/wagic-qt.pro CONFIG+=console CONFIG+=debug DEFINES+=CAPTURE_STDERR
make -j 4 make -j 4
# Now we run the testsuite (Res needs to be in the working directory)
# Now we run the testsuite (Res needs to be in the working directory) cd projects/mtg
cd projects/mtg ../../wagic
../../wagic cd ../..
cd ../.. fi
# Let's launch de Mac cross-compilation # Let's launch de Mac cross-compilation
./tools/build-macos-script.sh if [ "$BUILD_MAC" = "YES" ]; then
./tools/build-macos-script.sh
fi