From b023dd89b6a472aa7a132c6c19069ad7c7eb100b Mon Sep 17 00:00:00 2001 From: xawotihs Date: Tue, 3 Sep 2019 22:09:44 +0200 Subject: [PATCH 1/7] - Should remove an error with the PSP compiler --- projects/mtg/src/MTGAbility.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index 7231dac05..22d3c53fd 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -4574,7 +4574,7 @@ int AbilityFactory::abilityEfficiency(MTGAbility * a, Player * p, int mode, Targ if (AAMover * aam = dynamic_cast(a)) { MTGGameZone * z = aam->destinationZone(target); - if (tc && tc->targetsZone(p->game->library) || tc && tc->targetsZone(p->game->graveyard) || tc && tc->targetsZone(p->game->hand)) + if ((tc && tc->targetsZone(p->game->library)) || (tc && tc->targetsZone(p->game->graveyard)) || (tc && tc->targetsZone(p->game->hand))) { if (z == p->game->hand || z == p->game->inPlay) return BAKA_EFFECT_GOOD; From 2750b34b4fe0bdaf8953779c6295078ec59ae4bc Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Tue, 3 Sep 2019 22:24:39 +0200 Subject: [PATCH 2/7] Trying to fix python dependencies --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7c9b85c07..7ce0514da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,6 +48,7 @@ install: $ANDROID list sdk --extended -a && echo yes | $ANDROID update sdk -a -t tools,platform-tools,build-tools-23.0.1,android-10 --no-ui --force --no-https; fi +- sudo python -m easy_install --upgrade pyOpenSSL - sudo pip install pyjavaproperties - sudo pip install github3.py - sudo pip install cpp-coveralls From 0cf8c1a97035a75a88e46dd58e712baa7dcb34dd Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Tue, 3 Sep 2019 22:40:11 +0200 Subject: [PATCH 3/7] Installing ant for android build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7ce0514da..6d57be7bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ before_install: export ANDROID="android-sdk-linux/tools/android" && if [ `uname -m` = x86_64 ]; then sudo dpkg --add-architecture i386 && sudo apt-get update && - sudo apt-get install -qq --force-yes libgd2-xpm-dev libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1 jq; fi && + sudo apt-get install -qq --force-yes libgd2-xpm-dev libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1 jq ant; 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_r24.3.4-linux.tgz -nv; fi From 711f52e5ce15073b681f0a55999acc4939c3187d Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Tue, 3 Sep 2019 23:15:48 +0200 Subject: [PATCH 4/7] Updating JDK to 7 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6d57be7bd..f9601a3ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,7 @@ install: tar -x --xz -f sdk.lzma; fi - if [ "$BUILD_ANDROID" == "YES" ]; then + jdk_switcher use openjdk7 && tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 && tar -zxf android-sdk_r24.3.4-linux.tgz && $ANDROID list sdk --extended -a && From 7a2f23db4529cb09eec3941ecb1677fe810be7ba Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Wed, 4 Sep 2019 16:01:50 +0200 Subject: [PATCH 5/7] Using trusty dist as it seems the only one supported for Android. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f9601a3ff..f9be64951 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: cpp +dist: trusty branches: except: - latest-master @@ -43,7 +44,6 @@ install: tar -x --xz -f sdk.lzma; fi - if [ "$BUILD_ANDROID" == "YES" ]; then - jdk_switcher use openjdk7 && tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 && tar -zxf android-sdk_r24.3.4-linux.tgz && $ANDROID list sdk --extended -a && From 8315acbe8625458e5c5a73461ea4509d37e537a3 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Wed, 4 Sep 2019 22:39:41 +0200 Subject: [PATCH 6/7] Removed death_grasp.txt and ai/goblin_artillery.txt from the testsuite (see issue#1023) --- projects/mtg/bin/Res/test/_tests.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt index 1dcc987d7..73c68bab5 100644 --- a/projects/mtg/bin/Res/test/_tests.txt +++ b/projects/mtg/bin/Res/test/_tests.txt @@ -264,7 +264,6 @@ dauntless_escort.txt dauthi_embrace.txt dawn_of_the_dead.txt deadshot.txt -death_grasp.txt death_ward.txt decree_of_justice.txt defense_of_the_heart.txt @@ -739,5 +738,4 @@ momir/overcost.txt ######################## #AI Tests ######################## -ai/goblin_artillery.txt ai/proliferate_simple.txt From a27216c31731257df94f01b0850f35d4a3a27e01 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Thu, 5 Sep 2019 22:24:33 +0200 Subject: [PATCH 7/7] Deactivating mac/ios build as currently broken --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f9be64951..53786e4a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,9 @@ before_install: - export BUILD_Qt=YES - export BUILD_MAC=NO # Only building on Mac when not handling pull request - - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then - export BUILD_MAC=YES; - fi +# - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then +# export BUILD_MAC=YES; +# fi - sudo apt-get update -qq # Building for PSP here - if [ "$BUILD_PSP" == "YES" ]; then