From d2e41f98c381d802e369259ee1ec969cfc782a49 Mon Sep 17 00:00:00 2001 From: Rolz73 Date: Tue, 3 Dec 2013 02:36:11 -0500 Subject: [PATCH 1/4] Changed Travis build file to use Android API 10 and Android build tools 18.1.1 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9430365de..74d65210f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,5 +13,5 @@ install: - wget http://dl.google.com/android/android-sdk_r22-linux.tgz -nv - tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 - tar -zxf android-sdk_r22-linux.tgz - - echo yes | $ANDROID update sdk --filter 1,2,3,8 --no-ui --force > log.txt + - echo yes | $ANDROID update sdk -a --filter 1,2,4,18 --no-ui --force > log.txt script: "./travis-script.sh" From 9e969881fd0a70fb76c9b6c30ac546e0d891a6e1 Mon Sep 17 00:00:00 2001 From: Dmitry Panin Date: Wed, 4 Dec 2013 12:04:54 +0400 Subject: [PATCH 2/4] Added output of info about Android APIs --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 74d65210f..a52cf4ac6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,5 +13,6 @@ install: - wget http://dl.google.com/android/android-sdk_r22-linux.tgz -nv - tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 - tar -zxf android-sdk_r22-linux.tgz + - $ANDROID list sdk - echo yes | $ANDROID update sdk -a --filter 1,2,4,18 --no-ui --force > log.txt script: "./travis-script.sh" From 657479e0e4b5281aa22e0c0c38fc9362d80bfef6 Mon Sep 17 00:00:00 2001 From: Tobias Loose Date: Wed, 4 Dec 2013 11:44:36 +0100 Subject: [PATCH 3/4] Do not specify the system directory in JGE --- JGE/src/JFileSystem.cpp | 2 +- travis-script.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/JGE/src/JFileSystem.cpp b/JGE/src/JFileSystem.cpp index cb377aa49..63ee77244 100644 --- a/JGE/src/JFileSystem.cpp +++ b/JGE/src/JFileSystem.cpp @@ -126,7 +126,7 @@ JFileSystem::JFileSystem(const string & _userPath, const string & _systemPath) DebugTrace("User path " << userPath); #elif defined (QT_CONFIG) - QDir sysDir("projects/mtg/bin/Res"); + QDir sysDir(RESDIR); QDir dir(QDir::homePath()); dir.mkdir(USERDIR); dir.cd(USERDIR); diff --git a/travis-script.sh b/travis-script.sh index 17f0fbdec..b24955552 100755 --- a/travis-script.sh +++ b/travis-script.sh @@ -27,4 +27,5 @@ qmake projects/mtg/wagic-qt.pro CONFIG+=console CONFIG+=debug DEFINES+=CAPTURE_S make -j 8 # and finish by running the testsuite -./wagic +cd projects/mtg +./../../wagic From 42575925683d7a611a64eaeea8cce0891d1321a7 Mon Sep 17 00:00:00 2001 From: Rolzad73 Date: Wed, 4 Dec 2013 12:58:22 -0500 Subject: [PATCH 4/4] Updated output of info about Android APIs --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a52cf4ac6..375a49141 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,6 @@ install: - wget http://dl.google.com/android/android-sdk_r22-linux.tgz -nv - tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 - tar -zxf android-sdk_r22-linux.tgz - - $ANDROID list sdk + - $ANDROID list sdk -a - echo yes | $ANDROID update sdk -a --filter 1,2,4,18 --no-ui --force > log.txt script: "./travis-script.sh"