From 15cd86fad198f1d7cd27837f67bc8a20f0a7cf5d Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Thu, 4 Dec 2014 22:51:38 +0100 Subject: [PATCH 01/34] Add traces at the end of the upload --- upload-binaries.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/upload-binaries.py b/upload-binaries.py index 01508f6d5..dc2238b05 100644 --- a/upload-binaries.py +++ b/upload-binaries.py @@ -59,8 +59,9 @@ def main(): r = checkRelease(repository, options.remote) filename = options.remote with open(options.local, 'rb') as fd: - r.upload_asset('application/zip', filename , fd) - + asset = r.upload_asset('application/zip', filename , fd) + s = 'File ' + options.local + ' has been uploaded as ' + asset.name + '.' + print s if __name__ == "__main__": main() From 03d168f9728816c1a65acc463862fadfefee334b Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sat, 6 Dec 2014 15:13:45 +0100 Subject: [PATCH 02/34] Added MacOS bundle creation in Qt .pro file --- projects/mtg/MacOS/Info.plist | 20 ++++++++++++++++++++ projects/mtg/MacOS/wagic.icns | Bin 0 -> 11436 bytes projects/mtg/MacOS/wagic.launcher | 5 +++++ projects/mtg/wagic-qt.pro | 22 ++++++++++++++++++++++ 4 files changed, 47 insertions(+) create mode 100644 projects/mtg/MacOS/Info.plist create mode 100644 projects/mtg/MacOS/wagic.icns create mode 100755 projects/mtg/MacOS/wagic.launcher diff --git a/projects/mtg/MacOS/Info.plist b/projects/mtg/MacOS/Info.plist new file mode 100644 index 000000000..3f2c494ee --- /dev/null +++ b/projects/mtg/MacOS/Info.plist @@ -0,0 +1,20 @@ + + + + + NSPrincipalClass + NSApplication + CFBundlePackageType + APPL + CFBundleGetInfoString + Created by Qt/QMake + CFBundleSignature + ???? + CFBundleExecutable + wagic.launcher + CFBundleIdentifier + wagic.wagic + NOTE + This file was generated by Qt/QMake. + + diff --git a/projects/mtg/MacOS/wagic.icns b/projects/mtg/MacOS/wagic.icns new file mode 100644 index 0000000000000000000000000000000000000000..a5cf7d686462bae48032414698ee5419514fd047 GIT binary patch literal 11436 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 literal 0 HcmV?d00001 diff --git a/projects/mtg/MacOS/wagic.launcher b/projects/mtg/MacOS/wagic.launcher new file mode 100755 index 000000000..09a36f175 --- /dev/null +++ b/projects/mtg/MacOS/wagic.launcher @@ -0,0 +1,5 @@ +#!/bin/bash + +cd ${0%/*/*}/Resources +#cd ../Resources +exec ../MacOS/wagic -platformpluginpath ../PlugIns >> ../logs/out.log 2> ../logs/err.log diff --git a/projects/mtg/wagic-qt.pro b/projects/mtg/wagic-qt.pro index 9c547d11a..d53f75fcd 100644 --- a/projects/mtg/wagic-qt.pro +++ b/projects/mtg/wagic-qt.pro @@ -134,6 +134,28 @@ maemo5: { USERDIR = /sdcard/Wagic/Res DEFINES += RESDIR=\\\"$$RESDIR\\\" DEFINES += USERDIR=\\\"$$USERDIR\\\" +} else:macx { + # Copy the custom Info.plist to the app bundle + QMAKE_INFO_PLIST = MacOS/Info.plist + # Icon is mandatory for submission + ICON = MacOS/wagic.icns + + #Move resource file + res.commands = cd $$_PRO_FILE_PWD_/bin/Res; python createResourceZip.py; + res.depends = all + QMAKE_EXTRA_TARGETS += res + + # Create a dmg file + dmg.commands = mkdir wagic.app/Contents/logs; mkdir wagic.app/Contents/Resources/Res; mv $$_PRO_FILE_PWD_/bin/Res/core*.zip wagic.app/Contents/Resources/Res; cp $$_PRO_FILE_PWD_/MacOS/wagic.launcher wagic.app/Contents/MacOS; $$dirname(QMAKE_QMAKE)/macdeployqt wagic.app -dmg + dmg.depends = res + QMAKE_EXTRA_TARGETS += dmg + + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 + QMAKE_MAC_SDK = macosx + + # Only Intel binaries are accepted so force this + CONFIG += x86 + } else:unix { # Variables BINDIR = /usr/bin From 16dcf3cc5ecdc2500d86f060492a34603abd3a08 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 7 Dec 2014 16:02:56 +0100 Subject: [PATCH 03/34] - Moved scripts in tools directory - Added a Mac cross-compiling script --- .travis.yml | 8 +- appveyor.yml | 2 +- tools/build-macos-script.sh | 47 +++++++++ travis-script.sh => tools/travis-script.sh | 25 +---- .../upload-binaries.py | 0 upload-binaries.sh | 99 ------------------- 6 files changed, 55 insertions(+), 126 deletions(-) create mode 100644 tools/build-macos-script.sh rename travis-script.sh => tools/travis-script.sh (74%) rename upload-binaries.py => tools/upload-binaries.py (100%) delete mode 100755 upload-binaries.sh diff --git a/.travis.yml b/.travis.yml index ece4fd393..73f3ec230 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,9 +30,9 @@ env: global: secure: "fJgWlCFbde96OSQNGKUmowGX+ERPeqP+n1EOMf1+FJzOU4DdkTLRAlV5+5qnEX9jB/3mWN6iPpmG1qEz/SdDG3KHxJYs4ZU/Lu485O24zZ/+GdYBNsrvhPD9ckPGEMLDa1foEVTDnW0Dlkz3BCFcszjhtXGUJv7v6Pj6LRk1Mg8=" -script: "./travis-script.sh" +script: "tools/travis-script.sh" after_success: -- python upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l core.zip -r Wagic-core.zip -b $TRAVIS_BRANCH -- python upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/Android/bin/Wagic-debug.apk -r Wagic-android.apk -b $TRAVIS_BRANCH -- python upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/psprelease.zip -r Wagic-psp.zip -b $TRAVIS_BRANCH +- python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l core.zip -r Wagic-core.zip -b $TRAVIS_BRANCH +- python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/Android/bin/Wagic-debug.apk -r Wagic-android.apk -b $TRAVIS_BRANCH +- python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/psprelease.zip -r Wagic-psp.zip -b $TRAVIS_BRANCH diff --git a/appveyor.yml b/appveyor.yml index a0802bbc0..41490b4c9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -61,7 +61,7 @@ after_deploy: # to run your custom scripts instead of provider deployments deploy_script: - - "C:/Python27/python.exe upload-binaries.py -t %GH_TOKEN% -s %APPVEYOR_REPO_COMMIT% -l projects/mtg/bin/Wagic-windows.zip -r Wagic-windows.zip -b %APPVEYOR_REPO_BRANCH%" + - "C:/Python27/python.exe tools/upload-binaries.py -t %GH_TOKEN% -s %APPVEYOR_REPO_COMMIT% -l projects/mtg/bin/Wagic-windows.zip -r Wagic-windows.zip -b %APPVEYOR_REPO_BRANCH%" # to disable deployment #deploy: off diff --git a/tools/build-macos-script.sh b/tools/build-macos-script.sh new file mode 100644 index 000000000..c7cc35fee --- /dev/null +++ b/tools/build-macos-script.sh @@ -0,0 +1,47 @@ +#!/bin/sh -ex + +## New of branch to use +TRAVIS_MAC_BRANCH=travis_mac_osx + +## New Travis-CI configuration, adapted for Mac-OS +NEW_TRAVIS_YML=\ +"language: objective-c +before_install: +- brew update +- brew install qt5 +env: + global: + secure: "fJgWlCFbde96OSQNGKUmowGX+ERPeqP+n1EOMf1+FJzOU4DdkTLRAlV5+5qnEX9jB/3mWN6iPpmG1qEz/SdDG3KHxJYs4ZU/Lu485O24zZ/+GdYBNsrvhPD9ckPGEMLDa1foEVTDnW0Dlkz3BCFcszjhtXGUJv7v6Pj6LRk1Mg8=" +script: +- /usr/local/opt/qt5/bin/qmake projects/mtg/wagic-qt.pro CONFIG+=graphics +- make -j 4 dmg +after_success: +- python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l wagic.dmg -r Wagic-macosx.dmg -b $TRAVIS_BRANCH" + +## Only cross-compile on Mac the master branch +test "$TRAVIS_BRANCH" != "master" && exit 0 + +## Configure Git to use OAuth token +git config credential.helper "store --file=.git/credentials" +echo "https://${GH_TOKEN}:@github.com" > .git/credentials + +## Delete remote Travis-Mac branch (if any) +REMOTE=$(git branch -r | grep "origin/$TRAVIS_MAC_BRANCH\$") +if test -n "$REMOTE" ; then + # Delete remote branch + git branch -r -D "origin/$TRAVIS_MAC_BRANCH" + # Push (delete) remote branch on temote server (e.g. github) + git push origin ":$TRAVIS_MAC_BRANCH" +fi + +## Create a new branch +git checkout -q -b "$TRAVIS_MAC_BRANCH" "$TRAVIS_BRANCH" + +## Write a new Travis-CI configuration file +echo "$NEW_TRAVIS_YML" > .travis.yml +git add .travis.yml +git rm appveyor.yml +git commit -m "Auto-Updated Travis-CI configuration for Mac" + +## Push new branch to remote server +git push -q origin $TRAVIS_MAC_BRANCH:$TRAVIS_MAC_BRANCH diff --git a/travis-script.sh b/tools/travis-script.sh similarity index 74% rename from travis-script.sh rename to tools/travis-script.sh index 3cd466e71..73b03e457 100755 --- a/travis-script.sh +++ b/tools/travis-script.sh @@ -72,29 +72,10 @@ cd .. $QMAKE projects/mtg/wagic-qt.pro CONFIG+=console CONFIG+=debug DEFINES+=CAPTURE_STDERR make -j 8 -# we're cross-compiling a Qt Windows version here, -# PATH is only set here to prevent colision - -# export PATH="$PATH:/opt/mingw32/bin" -# mkdir build -# cd build -# mkdir win-cross -# cd win-cross -# /opt/mingw32/bin/qmake ../../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics -# make -j 8 -# cd release -# cp ../../../projects/mtg/bin/fmod.dll . -# cp /opt/mingw32/bin/QtCore4.dll . -# cp /opt/mingw32/bin/QtGui4.dll . -# cp /opt/mingw32/bin/QtNetwork4.dll . -# cp /opt/mingw32/bin/QtOpenGL4.dll . -# cp ../../../projects/mtg/bin/zlib1.dll . -# cp /opt/mingw32/bin/libpng15-15.dll . -# cd .. -# zip win-cross.zip -r release/ -# cd ../.. - # Now we run the testsuite (Res needs to be in the working directory) cd projects/mtg ../../wagic cd ../.. + +# Let's launch de Mac cross-compilation +./build-macos-script.sh diff --git a/upload-binaries.py b/tools/upload-binaries.py similarity index 100% rename from upload-binaries.py rename to tools/upload-binaries.py diff --git a/upload-binaries.sh b/upload-binaries.sh deleted file mode 100755 index 272b4771d..000000000 --- a/upload-binaries.sh +++ /dev/null @@ -1,99 +0,0 @@ -if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then -if [ "$TRAVIS_BRANCH" == "alphas" ]; then - echo -e "Creating a release\n" - curl -X POST -H "Authorization: token ${GH_TOKEN}" \ - -d '{"tag_name": "alpha-'${TRAVIS_BUILD_NUMBER}'", "target_commitish": "master", "name": "Alpha release number '${TRAVIS_BUILD_NUMBER}'", "body": "Automatic alpha release generated by Travis CI", "draft": false, "prerelease": true}' "https://api.github.com/repos/WagicProject/wagic/releases" > json.txt - IDDI=`cat json.txt | jq '.id'` - - echo -e "Uploading Core resources\n" - curl -X POST -H "Authorization: token ${GH_TOKEN}" \ - -H "Accept: application/vnd.github.manifold-preview" \ - -H "Content-Type: application/zip" \ - --data-binary @core.zip \ - "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-core.zip" - - echo -e "Uploading android package\n" - curl -X POST -H "Authorization: token ${GH_TOKEN}" \ - -H "Accept: application/vnd.github.manifold-preview" \ - -H "Content-Type: application/zip" \ - --data-binary @projects/mtg/Android/bin/Wagic-debug.apk \ - "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-android.apk" - - echo -e "Uploading PSP package\n" - curl -X POST -H "Authorization: token ${GH_TOKEN}" \ - -H "Accept: application/vnd.github.manifold-preview" \ - -H "Content-Type: application/zip" \ - --data-binary @projects/mtg/psprelease.zip \ - "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-psp.zip" - -# echo -e "Uploading Windows package\n" -# curl -X POST -H "Authorization: token ${GH_TOKEN}" \ -# -H "Accept: application/vnd.github.manifold-preview" \ -# -H "Content-Type: application/zip" \ -# --data-binary @build/win-cross/win-cross.zip \ -# "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-windows.zip" - - echo -e "Done uploading\n" -fi -fi - -if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then -if [ "$TRAVIS_BRANCH" == "master" ]; then - - # get info about all releases - echo -e "Getting info about previous releases" - curl -X GET -H "Authorization: token ${GH_TOKEN}" \ - "https://api.github.com/repos/WagicProject/wagic/releases" > json.txt - - # extract info only about only "latest-release" tag - cat json.txt |jq 'map(select (.tag_name == "latest-master"))' > latest.txt - - # get id of release - ID_TO_DELETE=`cat latest.txt |jq '.[0].id'` - - # delete previous release - echo -e "Deleting release number ${ID_TO_DELETE}" - curl -X DELETE -H "Authorization: token ${GH_TOKEN}" \ - "https://api.github.com/repos/WagicProject/wagic/releases/${ID_TO_DELETE}" - - # delete previous tag - curl -X DELETE -H "Authorization: token ${GH_TOKEN}" \ - "https://api.github.com/repos/WagicProject/wagic/git/refs/tags/latest-master" - - - echo -e "Creating a release\n" - curl -X POST -H "Authorization: token ${GH_TOKEN}" \ - -d '{"tag_name": "latest-master", "target_commitish": "master", "name": "master-'${TRAVIS_BUILD_NUMBER}'", "body": "Automatic release based on latest commit to master branch generated by Travis CI", "draft": false, "prerelease": true}' "https://api.github.com/repos/WagicProject/wagic/releases" > json.txt - IDDI=`cat json.txt | jq '.id'` - - echo -e "Uploading Core resources\n" - curl -X POST -H "Authorization: token ${GH_TOKEN}" \ - -H "Accept: application/vnd.github.manifold-preview" \ - -H "Content-Type: application/zip" \ - --data-binary @core.zip \ - "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-core.zip" - - echo -e "Uploading android package\n" - curl -X POST -H "Authorization: token ${GH_TOKEN}" \ - -H "Accept: application/vnd.github.manifold-preview" \ - -H "Content-Type: application/zip" \ - --data-binary @projects/mtg/Android/bin/Wagic-debug.apk \ - "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-android.apk" - - echo -e "Uploading PSP package\n" - curl -X POST -H "Authorization: token ${GH_TOKEN}" \ - -H "Accept: application/vnd.github.manifold-preview" \ - -H "Content-Type: application/zip" \ - --data-binary @projects/mtg/psprelease.zip \ - "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-psp.zip" - -# echo -e "Uploading Windows package\n" -# curl -X POST -H "Authorization: token ${GH_TOKEN}" \ -# -H "Accept: application/vnd.github.manifold-preview" \ -# -H "Content-Type: application/zip" \ -# --data-binary @build/win-cross/win-cross.zip \ -# "https://uploads.github.com/repos/WagicProject/wagic/releases/${IDDI}/assets?name=Wagic-windows.zip" - - echo -e "Done uploading\n" -fi -fi From e78754bcd53ab8fce63a4fcb30938c5648095cdc Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 7 Dec 2014 16:24:39 +0100 Subject: [PATCH 04/34] Fixed mac script call --- tools/travis-script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/travis-script.sh b/tools/travis-script.sh index 73b03e457..2bb494bdd 100755 --- a/tools/travis-script.sh +++ b/tools/travis-script.sh @@ -78,4 +78,4 @@ cd projects/mtg cd ../.. # Let's launch de Mac cross-compilation -./build-macos-script.sh +./tools/build-macos-script.sh From 02efa4745f778050a30ccf23f9734280a62b0266 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 7 Dec 2014 16:39:15 +0100 Subject: [PATCH 05/34] Fixed access to mac script and added mac branch to the list of branch authorized to upload binaries --- tools/build-macos-script.sh | 0 tools/upload-binaries.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 tools/build-macos-script.sh diff --git a/tools/build-macos-script.sh b/tools/build-macos-script.sh old mode 100644 new mode 100755 diff --git a/tools/upload-binaries.py b/tools/upload-binaries.py index dc2238b05..d09c651a6 100644 --- a/tools/upload-binaries.py +++ b/tools/upload-binaries.py @@ -49,7 +49,7 @@ def main(): (options, args) = parser.parse_args() - if (options.token and options.sha and options.local and options.remote and options.branch == 'master'): + if (options.token and options.sha and options.local and options.remote and (options.branch == 'master' or options.branch == 'travis_mac_osx')): gh = login(token = options.token) else: parser.print_help() From 6a37425a380112f231def9ac28fbeb4f52eedb6a Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 7 Dec 2014 16:48:57 +0100 Subject: [PATCH 06/34] Changed number of processes to 4 --- tools/travis-script.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/travis-script.sh b/tools/travis-script.sh index 2bb494bdd..b83388226 100755 --- a/tools/travis-script.sh +++ b/tools/travis-script.sh @@ -36,11 +36,11 @@ cd ../../../.. # we're building a PSP binary here cd JGE -make -j 8 +make -j 4 cd .. cd projects/mtg mkdir objs -make -j 8 +make -j 4 mkdir WTH mkdir WTH/Res mv EBOOT.PBP WTH/ @@ -56,7 +56,7 @@ zip psprelease.zip -r WTH/ cd ../.. # we're building an Android binary here -android-ndk-r9/ndk-build -C projects/mtg/Android -j8 +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 @@ -65,12 +65,12 @@ ant debug -f projects/mtg/Android/build.xml mkdir qt-gui-build cd qt-gui-build $QMAKE ../projects/mtg/wagic-qt.pro CONFIG+=release CONFIG+=graphics -make -j 8 +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 8 +make -j 4 # Now we run the testsuite (Res needs to be in the working directory) cd projects/mtg From dbe1c6e2aee08d0f5f75a84aabd5fe4cbe7b3cf5 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 7 Dec 2014 17:26:32 +0100 Subject: [PATCH 07/34] Moved mac travis file outside of script and update oauth token --- .travis.yml | 2 +- tools/build-macos-script.sh | 17 +---------------- tools/macos.travis.yml | 12 ++++++++++++ 3 files changed, 14 insertions(+), 17 deletions(-) create mode 100644 tools/macos.travis.yml diff --git a/.travis.yml b/.travis.yml index 73f3ec230..3daf0f480 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ install: env: global: - secure: "fJgWlCFbde96OSQNGKUmowGX+ERPeqP+n1EOMf1+FJzOU4DdkTLRAlV5+5qnEX9jB/3mWN6iPpmG1qEz/SdDG3KHxJYs4ZU/Lu485O24zZ/+GdYBNsrvhPD9ckPGEMLDa1foEVTDnW0Dlkz3BCFcszjhtXGUJv7v6Pj6LRk1Mg8=" + secure: "gTRPB+QAFO+OgIMSonYIMq5yhyvMib20DaeMrueqDsQatXdoJHhmncV1m2Kqiwh2o7esZPVTKo2PcvLyWOqtFS6Jt/AX7TzEqj4yehgD4xr6stpaKkTkKgtd2UR29CJPASWJHXzavnm8d57ZNq5iEu0YhwdlKeu1/Koe3QoU5SM=" script: "tools/travis-script.sh" diff --git a/tools/build-macos-script.sh b/tools/build-macos-script.sh index c7cc35fee..4e4284eb2 100755 --- a/tools/build-macos-script.sh +++ b/tools/build-macos-script.sh @@ -3,21 +3,6 @@ ## New of branch to use TRAVIS_MAC_BRANCH=travis_mac_osx -## New Travis-CI configuration, adapted for Mac-OS -NEW_TRAVIS_YML=\ -"language: objective-c -before_install: -- brew update -- brew install qt5 -env: - global: - secure: "fJgWlCFbde96OSQNGKUmowGX+ERPeqP+n1EOMf1+FJzOU4DdkTLRAlV5+5qnEX9jB/3mWN6iPpmG1qEz/SdDG3KHxJYs4ZU/Lu485O24zZ/+GdYBNsrvhPD9ckPGEMLDa1foEVTDnW0Dlkz3BCFcszjhtXGUJv7v6Pj6LRk1Mg8=" -script: -- /usr/local/opt/qt5/bin/qmake projects/mtg/wagic-qt.pro CONFIG+=graphics -- make -j 4 dmg -after_success: -- python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l wagic.dmg -r Wagic-macosx.dmg -b $TRAVIS_BRANCH" - ## Only cross-compile on Mac the master branch test "$TRAVIS_BRANCH" != "master" && exit 0 @@ -38,7 +23,7 @@ fi git checkout -q -b "$TRAVIS_MAC_BRANCH" "$TRAVIS_BRANCH" ## Write a new Travis-CI configuration file -echo "$NEW_TRAVIS_YML" > .travis.yml +cp tools/mac.travis.yml .travis.yml git add .travis.yml git rm appveyor.yml git commit -m "Auto-Updated Travis-CI configuration for Mac" diff --git a/tools/macos.travis.yml b/tools/macos.travis.yml new file mode 100644 index 000000000..caa7c5612 --- /dev/null +++ b/tools/macos.travis.yml @@ -0,0 +1,12 @@ +language: objective-c +before_install: +- brew update +- brew install qt5 +env: + global: + secure: "gTRPB+QAFO+OgIMSonYIMq5yhyvMib20DaeMrueqDsQatXdoJHhmncV1m2Kqiwh2o7esZPVTKo2PcvLyWOqtFS6Jt/AX7TzEqj4yehgD4xr6stpaKkTkKgtd2UR29CJPASWJHXzavnm8d57ZNq5iEu0YhwdlKeu1/Koe3QoU5SM=" +script: +- /usr/local/opt/qt5/bin/qmake projects/mtg/wagic-qt.pro CONFIG+=graphics +- make -j 4 dmg +after_success: +- python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l wagic.dmg -r Wagic-macosx.dmg -b $TRAVIS_BRANCH From 1f772438817b7bc2779742670810b56cbc05f405 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 7 Dec 2014 19:48:53 +0100 Subject: [PATCH 08/34] Fixed mac build script --- tools/build-macos-script.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/build-macos-script.sh b/tools/build-macos-script.sh index 4e4284eb2..ea25fda94 100755 --- a/tools/build-macos-script.sh +++ b/tools/build-macos-script.sh @@ -11,7 +11,7 @@ git config credential.helper "store --file=.git/credentials" echo "https://${GH_TOKEN}:@github.com" > .git/credentials ## Delete remote Travis-Mac branch (if any) -REMOTE=$(git branch -r | grep "origin/$TRAVIS_MAC_BRANCH\$") +export REMOTE=$(git branch -r | grep "origin/$TRAVIS_MAC_BRANCH\$") if test -n "$REMOTE" ; then # Delete remote branch git branch -r -D "origin/$TRAVIS_MAC_BRANCH" @@ -23,7 +23,7 @@ fi git checkout -q -b "$TRAVIS_MAC_BRANCH" "$TRAVIS_BRANCH" ## Write a new Travis-CI configuration file -cp tools/mac.travis.yml .travis.yml +cp tools/macos.travis.yml .travis.yml git add .travis.yml git rm appveyor.yml git commit -m "Auto-Updated Travis-CI configuration for Mac" From 51d5b166a61378546e61d6c72ad1d7e82c10d3a5 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 7 Dec 2014 20:29:27 +0100 Subject: [PATCH 09/34] Deactivated PSP build and refactored build conditions --- .travis.yml | 52 ++++++++++++++++--------- tools/travis-script.sh | 86 ++++++++++++++++++++++-------------------- 2 files changed, 81 insertions(+), 57 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3daf0f480..c5c2da709 100644 --- 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 diff --git a/tools/travis-script.sh b/tools/travis-script.sh index b83388226..965483d77 100755 --- 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 From 410108a005c9fc847387e5f6f672a6de72a98beb Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 7 Dec 2014 21:06:53 +0100 Subject: [PATCH 10/34] Added email and name to enable git commit --- .travis.yml | 4 +++- tools/build-macos-script.sh | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c5c2da709..cea404f1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,9 @@ install: env: global: - secure: "gTRPB+QAFO+OgIMSonYIMq5yhyvMib20DaeMrueqDsQatXdoJHhmncV1m2Kqiwh2o7esZPVTKo2PcvLyWOqtFS6Jt/AX7TzEqj4yehgD4xr6stpaKkTkKgtd2UR29CJPASWJHXzavnm8d57ZNq5iEu0YhwdlKeu1/Koe3QoU5SM=" + - secure: "gTRPB+QAFO+OgIMSonYIMq5yhyvMib20DaeMrueqDsQatXdoJHhmncV1m2Kqiwh2o7esZPVTKo2PcvLyWOqtFS6Jt/AX7TzEqj4yehgD4xr6stpaKkTkKgtd2UR29CJPASWJHXzavnm8d57ZNq5iEu0YhwdlKeu1/Koe3QoU5SM=" + - secure: "X5dTQfofqAutnXxmu11Ep2MQ5QYnMN8m0AITRtwymhEF2UclcOudI1+skPtuhAGbWQnSO+lhunV3cvMfw2/Ml3k/VDz6VdFSKFrzAu7ja1VLJfcxr7chi0s8q30pVBb66tGydjIBac3B+RQyqgmZQW1frbRrhC/kPFQ6wPWOJdQ=" + - secure: "T97NUPnxCpVZ/c5HH0zfo0FO3DPSRMSmze58ubW5EUTZOjAMtEt+OFdsrNZvUTCugUj2M1agtonZbAbczpaAL+lgZcHDgXgWMkfO0pMnsWX1yyCNqMuE/iTMpJr/xsLQeyWlftWjJLsseQU45abZsd1XVmda/G+ZhrDLF1y55SA=" script: "tools/travis-script.sh" diff --git a/tools/build-macos-script.sh b/tools/build-macos-script.sh index ea25fda94..7db95da22 100755 --- a/tools/build-macos-script.sh +++ b/tools/build-macos-script.sh @@ -9,6 +9,8 @@ test "$TRAVIS_BRANCH" != "master" && exit 0 ## Configure Git to use OAuth token git config credential.helper "store --file=.git/credentials" echo "https://${GH_TOKEN}:@github.com" > .git/credentials +git config --global user.name $GH_USER +git config --global user.email $GH_EMAIL ## Delete remote Travis-Mac branch (if any) export REMOTE=$(git branch -r | grep "origin/$TRAVIS_MAC_BRANCH\$") From 21a6da91ca95f401433474a7480de349ca7c7056 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 7 Dec 2014 21:48:50 +0100 Subject: [PATCH 11/34] Added git remote URL as HTTPS --- tools/build-macos-script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build-macos-script.sh b/tools/build-macos-script.sh index 7db95da22..bcee4fca9 100755 --- a/tools/build-macos-script.sh +++ b/tools/build-macos-script.sh @@ -29,6 +29,6 @@ cp tools/macos.travis.yml .travis.yml git add .travis.yml git rm appveyor.yml git commit -m "Auto-Updated Travis-CI configuration for Mac" - +git remote set-url origin "https://${GH_TOKEN}@github.com/WagicProject/wagic.git" ## Push new branch to remote server git push -q origin $TRAVIS_MAC_BRANCH:$TRAVIS_MAC_BRANCH From b56862fcf8b3dd93013b5079fddf97f9c8eebb12 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 7 Dec 2014 22:26:39 +0100 Subject: [PATCH 12/34] Added python dependencies, replaced token and removed "x" option in shell scripts --- .travis.yml | 2 +- tools/build-macos-script.sh | 2 +- tools/macos.travis.yml | 5 ++++- tools/travis-script.sh | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index cea404f1a..ec981e8e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ install: env: global: - - secure: "gTRPB+QAFO+OgIMSonYIMq5yhyvMib20DaeMrueqDsQatXdoJHhmncV1m2Kqiwh2o7esZPVTKo2PcvLyWOqtFS6Jt/AX7TzEqj4yehgD4xr6stpaKkTkKgtd2UR29CJPASWJHXzavnm8d57ZNq5iEu0YhwdlKeu1/Koe3QoU5SM=" + - secure: "Up4pCVf7nGErCqZQd+T1MZIPDQqpXqcA2nc3TL2CAKe8GaBjhseHL7nmk5gVxN3Pj4Hzun0QK8Nce91r+636C4iXR1MEGYZF+XVhDjd+yG5x4cyxBE/eAFzUYV1HEwB7jXPYFbYF4zGrQvrQc/eGYGxkZ4BXLnaMJLz19DwJo7U=" - secure: "X5dTQfofqAutnXxmu11Ep2MQ5QYnMN8m0AITRtwymhEF2UclcOudI1+skPtuhAGbWQnSO+lhunV3cvMfw2/Ml3k/VDz6VdFSKFrzAu7ja1VLJfcxr7chi0s8q30pVBb66tGydjIBac3B+RQyqgmZQW1frbRrhC/kPFQ6wPWOJdQ=" - secure: "T97NUPnxCpVZ/c5HH0zfo0FO3DPSRMSmze58ubW5EUTZOjAMtEt+OFdsrNZvUTCugUj2M1agtonZbAbczpaAL+lgZcHDgXgWMkfO0pMnsWX1yyCNqMuE/iTMpJr/xsLQeyWlftWjJLsseQU45abZsd1XVmda/G+ZhrDLF1y55SA=" diff --git a/tools/build-macos-script.sh b/tools/build-macos-script.sh index bcee4fca9..38bade926 100755 --- a/tools/build-macos-script.sh +++ b/tools/build-macos-script.sh @@ -1,4 +1,4 @@ -#!/bin/sh -ex +#!/bin/sh -e ## New of branch to use TRAVIS_MAC_BRANCH=travis_mac_osx diff --git a/tools/macos.travis.yml b/tools/macos.travis.yml index caa7c5612..ca724bd09 100644 --- a/tools/macos.travis.yml +++ b/tools/macos.travis.yml @@ -2,9 +2,12 @@ language: objective-c before_install: - brew update - brew install qt5 +- pip install pyjavaproperties +- pip install github3.py + env: global: - secure: "gTRPB+QAFO+OgIMSonYIMq5yhyvMib20DaeMrueqDsQatXdoJHhmncV1m2Kqiwh2o7esZPVTKo2PcvLyWOqtFS6Jt/AX7TzEqj4yehgD4xr6stpaKkTkKgtd2UR29CJPASWJHXzavnm8d57ZNq5iEu0YhwdlKeu1/Koe3QoU5SM=" + secure: "Up4pCVf7nGErCqZQd+T1MZIPDQqpXqcA2nc3TL2CAKe8GaBjhseHL7nmk5gVxN3Pj4Hzun0QK8Nce91r+636C4iXR1MEGYZF+XVhDjd+yG5x4cyxBE/eAFzUYV1HEwB7jXPYFbYF4zGrQvrQc/eGYGxkZ4BXLnaMJLz19DwJo7U=" script: - /usr/local/opt/qt5/bin/qmake projects/mtg/wagic-qt.pro CONFIG+=graphics - make -j 4 dmg diff --git a/tools/travis-script.sh b/tools/travis-script.sh index 965483d77..01fa2ec0e 100755 --- a/tools/travis-script.sh +++ b/tools/travis-script.sh @@ -1,4 +1,4 @@ -#!/bin/sh -ex +#!/bin/sh -e # let's dump some info to debug a bit echo ls = `ls` From c451234bd5b858eb7a93ca85e20c647dab5368fc Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 7 Dec 2014 22:47:04 +0100 Subject: [PATCH 13/34] Moved definition of origin --- tools/build-macos-script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build-macos-script.sh b/tools/build-macos-script.sh index 38bade926..450879b73 100755 --- a/tools/build-macos-script.sh +++ b/tools/build-macos-script.sh @@ -11,6 +11,7 @@ git config credential.helper "store --file=.git/credentials" echo "https://${GH_TOKEN}:@github.com" > .git/credentials git config --global user.name $GH_USER git config --global user.email $GH_EMAIL +git remote set-url origin "https://${GH_TOKEN}@github.com/WagicProject/wagic.git" ## Delete remote Travis-Mac branch (if any) export REMOTE=$(git branch -r | grep "origin/$TRAVIS_MAC_BRANCH\$") @@ -29,6 +30,5 @@ cp tools/macos.travis.yml .travis.yml git add .travis.yml git rm appveyor.yml git commit -m "Auto-Updated Travis-CI configuration for Mac" -git remote set-url origin "https://${GH_TOKEN}@github.com/WagicProject/wagic.git" ## Push new branch to remote server git push -q origin $TRAVIS_MAC_BRANCH:$TRAVIS_MAC_BRANCH From 11eb6de57eb9feb8599405f26d28cb6293f16347 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 7 Dec 2014 23:33:46 +0100 Subject: [PATCH 14/34] Changed token and redirect push output --- .travis.yml | 2 +- tools/build-macos-script.sh | 2 +- tools/macos.travis.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ec981e8e2..91f4acf9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ install: env: global: - - secure: "Up4pCVf7nGErCqZQd+T1MZIPDQqpXqcA2nc3TL2CAKe8GaBjhseHL7nmk5gVxN3Pj4Hzun0QK8Nce91r+636C4iXR1MEGYZF+XVhDjd+yG5x4cyxBE/eAFzUYV1HEwB7jXPYFbYF4zGrQvrQc/eGYGxkZ4BXLnaMJLz19DwJo7U=" + - secure: "EBzr1+qjQsOhn0s+tcFmXR1jP9B0xiOSXuXbRXWZ1OEHNvp8+A5/pS84LYVFlaZqmxr5dApxvPtwhgLIUbQ3EPXm8LpC3KgSD4dS+9/QMbxhe5TK4oczgFRGcDTMJQZsCzhOh7hp3tbcbJg5Gp+VT7aFjFQSHDGwhzSJXsXwh/8=" - secure: "X5dTQfofqAutnXxmu11Ep2MQ5QYnMN8m0AITRtwymhEF2UclcOudI1+skPtuhAGbWQnSO+lhunV3cvMfw2/Ml3k/VDz6VdFSKFrzAu7ja1VLJfcxr7chi0s8q30pVBb66tGydjIBac3B+RQyqgmZQW1frbRrhC/kPFQ6wPWOJdQ=" - secure: "T97NUPnxCpVZ/c5HH0zfo0FO3DPSRMSmze58ubW5EUTZOjAMtEt+OFdsrNZvUTCugUj2M1agtonZbAbczpaAL+lgZcHDgXgWMkfO0pMnsWX1yyCNqMuE/iTMpJr/xsLQeyWlftWjJLsseQU45abZsd1XVmda/G+ZhrDLF1y55SA=" diff --git a/tools/build-macos-script.sh b/tools/build-macos-script.sh index 450879b73..41bf6ebd4 100755 --- a/tools/build-macos-script.sh +++ b/tools/build-macos-script.sh @@ -31,4 +31,4 @@ git add .travis.yml git rm appveyor.yml git commit -m "Auto-Updated Travis-CI configuration for Mac" ## Push new branch to remote server -git push -q origin $TRAVIS_MAC_BRANCH:$TRAVIS_MAC_BRANCH +git push -q origin $TRAVIS_MAC_BRANCH:$TRAVIS_MAC_BRANCH 2> /dev/null > /dev/null diff --git a/tools/macos.travis.yml b/tools/macos.travis.yml index ca724bd09..4126db67b 100644 --- a/tools/macos.travis.yml +++ b/tools/macos.travis.yml @@ -7,7 +7,7 @@ before_install: env: global: - secure: "Up4pCVf7nGErCqZQd+T1MZIPDQqpXqcA2nc3TL2CAKe8GaBjhseHL7nmk5gVxN3Pj4Hzun0QK8Nce91r+636C4iXR1MEGYZF+XVhDjd+yG5x4cyxBE/eAFzUYV1HEwB7jXPYFbYF4zGrQvrQc/eGYGxkZ4BXLnaMJLz19DwJo7U=" + secure: "EBzr1+qjQsOhn0s+tcFmXR1jP9B0xiOSXuXbRXWZ1OEHNvp8+A5/pS84LYVFlaZqmxr5dApxvPtwhgLIUbQ3EPXm8LpC3KgSD4dS+9/QMbxhe5TK4oczgFRGcDTMJQZsCzhOh7hp3tbcbJg5Gp+VT7aFjFQSHDGwhzSJXsXwh/8=" script: - /usr/local/opt/qt5/bin/qmake projects/mtg/wagic-qt.pro CONFIG+=graphics - make -j 4 dmg From c8b0ce9669607ae75f87e1a6db05a78c0242821e Mon Sep 17 00:00:00 2001 From: xawotihs Date: Mon, 8 Dec 2014 00:10:48 +0100 Subject: [PATCH 15/34] added sudo to install python packages on macosx --- tools/macos.travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/macos.travis.yml b/tools/macos.travis.yml index 4126db67b..3858e7193 100644 --- a/tools/macos.travis.yml +++ b/tools/macos.travis.yml @@ -2,8 +2,8 @@ language: objective-c before_install: - brew update - brew install qt5 -- pip install pyjavaproperties -- pip install github3.py +- sudo pip install pyjavaproperties +- sudo pip install github3.py env: global: From 2041aa45f06f7e3a52e3369eb7baa2f74a07ad3f Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Mon, 8 Dec 2014 20:52:04 +0100 Subject: [PATCH 16/34] Reactivated PSP build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 91f4acf9d..d08eaea03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ branches: - latest-master before_install: -# - export BUILD_PSP=YES + - export BUILD_PSP=YES - export BUILD_ANDROID=YES - export BUILD_Qt=YES - export BUILD_MAC=YES From 78ad22479c21996b9b2182c81cddfe84dfb1704a Mon Sep 17 00:00:00 2001 From: xawotihs Date: Tue, 9 Dec 2014 22:18:51 +0100 Subject: [PATCH 17/34] Added changelog file --- CHANGELOG.md | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..91fea9937 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,80 @@ +# Changelog + +## [latest-master] (https://github.com/WagicProject/wagic/tree/latest-master) +#### 08/12/14 +- *Merged pull-request:* Fix for guild_keywords Devotion, added some "Chroma" cards [\#606](https://github.com/WagicProject/wagic/pull/606) ([kevlahnota](https://github.com/kevlahnota)) + +- *Merged pull-request:* added guild keywords, added specific life cost [\#605](https://github.com/WagicProject/wagic/pull/605) ([kevlahnota](https://github.com/kevlahnota)) + +- *Merged pull-request:* Buyback issue and a fix [\#604](https://github.com/WagicProject/wagic/pull/604) ([apollovy](https://github.com/apollovy)) + +- *Merged pull-request:* Feature/ios update xcode5.1 [\#602](https://github.com/WagicProject/wagic/pull/602) ([mjnguyen](https://github.com/mjnguyen)) + +- *Merged pull-request:* Remove dead code and fix circular initialization [\#601](https://github.com/WagicProject/wagic/pull/601) ([ZobyTwo](https://github.com/ZobyTwo)) + +- *Merged pull-request:* update android build tools version [\#600](https://github.com/WagicProject/wagic/pull/600) ([Rolzad73](https://github.com/Rolzad73)) + +- *Merged pull-request:* Attempt to make android tools fetching for TravisCI explicit and futureproof [\#599](https://github.com/WagicProject/wagic/pull/599) ([Rolzad73](https://github.com/Rolzad73)) + +- *Merged pull-request:* Damager keyword [\#598](https://github.com/WagicProject/wagic/pull/598) ([bjornsnoen](https://github.com/bjornsnoen)) + +- *Merged pull-request:* Fix a rarity mistake and a grammatical error [\#596](https://github.com/WagicProject/wagic/pull/596) ([bjornsnoen](https://github.com/bjornsnoen)) + +- *Merged pull-request:* Fix bug where the phase wheel got out of sync [\#588](https://github.com/WagicProject/wagic/pull/588) ([ZobyTwo](https://github.com/ZobyTwo)) + +- *Merged pull-request:* More easing [\#586](https://github.com/WagicProject/wagic/pull/586) ([ZobyTwo](https://github.com/ZobyTwo)) + +- *Merged pull-request:* Added Avatar Tokens created by Ajani Goldmane. [\#585](https://github.com/WagicProject/wagic/pull/585) ([bjornsnoen](https://github.com/bjornsnoen)) + +- *Merged pull-request:* Cleanup, usability fixes and source code documentation for DeckView.h and GridDeckView.h [\#583](https://github.com/WagicProject/wagic/pull/583) ([ZobyTwo](https://github.com/ZobyTwo)) + +- *Fixed bug:* Blight does not destroy at the end of turn but right now [\#592](https://github.com/WagicProject/wagic/issues/592) + +- *Fixed bug:* game freezes on Android when the phone returns from "sleep mode" [\#544](https://github.com/WagicProject/wagic/issues/544) + +- *Fixed bug:* Android port needs to be able to respond to attaching/detaching devices to it [\#522](https://github.com/WagicProject/wagic/issues/522) + +## [alpha-195] (https://github.com/WagicProject/wagic/tree/alpha-195) +#### 07/12/13 +- *Merged pull-request:* Reset positions and filters when reopening the editor [\#578](https://github.com/WagicProject/wagic/pull/578) ([ZobyTwo](https://github.com/ZobyTwo)) + +- *Merged pull-request:* Deck viewer [\#577](https://github.com/WagicProject/wagic/pull/577) ([ZobyTwo](https://github.com/ZobyTwo)) + +- *Merged pull-request:* Do not specify the system directory in JGE [\#576](https://github.com/WagicProject/wagic/pull/576) ([ZobyTwo](https://github.com/ZobyTwo)) + +- *Merged pull-request:* Changed Travis build file to use Android API 10 and Android build tools 18.1.1 [\#575](https://github.com/WagicProject/wagic/pull/575) ([Rolzad73](https://github.com/Rolzad73)) + +- *Merged pull-request:* Feature/play from grave [\#574](https://github.com/WagicProject/wagic/pull/574) ([pankdm](https://github.com/pankdm)) + +- *Merged pull-request:* Fix Valgrind warnings appearing during the test suit. [\#573](https://github.com/WagicProject/wagic/pull/573) ([ZobyTwo](https://github.com/ZobyTwo)) + +- *Merged pull-request:* Strings 2 [\#572](https://github.com/WagicProject/wagic/pull/572) ([ZobyTwo](https://github.com/ZobyTwo)) + +- *Merged pull-request:* Android travis ci [\#570](https://github.com/WagicProject/wagic/pull/570) ([xawotihs](https://github.com/xawotihs)) + +- *Merged pull-request:* Android NDK build fix [\#569](https://github.com/WagicProject/wagic/pull/569) ([Rolzad73](https://github.com/Rolzad73)) + +- *Merged pull-request:* Add a few namespaces and fix header guards. [\#564](https://github.com/WagicProject/wagic/pull/564) ([ZobyTwo](https://github.com/ZobyTwo)) + +- *Merged pull-request:* Updated deckmenu.cpp to properly render deck description and summary [\#562](https://github.com/WagicProject/wagic/pull/562) ([citiral](https://github.com/citiral)) + +- *Merged pull-request:* Fix some valgrind memcheck warnings. However there remains one... [\#561](https://github.com/WagicProject/wagic/pull/561) ([ZobyTwo](https://github.com/ZobyTwo)) + +- *Merged pull-request:* Remove some dead code [\#560](https://github.com/WagicProject/wagic/pull/560) ([ZobyTwo](https://github.com/ZobyTwo)) + +- *Merged pull-request:* Show output only for failing tests [\#559](https://github.com/WagicProject/wagic/pull/559) ([pankdm](https://github.com/pankdm)) + +- *Merged pull-request:* Defines/Typos [\#557](https://github.com/WagicProject/wagic/pull/557) ([ZobyTwo](https://github.com/ZobyTwo)) + +- *Merged pull-request:* Simplify Damage::resolve a bit [\#556](https://github.com/WagicProject/wagic/pull/556) ([ZobyTwo](https://github.com/ZobyTwo)) + +- *Merged pull-request:* Fix cranial plating [\#555](https://github.com/WagicProject/wagic/pull/555) ([pankdm](https://github.com/pankdm)) + +- *Merged pull-request:* Android cleanup [\#1](https://github.com/WagicProject/wagic/pull/1) ([Rolzad73](https://github.com/Rolzad73)) + +- *Fixed bug:* Iona and Nin don't work [\#527](https://github.com/WagicProject/wagic/issues/527) + +- *Closed issue:* Less verbose output of tests at Travis [\#558](https://github.com/WagicProject/wagic/issues/558) + +## [wagic-0.19.2] (https://github.com/WagicProject/wagic/tree/wagic-v0.19.2) +#### 28/10/13 From 8ee67b5af84e9a28dd8bae4cf88bff630b5983d3 Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sun, 21 Dec 2014 22:49:47 +0100 Subject: [PATCH 18/34] Adds coverage support --- .travis.yml | 2 ++ projects/mtg/wagic-qt.pro | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index d08eaea03..508aaa3dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,7 @@ install: fi - sudo pip install pyjavaproperties - sudo pip install github3.py +- sudo pip install cpp-coveralls env: global: @@ -53,6 +54,7 @@ env: script: "tools/travis-script.sh" after_success: +- coveralls - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l core.zip -r Wagic-core.zip -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/Android/bin/Wagic-debug.apk -r Wagic-android.apk -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/psprelease.zip -r Wagic-psp.zip -b $TRAVIS_BRANCH diff --git a/projects/mtg/wagic-qt.pro b/projects/mtg/wagic-qt.pro index d53f75fcd..2a11570d8 100644 --- a/projects/mtg/wagic-qt.pro +++ b/projects/mtg/wagic-qt.pro @@ -19,13 +19,12 @@ else:CONFIG(graphics, graphics|console){ DEPLOYMENTFOLDERS = folder_01 QT += core gui opengl network multimedia QT -= declarative quick qml - #maemo5:DEFINES += QT_WIDGET DEFINES += QT_WIDGET unix:!symbian:INCLUDEPATH += /usr/include/GL - # Please do not modify the following two lines. Required for deployment. -# !maemo5:include(qml/qmlapplicationviewer/qmlapplicationviewer.pri) -# !maemo5:qtcAddDeployment() + QMAKE_CXXFLAGS += -g -fprofile-arcs -ftest-coverage + QMAKE_LDFLAGS += -g -fprofile-arcs -ftest-coverage + LIBS += -lgcov } #!android:!symbian:QT += phonon From 9fc551982b327e2ee5e4a615fdf4b572e5ffc182 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Fri, 26 Dec 2014 21:23:11 +0100 Subject: [PATCH 19/34] Update .travis.yml Updated android sdk version --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 508aaa3dc..aeb3c6e93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_install: 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; + wget http://dl.google.com/android/android-sdk_r24.0.2-linux.tgz -nv; fi # Building for Qt here - if [ "$BUILD_Qt" == "YES" ]; then @@ -37,9 +37,9 @@ install: 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 && + tar -zxf android-sdk_r24.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; + echo yes | $ANDROID update sdk --filter tools,platform-tools,build-tools-21.1.2,android-10 --no-ui --force --no-https; fi - sudo pip install pyjavaproperties - sudo pip install github3.py From 4985323ad900166295ae07649f225118d467acb2 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 27 Dec 2014 01:29:58 +0100 Subject: [PATCH 20/34] Update .travis.yml Tweaked coveralls config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aeb3c6e93..b882ddf3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ env: script: "tools/travis-script.sh" after_success: -- coveralls +- coveralls -e /usr/include -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l core.zip -r Wagic-core.zip -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/Android/bin/Wagic-debug.apk -r Wagic-android.apk -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/psprelease.zip -r Wagic-psp.zip -b $TRAVIS_BRANCH From 24eab33b6d229abfc1edc956896c6ffdb4d80bbe Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 27 Dec 2014 02:07:38 +0100 Subject: [PATCH 21/34] Update .travis.yml updating coveralls options --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b882ddf3a..89df04c5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ env: script: "tools/travis-script.sh" after_success: -- coveralls -e /usr/include -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src +- coveralls -b qt-gui-build -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src --gcov-options '\-lp' - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l core.zip -r Wagic-core.zip -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/Android/bin/Wagic-debug.apk -r Wagic-android.apk -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/psprelease.zip -r Wagic-psp.zip -b $TRAVIS_BRANCH From 793c4d1d7d5654c5f6385eb4e5e0260a611d5819 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 27 Dec 2014 10:39:16 +0100 Subject: [PATCH 22/34] Update .travis.yml Added some traces --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 89df04c5b..722603ab4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,6 +54,7 @@ env: script: "tools/travis-script.sh" after_success: +- du -a - coveralls -b qt-gui-build -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src --gcov-options '\-lp' - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l core.zip -r Wagic-core.zip -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/Android/bin/Wagic-debug.apk -r Wagic-android.apk -b $TRAVIS_BRANCH From db922a0e773f36eb03631edbd98c56b3d573ce2c Mon Sep 17 00:00:00 2001 From: xawotihs Date: Sat, 27 Dec 2014 11:47:54 +0100 Subject: [PATCH 23/34] Activated perf logs with qt console config --- .travis.yml | 2 +- projects/mtg/wagic-qt.pro | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 722603ab4..896d5b5c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,7 @@ script: "tools/travis-script.sh" after_success: - du -a -- coveralls -b qt-gui-build -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src --gcov-options '\-lp' +- coveralls -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src --gcov-options '\-lp' - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l core.zip -r Wagic-core.zip -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/Android/bin/Wagic-debug.apk -r Wagic-android.apk -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/psprelease.zip -r Wagic-psp.zip -b $TRAVIS_BRANCH diff --git a/projects/mtg/wagic-qt.pro b/projects/mtg/wagic-qt.pro index 2a11570d8..1aec3a977 100644 --- a/projects/mtg/wagic-qt.pro +++ b/projects/mtg/wagic-qt.pro @@ -12,6 +12,10 @@ CONFIG(console, graphics|console){ CONFIG += console CONFIG -= app_bundle DEFINES += TESTSUITE + + QMAKE_CXXFLAGS += -g -fprofile-arcs -ftest-coverage + QMAKE_LDFLAGS += -g -fprofile-arcs -ftest-coverage + LIBS += -lgcov } else:CONFIG(graphics, graphics|console){ folder_01.source = qml/QmlWagic @@ -21,10 +25,6 @@ else:CONFIG(graphics, graphics|console){ QT -= declarative quick qml DEFINES += QT_WIDGET unix:!symbian:INCLUDEPATH += /usr/include/GL - - QMAKE_CXXFLAGS += -g -fprofile-arcs -ftest-coverage - QMAKE_LDFLAGS += -g -fprofile-arcs -ftest-coverage - LIBS += -lgcov } #!android:!symbian:QT += phonon From ddd59c489a5bfab612171dcafc68d8a37a1797c2 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 27 Dec 2014 12:17:03 +0100 Subject: [PATCH 24/34] Update .travis.yml trying to fix gcov root --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 896d5b5c6..11f9135ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,7 @@ script: "tools/travis-script.sh" after_success: - du -a -- coveralls -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src --gcov-options '\-lp' +- coveralls -b . -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src --gcov-options '\-lp' - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l core.zip -r Wagic-core.zip -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/Android/bin/Wagic-debug.apk -r Wagic-android.apk -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/psprelease.zip -r Wagic-psp.zip -b $TRAVIS_BRANCH From fcfab4c756445a2f47985acc9d0fdd403b93d66e Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 27 Dec 2014 13:43:38 +0100 Subject: [PATCH 25/34] Update .travis.yml Removed traces --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 11f9135ab..a34e11b85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,6 @@ env: script: "tools/travis-script.sh" after_success: -- du -a - coveralls -b . -e JGE/src -e JGE/include -i projects/mtg/include -i projects/mtg/src --gcov-options '\-lp' - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l core.zip -r Wagic-core.zip -b $TRAVIS_BRANCH - python tools/upload-binaries.py -t $GH_TOKEN -s $TRAVIS_COMMIT -l projects/mtg/Android/bin/Wagic-debug.apk -r Wagic-android.apk -b $TRAVIS_BRANCH From 8c2836b0c272e2eacf47c34d731baf51fcc82705 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Mon, 29 Dec 2014 15:04:00 +0100 Subject: [PATCH 26/34] Update README.md Added coverage status --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f3eea73d2..83459c59f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Build Status](https://travis-ci.org/WagicProject/wagic.png?branch=master)](https://travis-ci.org/WagicProject/wagic) [![Build status](https://ci.appveyor.com/api/projects/status/7j4fbr6m62aqej59/branch/master)](https://ci.appveyor.com/project/xawotihs/wagic/branch/master) - +[![Coverage Status](https://coveralls.io/repos/WagicProject/wagic/badge.png?branch=master)](https://coveralls.io/r/WagicProject/wagic?branch=master) ## Description From e664ecfaf5e2253de7168bda88a1cf2e64802994 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 11 Jul 2015 18:05:39 +0200 Subject: [PATCH 27/34] Update .travis.yml Updated android build tools to 22.0.1 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a34e11b85..579290338 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ install: tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 && tar -zxf android-sdk_r24.0.2-linux.tgz && $ANDROID list sdk --extended -a && - echo yes | $ANDROID update sdk --filter tools,platform-tools,build-tools-21.1.2,android-10 --no-ui --force --no-https; + echo yes | $ANDROID update sdk --filter tools,platform-tools,build-tools-22.0.1,android-10 --no-ui --force --no-https; fi - sudo pip install pyjavaproperties - sudo pip install github3.py From 38ed60bf6342171934f93b6dbf1c401468f55b56 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 11 Jul 2015 18:27:23 +0200 Subject: [PATCH 28/34] Update .travis.yml Add some \ to try fixing the script --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 579290338..79c833ea3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,10 @@ install: tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 && tar -zxf android-sdk_r24.0.2-linux.tgz && $ANDROID list sdk --extended -a && - echo yes | $ANDROID update sdk --filter tools,platform-tools,build-tools-22.0.1,android-10 --no-ui --force --no-https; + echo yes | $ANDROID update sdk --no-ui --force --no-https --filter \ + tools,\ + platform-tools,\ + build-tools-22.0.1,android-10; fi - sudo pip install pyjavaproperties - sudo pip install github3.py From 6a37b5e46188d1fb78f2cd2d7a03d6f65f304c15 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 11 Jul 2015 18:36:34 +0200 Subject: [PATCH 29/34] Update .travis.yml And a last one. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 79c833ea3..79952a243 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,8 @@ install: echo yes | $ANDROID update sdk --no-ui --force --no-https --filter \ tools,\ platform-tools,\ - build-tools-22.0.1,android-10; + build-tools-22.0.1,\ + android-10; fi - sudo pip install pyjavaproperties - sudo pip install github3.py From 2d02f97f7f274a155de335ee62989e2666c311dc Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 11 Jul 2015 18:51:11 +0200 Subject: [PATCH 30/34] Update .travis.yml Updated android SDK to 24.3.3 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 79952a243..a3a5639b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_install: 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_r24.0.2-linux.tgz -nv; + wget http://dl.google.com/android/android-sdk_r24.3.3-linux.tgz -nv; fi # Building for Qt here - if [ "$BUILD_Qt" == "YES" ]; then From 31b8ad248f6f7dd84cccb65b8d3e4fa223db3e08 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 11 Jul 2015 20:03:37 +0200 Subject: [PATCH 31/34] Update .travis.yml Fixed references to SDK package --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a3a5639b6..96c7037f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ install: fi - if [ "$BUILD_ANDROID" == "YES" ]; then tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 && - tar -zxf android-sdk_r24.0.2-linux.tgz && + tar -zxf android-sdk_r24.3.3-linux.tgz && $ANDROID list sdk --extended -a && echo yes | $ANDROID update sdk --no-ui --force --no-https --filter \ tools,\ From 80379ecde5a1bb48e17b54b31015daa3de0e95f4 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 11 Jul 2015 21:52:20 +0200 Subject: [PATCH 32/34] Update .travis.yml --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 96c7037f8..b8dccdb27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,11 +39,7 @@ install: tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 && tar -zxf android-sdk_r24.3.3-linux.tgz && $ANDROID list sdk --extended -a && - echo yes | $ANDROID update sdk --no-ui --force --no-https --filter \ - tools,\ - platform-tools,\ - build-tools-22.0.1,\ - android-10; + echo yes | $ANDROID update sdk --no-ui --force --no-https --filter tools,platform-tools,build-tools-22.0.1,android-10; fi - sudo pip install pyjavaproperties - sudo pip install github3.py From 85741540717b8a5b40f6831d63d74bd31f77ffcb Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Sat, 11 Jul 2015 21:58:30 +0200 Subject: [PATCH 33/34] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b8dccdb27..7c3c5011d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ install: tar --absolute-names -jxf android-ndk-r9-linux-x86_64.tar.bz2 && tar -zxf android-sdk_r24.3.3-linux.tgz && $ANDROID list sdk --extended -a && - echo yes | $ANDROID update sdk --no-ui --force --no-https --filter tools,platform-tools,build-tools-22.0.1,android-10; + echo yes | $ANDROID update sdk -a -t tools,platform-tools,build-tools-22.0.1,android-10 --no-ui --force --no-https; fi - sudo pip install pyjavaproperties - sudo pip install github3.py From d9561118bc3dcdae651ee507164ca1fd448266a2 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Mon, 20 Jul 2015 22:32:25 +0200 Subject: [PATCH 34/34] Update appveyor.yml Skip building macosx environment on windows --- appveyor.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 41490b4c9..f084c4475 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,6 +4,11 @@ # - All section names are case-sensitive. # - Section names should be unique on each level. +# branches to build +branches: + # blacklist + except: + - travis_mac_osx #---------------------------------# # environment configuration # #---------------------------------#