From 693bd4e9292cc5f7208ac0ea4cdc2429a7c2c511 Mon Sep 17 00:00:00 2001 From: flyinghead Date: Sun, 26 May 2019 21:10:27 +0200 Subject: [PATCH 01/22] Making things clear --- README.md | 190 +----------------------------------------------------- 1 file changed, 3 insertions(+), 187 deletions(-) diff --git a/README.md b/README.md index 07bb44e7b..9cfd2a948 100644 --- a/README.md +++ b/README.md @@ -1,191 +1,7 @@ -[![Snap Status](https://build.snapcraft.io/badge/reicast/reicast-emulator.svg)](https://build.snapcraft.io/user/reicast/reicast-emulator) - reicast =========== **reicast** is a multi-platform Sega Dreamcast emulator. -This is a developer-oriented resource, if you just want bins head over to http://reicast.com/ - -For development discussion, join [#reicast in freenode](https://webchat.freenode.net/?channels=reicast) - or stop by the [reicast Discord server](http://discord.gg/Hc6CF72) - -Rebranding/(hard)forks ----------------- -If you are interested into further porting/adapting/whatever, *please* do not fork off. -We hate that. **Really**. - -Let's try to keep everything under a single project :) - -Submitting Issues ----------------- -Please take a moment to search the open issues for one similar to yours and add your info to it. -If you cannot find a similar issue, click the 'New Issue' button and make sure to fill out the form. - -*Please Note:* -Duplicate issues may be closed with a link to the existing issue. -Bugs that do not include a form may be closed until it is filled out. - -Contributing ------------- -- For small/one-off fixes, a PR from a GitHub fork is alright. -- For longer term collaboration, we prefer to use namespaced branches in the form of `/` in the main repo. - -Before you work on something major, make sure to check the issue tracker to coordinate with other contributors, and open an issue to get feedback before doing big changes/PRs. It is always polite to check the history of the code you're working on and collaborate with the people that have worked on it. You can introduce yourself in [Meet the team](https://github.com/reicast/reicast-emulator/issues/1113). - -Everything goes to master via PRs. Test builds are run automatically for both internal and external PRs, and generally should pass unless there's a really good reason for breakage. You might want to check our [CLA](https://gist.github.com/skmp/920357e9d3a7733234ade1eb465367cc), which is required to have your changes merged. - -If you are looking for somewhere to start, look for issues marked [good first issue](https://github.com/reicast/reicast-emulator/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) or [help wanted](https://github.com/reicast/reicast-emulator/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22) - -Supporting the project / donations -------------------- -Well, glad you liked the project so far! We want to switch to a "donation-driven-development" model so that we are not forced to pay out of out pockets for the project costs, and so that contributors can have a source of income to cover food and housing costs. - -We accept monetary donations via bountysource at https://salt.bountysource.com/teams/reicast or IBAN transfers to `CH65 0070 0110 0052 6460 1, Stefanos Kornilios Mitsis Poiitidis, 8005 Zürich`. Please note that IBAN donations will appear as `Anonymous` for now. - -You can also directly add bounties to tickets that are of interest to you at https://www.bountysource.com/teams/reicast, though supporting the project via a small monthly donation is preffered. Every $5 helps. - -We will use the donations to cover administrative and hosting costs (~$100/mo), buy hardware and to sponsor development & testing. - -If you want to do hardware or other non-monetary donations, please contact donations@reicast.com. - -Please help us to make this project self-sustainable. -Thank you for your support! - -Notable Donors --------------- -- Twinaphex / RetroArch Team - introduced us to bountysource, has sponsored the development of a few tickets -- anothername99 - First bounty not posted by RA -- Raco Centrente - First donation from a 3rd party -- (And, of course, all the people that have worked pro-bono over the past 20 years. That is priceless. Thank you!) - -Building for Android --------------------- -Tools required: -* Latest Android SDK - - http://developer.android.com/sdk/index.html -* NDK r8b or newer - - https://developer.android.com/tools/sdk/ndk/index.html - - If are not using r9c+, comment the "NDK_TOOLCHAIN_VERSION := 4.8" in shell/android/jni/Application.mk and shell/android/xperia/jni/Application.mk -* Android 5.0.1 (API 21) & Android 2.3.1 (API 9) - - http://developer.android.com/sdk/installing/adding-packages.html - - note that API 9 is hidden (you must check to show obsolete in SDK manager) -* Ant - - http://ant.apache.org/ - -From project root directory: -``` -export ANDROID_NDK=/ # Type the full path to your NDK here - -cd shell/android/ - -android update project -p . --target "android-21" - -ant debug -``` - -Building for iOS / MacOS ---- -Requirements: - -[Latest Xcode](https://developer.apple.com/xcode/downloads/) - -* [iOSOpenDev](http://iosopendev.com/download/) if developing without an official Apple certificate - - -| iOS | Mac | -| -------------- | ---------------------- | -| An iOS device | A Mac | -| iOS 5.x ~ 7.x | macOS 10.13.3 (17D102) | - -From project root directory: - -| iOS | Mac | -| --------------- | ----------------------------- | -| `cd shell/ios/` | `cd shell/apple/emulator-osx` | - -`xcodebuild -configuration Release` - -Or open the .xcodeproj in Xcode and hit "Build". - -Building for Linux ------------------- -### Using traditional make -- Requirements: - * build-essential - * libasound2 - * libegl1-mesa-dev - * libgles2-mesa-dev - * libasound2-dev - * mesa-common-dev - * libgl1-mesa-dev - -- From project root directory: -``` -cd shell/linux - -make -``` - -### Using snap -- Refer to our [snap README](https://github.com/reicast/reicast-emulator/tree/master/snap/README.md) - -Translations ------------- -New and updated translations are always appreciated! -All we ask is that you not use “regional” phrases that may not be generally understood. - -Translations can be submitted as a pull request - - -Development/Beta versions -------------- -| Platform | Status | Downloads -| -------------------------------------------------- | -------------- | --------- -| ![Android](http://i.imgur.com/nK9exQe.jpg) Android | [![Build Status](https://travis-ci.org/reicast/reicast-emulator.svg?branch=master)](https://travis-ci.org/reicast/reicast-emulator) | [Reicast CI Builds](http://builds.reicast.com) -| ![iOS](http://i.imgur.com/6bvAUUj.png) iOS | [![Build Status](https://app.bitrise.io/app/d082ed2fb1bdeeef.svg?token=39zhSBFh-b9YVJw8q91omw)](https://app.bitrise.io/app/d082ed2fb1bdeeef#/builds) | *TODO* -| ![Windows](http://i.imgur.com/hAuMmjF.png) Windows | [![Build status](https://ci.appveyor.com/api/projects/status/353mwl73ki74tb58/branch/master?svg=true)](https://ci.appveyor.com/project/skmp/reicast-emulator/branch/master) | [Reicast CI Builds](http://builds.reicast.com) -| ![Linux](http://i.imgur.com/19aAoQD.png) Linux | [![wercker status](https://app.wercker.com/status/bcabca642a2de044c6f58203b975878b/s/master "wercker status")](https://app.wercker.com/project/bykey/bcabca642a2de044c6f58203b975878b) | *TODO* -| ![OSX](http://i.imgur.com/0YoI5Vm.png) OSX | *TODO* | *TODO* - - -Additional builds (iOS & android) can be found at [angelxwind's](http://reicast.angelxwind.net/) buildbot and [Random Stuff "Daily/Nightly/Testing" PPA](https://launchpad.net/~random-stuff/+archive/ubuntu/ppa) (for Ubuntu). - - -Other Testing -------------- -Devices tested by the reicast team: -* Apple iPhone 4 GSM Rev0 (N90AP) -* Apple iPhone 4 CDMA (N92AP) -* Apple iPod touch 4 (N81AP) -* Apple iPod touch 3G (N18AP) -* Apple iPhone 3GS (N88AP) -* Apple iPhone 5s -* Apple iPad 3 -* Sony Xperia X10a (es209ra) -* Amazon Kindle Fire HD 7 (tate-pvt-08) -* Nvidia Shield portable -* Nvidia Shield tablet -* Samsung Galaxy Note 4 -* LG Nexus 5 -* LG Nexus 5X -* Asus Nexus 7 (2013) - - -Team ----- - -You can check the currently active committers on [the pretty graphs page](https://github.com/reicast/reicast-emulator/graphs/contributors) - -Our IRC channel is [#reicast @ chat.freenode.net](irc://chat.freenode.net/reicast). - -The original reicast team consisted of drk||Raziel (mostly just writing code), -PsyMan (debugging/testing and everything else) and a little bit of gb_away - -Special thanks --------------- -In previous iterations a lot of people have worked on this, notably David -Miller (aka, ZeZu), the nullDC team, friends from #pcsx2 and all over the world :) - -[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/reicast/reicast-emulator/trend.png)](https://bitdeli.com/free "Bitdeli Badge") - - +Disclaimer +========== +All code contritbuted to this fork is *not* bound by the Individual Contributor License Agreement of the upstream repository (https://github.com/reicast/reicast-emulator) and shall *not* be considered a contribution to the upstream repository. From b5ff01baf42bd13d2a5533a06e1b96993585f90b Mon Sep 17 00:00:00 2001 From: flyinghead Date: Sun, 26 May 2019 21:13:23 +0200 Subject: [PATCH 02/22] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9cfd2a948..c4c6e648b 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,4 @@ reicast Disclaimer ========== -All code contritbuted to this fork is *not* bound by the Individual Contributor License Agreement of the upstream repository (https://github.com/reicast/reicast-emulator) and shall *not* be considered a contribution to the upstream repository. +All code contritbuted to this fork is *not* bound by the Individual Contributor License Agreement of the upstream repository (https://github.com/reicast/reicast-emulator) and shall *not* be considered as a contribution to the upstream repository. From 4f9a22cb269a4c79302d733d0540e3c886534843 Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Wed, 29 May 2019 19:04:53 +0200 Subject: [PATCH 03/22] travis: deploy to S3 --- .travis.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0be3fa93a..b464034df 100755 --- a/.travis.yml +++ b/.travis.yml @@ -42,3 +42,21 @@ script: - export NUMBER_OF_PROCESSORS=2 - sudo chmod 755 travis-build.sh - "./travis-build.sh" +before_deploy: +- cd ../../ +- mkdir -p artifacts/$GIT_BUILD/ +- cp shell/android-studio/reicast/build/outputs/apk/dreamcast/debug/reicast-dreamcast-debug.apk artifacts/$GIT_BUILD/reicast-debug-$GIT_HASH.apk +- cp shell/android-studio/reicast/build/outputs/apk/naomi/debug/reicast-naomi-debug.apk artifacts/$GIT_BUILD/reicast-naomi-debug-$GIT_HASH.apk +deploy: + provider: s3 + access_key_id: AKIAJOZQS4H2PHQWYFCA + secret_access_key: + secure: $S3_SECRET_KEY + bucket: flycast-builds + local-dir: artifacts + upload-dir: android + skip_cleanup: true + on: + all_branches: true +repo: flyinghead/reicast-emulator + From 0ec1584806d036fa98b2df6dee75e2cb49dc4da8 Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Wed, 29 May 2019 19:41:42 +0200 Subject: [PATCH 04/22] bitrise: deploy to S3 --- bitrise.yml | 73 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 24 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index e29fae404..922e2cbb0 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -19,30 +19,11 @@ workflows: - git-clone@4.0.14: {} - cache-pull@2.0.1: {} - script@1.1.5: - title: Do anything with Script step - - certificate-and-profile-installer@1.10.1: {} - - recreate-user-schemes@1.0.2: inputs: - - project_path: "$BITRISE_PROJECT_PATH" - - xcode-archive-mac@1.6.2: - inputs: - - project_path: "$BITRISE_PROJECT_PATH" - - scheme: "$BITRISE_SCHEME" - - export_method: "$BITRISE_EXPORT_METHOD" - - deploy-to-bitrise-io@1.3.19: {} - - cache-push@2.1.1: {} - deploy: - envs: - - opts: - is_expand: false - BITRISE_SCHEME: reicast-osx - steps: - - activate-ssh-key@4.0.3: - run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}' - - git-clone@4.0.14: {} - - cache-pull@2.0.1: {} - - script@1.1.5: - title: Do anything with Script step + - content: | + #!/bin/bash + envman add --key GIT_HASH=`git log --pretty=format:'%h' -n 1` + envman add --key GIT_BUILD --value `git describe --all --always`-$GIT_HASH - certificate-and-profile-installer@1.10.1: {} - recreate-user-schemes@1.0.2: inputs: @@ -55,7 +36,51 @@ workflows: - deploy-to-bitrise-io@1.3.19: {} - cache-push@2.1.1: {} after_run: - - deploy-naomi + steps: + - amazon-s3-uploader@1.0.1: + inputs: + - aws_access_key: AKIAJOZQS4H2PHQWYFCA + - aws_secret_key: "$S3_SECRET_KEY" + - bucket_name: flycast-builds + - path_in_bucket: osx/$GIT_BUILD + - file_path: "$BITRISE_EXPORTED_FILE_PATH" + deploy: + envs: + - opts: + is_expand: false + BITRISE_SCHEME: reicast-osx + steps: + - activate-ssh-key@4.0.3: + run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}' + - git-clone@4.0.14: {} + - cache-pull@2.0.1: {} + - script@1.1.5: + inputs: + - content: | + #!/bin/bash + envman add --key GIT_HASH=`git log --pretty=format:'%h' -n 1` + envman add --key GIT_BUILD --value `git describe --all --always`-$GIT_HASH + - certificate-and-profile-installer@1.10.1: {} + - recreate-user-schemes@1.0.2: + inputs: + - project_path: "$BITRISE_PROJECT_PATH" + - xcode-archive-mac@1.6.2: + inputs: + - project_path: "$BITRISE_PROJECT_PATH" + - scheme: "$BITRISE_SCHEME" + - export_method: "$BITRISE_EXPORT_METHOD" + - deploy-to-bitrise-io@1.3.19: {} + - cache-push@2.1.1: {} + after_run: + steps: + - amazon-s3-uploader@1.0.1: + inputs: + - aws_access_key: AKIAJOZQS4H2PHQWYFCA + - aws_secret_key: "$S3_SECRET_KEY" + - bucket_name: flycast-builds + - path_in_bucket: osx/$GIT_BUILD + - file_path: "$BITRISE_EXPORTED_FILE_PATH" + - deploy-naomi app: envs: - opts: From 167be1f83005e64ce66ba9dd2fe3c11fbf3ff141 Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Wed, 29 May 2019 19:49:33 +0200 Subject: [PATCH 05/22] bitrise: tab to space --- bitrise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitrise.yml b/bitrise.yml index 922e2cbb0..438d1218b 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -22,7 +22,7 @@ workflows: inputs: - content: | #!/bin/bash - envman add --key GIT_HASH=`git log --pretty=format:'%h' -n 1` + envman add --key GIT_HASH=`git log --pretty=format:'%h' -n 1` envman add --key GIT_BUILD --value `git describe --all --always`-$GIT_HASH - certificate-and-profile-installer@1.10.1: {} - recreate-user-schemes@1.0.2: From 5279a00b56d24f9a4e3995bd041bff0be1b3bc0d Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Wed, 29 May 2019 19:50:31 +0200 Subject: [PATCH 06/22] bitrise: more tab to space --- bitrise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitrise.yml b/bitrise.yml index 438d1218b..3c29a5578 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -58,7 +58,7 @@ workflows: inputs: - content: | #!/bin/bash - envman add --key GIT_HASH=`git log --pretty=format:'%h' -n 1` + envman add --key GIT_HASH=`git log --pretty=format:'%h' -n 1` envman add --key GIT_BUILD --value `git describe --all --always`-$GIT_HASH - certificate-and-profile-installer@1.10.1: {} - recreate-user-schemes@1.0.2: From 10e3357e208495ae10eb6eb0ddc8de39623ed7fe Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Wed, 29 May 2019 20:01:43 +0200 Subject: [PATCH 07/22] bitrise: tentative fix --- bitrise.yml | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index 3c29a5578..17461137b 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -36,14 +36,13 @@ workflows: - deploy-to-bitrise-io@1.3.19: {} - cache-push@2.1.1: {} after_run: - steps: - - amazon-s3-uploader@1.0.1: - inputs: - - aws_access_key: AKIAJOZQS4H2PHQWYFCA - - aws_secret_key: "$S3_SECRET_KEY" - - bucket_name: flycast-builds - - path_in_bucket: osx/$GIT_BUILD - - file_path: "$BITRISE_EXPORTED_FILE_PATH" + - amazon-s3-uploader@1.0.1: + inputs: + - aws_access_key: AKIAJOZQS4H2PHQWYFCA + - aws_secret_key: "$S3_SECRET_KEY" + - bucket_name: flycast-builds + - path_in_bucket: osx/$GIT_BUILD + - file_path: "$BITRISE_EXPORTED_FILE_PATH" deploy: envs: - opts: @@ -72,15 +71,14 @@ workflows: - deploy-to-bitrise-io@1.3.19: {} - cache-push@2.1.1: {} after_run: - steps: - - amazon-s3-uploader@1.0.1: - inputs: - - aws_access_key: AKIAJOZQS4H2PHQWYFCA - - aws_secret_key: "$S3_SECRET_KEY" - - bucket_name: flycast-builds - - path_in_bucket: osx/$GIT_BUILD - - file_path: "$BITRISE_EXPORTED_FILE_PATH" - - deploy-naomi + - amazon-s3-uploader@1.0.1: + inputs: + - aws_access_key: AKIAJOZQS4H2PHQWYFCA + - aws_secret_key: "$S3_SECRET_KEY" + - bucket_name: flycast-builds + - path_in_bucket: osx/$GIT_BUILD + - file_path: "$BITRISE_EXPORTED_FILE_PATH" + - deploy-naomi app: envs: - opts: From fdd9370eb183dab33605734305d3345fe0f6fad3 Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Wed, 29 May 2019 20:05:12 +0200 Subject: [PATCH 08/22] bitrise: more annoyance --- bitrise.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index 17461137b..e4f026d93 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -33,9 +33,6 @@ workflows: - project_path: "$BITRISE_PROJECT_PATH" - scheme: "$BITRISE_SCHEME" - export_method: "$BITRISE_EXPORT_METHOD" - - deploy-to-bitrise-io@1.3.19: {} - - cache-push@2.1.1: {} - after_run: - amazon-s3-uploader@1.0.1: inputs: - aws_access_key: AKIAJOZQS4H2PHQWYFCA @@ -43,6 +40,7 @@ workflows: - bucket_name: flycast-builds - path_in_bucket: osx/$GIT_BUILD - file_path: "$BITRISE_EXPORTED_FILE_PATH" + - cache-push@2.1.1: {} deploy: envs: - opts: @@ -68,9 +66,6 @@ workflows: - project_path: "$BITRISE_PROJECT_PATH" - scheme: "$BITRISE_SCHEME" - export_method: "$BITRISE_EXPORT_METHOD" - - deploy-to-bitrise-io@1.3.19: {} - - cache-push@2.1.1: {} - after_run: - amazon-s3-uploader@1.0.1: inputs: - aws_access_key: AKIAJOZQS4H2PHQWYFCA @@ -78,6 +73,8 @@ workflows: - bucket_name: flycast-builds - path_in_bucket: osx/$GIT_BUILD - file_path: "$BITRISE_EXPORTED_FILE_PATH" + - cache-push@2.1.1: {} + after_run: - deploy-naomi app: envs: From 36c821da4980e4328582a66e55215eea62377aa4 Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Wed, 29 May 2019 20:07:47 +0200 Subject: [PATCH 09/22] bitrise: fix env vars --- bitrise.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index e4f026d93..85f81cb5e 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -22,7 +22,7 @@ workflows: inputs: - content: | #!/bin/bash - envman add --key GIT_HASH=`git log --pretty=format:'%h' -n 1` + envman add --key GIT_HASH --value `git log --pretty=format:'%h' -n 1` envman add --key GIT_BUILD --value `git describe --all --always`-$GIT_HASH - certificate-and-profile-installer@1.10.1: {} - recreate-user-schemes@1.0.2: @@ -55,7 +55,7 @@ workflows: inputs: - content: | #!/bin/bash - envman add --key GIT_HASH=`git log --pretty=format:'%h' -n 1` + envman add --key GIT_HASH --value `git log --pretty=format:'%h' -n 1` envman add --key GIT_BUILD --value `git describe --all --always`-$GIT_HASH - certificate-and-profile-installer@1.10.1: {} - recreate-user-schemes@1.0.2: From 447061c686cc71e553a06ca7676675fd47ac48cc Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Wed, 29 May 2019 21:00:01 +0200 Subject: [PATCH 10/22] bitrise: fix s3 path --- bitrise.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index 85f81cb5e..7c299664b 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -23,7 +23,7 @@ workflows: - content: | #!/bin/bash envman add --key GIT_HASH --value `git log --pretty=format:'%h' -n 1` - envman add --key GIT_BUILD --value `git describe --all --always`-$GIT_HASH + envman add --key GIT_BUILD --value `git describe --all --always | sed 's/remotes\/origin/heads/'`-$GIT_HASH - certificate-and-profile-installer@1.10.1: {} - recreate-user-schemes@1.0.2: inputs: @@ -56,7 +56,7 @@ workflows: - content: | #!/bin/bash envman add --key GIT_HASH --value `git log --pretty=format:'%h' -n 1` - envman add --key GIT_BUILD --value `git describe --all --always`-$GIT_HASH + envman add --key GIT_BUILD --value `git describe --all --always | sed 's/remotes\/origin/heads/'`-$GIT_HASH - certificate-and-profile-installer@1.10.1: {} - recreate-user-schemes@1.0.2: inputs: From c28bb7d7804bd6edf814e641e335a9cb49f9b1f0 Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Wed, 29 May 2019 21:14:34 +0200 Subject: [PATCH 11/22] appveyor: deploy to S3 bitrise: fix git hash in path --- appveyor.yml | 9 +++++++++ bitrise.yml | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index feb4e19bd..c2d9d8836 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -45,3 +45,12 @@ after_build: artifacts: - path: artifacts name: reicast-win_$(PLATFORM)-$(CONFIGURATION)-$(APPVEYOR_REPO_COMMIT) +deploy: +- provider: S3 + access_key_id: AKIAJOZQS4H2PHQWYFCA + secret_access_key: + secure: $S3_SECRET_KEY + bucket: flycast-builds + folder: 'builds/heads/$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT)' + artifact: reicast-win_$(PLATFORM)-$(CONFIGURATION)-$(APPVEYOR_REPO_COMMIT) +set_public: true diff --git a/bitrise.yml b/bitrise.yml index 7c299664b..23424a86b 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -22,7 +22,8 @@ workflows: inputs: - content: | #!/bin/bash - envman add --key GIT_HASH --value `git log --pretty=format:'%h' -n 1` + export GIT_HASH=`git log --pretty=format:'%h' -n 1` + envman add --key GIT_HASH --value $GIT_HASH envman add --key GIT_BUILD --value `git describe --all --always | sed 's/remotes\/origin/heads/'`-$GIT_HASH - certificate-and-profile-installer@1.10.1: {} - recreate-user-schemes@1.0.2: @@ -55,7 +56,8 @@ workflows: inputs: - content: | #!/bin/bash - envman add --key GIT_HASH --value `git log --pretty=format:'%h' -n 1` + export GIT_HASH=`git log --pretty=format:'%h' -n 1` + envman add --key GIT_HASH --value $GIT_HASH envman add --key GIT_BUILD --value `git describe --all --always | sed 's/remotes\/origin/heads/'`-$GIT_HASH - certificate-and-profile-installer@1.10.1: {} - recreate-user-schemes@1.0.2: From d2591c10226148023ac98005a2bc9833f70c337f Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Wed, 29 May 2019 21:16:09 +0200 Subject: [PATCH 12/22] appveyor: fix indentation --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index c2d9d8836..293028b9e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -53,4 +53,4 @@ deploy: bucket: flycast-builds folder: 'builds/heads/$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT)' artifact: reicast-win_$(PLATFORM)-$(CONFIGURATION)-$(APPVEYOR_REPO_COMMIT) -set_public: true + set_public: true From a7b123ffb6f153a3133bf1bf842f28eea7f8196b Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Wed, 29 May 2019 21:37:03 +0200 Subject: [PATCH 13/22] appveyor and bitrise fixes --- appveyor.yml | 3 +-- bitrise.yml | 7 ------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 293028b9e..505547ba2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -48,8 +48,7 @@ artifacts: deploy: - provider: S3 access_key_id: AKIAJOZQS4H2PHQWYFCA - secret_access_key: - secure: $S3_SECRET_KEY + secret_access_key: $S3_SECRET_KEY bucket: flycast-builds folder: 'builds/heads/$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT)' artifact: reicast-win_$(PLATFORM)-$(CONFIGURATION)-$(APPVEYOR_REPO_COMMIT) diff --git a/bitrise.yml b/bitrise.yml index 23424a86b..3caf3d189 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -18,13 +18,6 @@ workflows: run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}' - git-clone@4.0.14: {} - cache-pull@2.0.1: {} - - script@1.1.5: - inputs: - - content: | - #!/bin/bash - export GIT_HASH=`git log --pretty=format:'%h' -n 1` - envman add --key GIT_HASH --value $GIT_HASH - envman add --key GIT_BUILD --value `git describe --all --always | sed 's/remotes\/origin/heads/'`-$GIT_HASH - certificate-and-profile-installer@1.10.1: {} - recreate-user-schemes@1.0.2: inputs: From bad0f38ff5bc398a121c2e50594e59f3699bd72f Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Wed, 29 May 2019 21:49:00 +0200 Subject: [PATCH 14/22] appveyor: set S3 region --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 505547ba2..0e8f5edb4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -52,4 +52,5 @@ deploy: bucket: flycast-builds folder: 'builds/heads/$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT)' artifact: reicast-win_$(PLATFORM)-$(CONFIGURATION)-$(APPVEYOR_REPO_COMMIT) + region: us-east-2 set_public: true From 117b23a588916e4cc2f9c1db4fb7cff8ae250883 Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Thu, 30 May 2019 10:42:20 +0200 Subject: [PATCH 15/22] appveyor: fix S3 key --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 0e8f5edb4..a911e53c5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -48,7 +48,8 @@ artifacts: deploy: - provider: S3 access_key_id: AKIAJOZQS4H2PHQWYFCA - secret_access_key: $S3_SECRET_KEY + secret_access_key: + secure: Y/QobuGrBsa137sbi9a+UnvSLqpWITTCp5yFTgDJ4i1Gduyi9V7i/g3zLZ4s2J7d bucket: flycast-builds folder: 'builds/heads/$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT)' artifact: reicast-win_$(PLATFORM)-$(CONFIGURATION)-$(APPVEYOR_REPO_COMMIT) From 34f1a65ff0d8789a5874c8592b7172ba8c7fac7f Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Thu, 30 May 2019 11:03:01 +0200 Subject: [PATCH 16/22] appveyor: add naomi build --- appveyor.yml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a911e53c5..7fdf66d11 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,16 +3,14 @@ image: Visual Studio 2017 configuration: - fast -- RelWithDebInfo +- naomi platform: - x64 before_build: - cmd: >- - if "%CONFIGURATION%"=="RelWithDebInfo" (set BUILD_PATH=build) - - if "%CONFIGURATION%"=="fast" (set BUILD_PATH=shell\linux) + set BUILD_PATH=shell\linux set EXTRA_PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin\ @@ -20,27 +18,25 @@ before_build: if not exist %BUILD_PATH% (mkdir %BUILD_PATH%) - if "%CONFIGURATION%"=="RelWithDebInfo" (cmake -B %BUILD_PATH% -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES=RelWithDebInfo) - cd %BUILD_PATH% build_script: - cmd: >- - if "%CONFIGURATION%"=="RelWithDebInfo" (msbuild reicast.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll") - if "%CONFIGURATION%"=="fast" (mingw32-make platform=win32) + if "%CONFIGURATION%"=="naomi" (mingw32-make platform=win32 NAOMI=1) + after_build: - cmd: >- - if "%CONFIGURATION%"=="RelWithDebInfo" (cd .. && set EXE_PATH=build\RelWithDebInfo\reicast.exe) - if "%CONFIGURATION%"=="fast" (cd ..\.. && set EXE_PATH=shell\linux\nosym-reicast.exe) + if "%CONFIGURATION%"=="naomi" (cd ..\.. && set EXE_PATH=shell\linux\nosym-reicast.exe) + mkdir artifacts move %EXE_PATH% artifacts\reicast-win_%PLATFORM%-%CONFIGURATION%-%APPVEYOR_REPO_COMMIT%.exe - if "%CONFIGURATION%"=="fast" (copy %EXTRA_PATH%\libgcc_s_seh-1.dll artifacts && copy %EXTRA_PATH%\libwinpthread-1.dll artifacts && copy %EXTRA_PATH%\libgomp-1.dll artifacts) + copy %EXTRA_PATH%\libgcc_s_seh-1.dll artifacts && copy %EXTRA_PATH%\libwinpthread-1.dll artifacts && copy %EXTRA_PATH%\libgomp-1.dll artifacts artifacts: - path: artifacts @@ -51,7 +47,7 @@ deploy: secret_access_key: secure: Y/QobuGrBsa137sbi9a+UnvSLqpWITTCp5yFTgDJ4i1Gduyi9V7i/g3zLZ4s2J7d bucket: flycast-builds - folder: 'builds/heads/$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT)' + folder: 'win/heads/$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT)' artifact: reicast-win_$(PLATFORM)-$(CONFIGURATION)-$(APPVEYOR_REPO_COMMIT) region: us-east-2 set_public: true From cbe8df51cfd461879c1f354e095d0e9544a4e93e Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Thu, 30 May 2019 11:56:28 +0200 Subject: [PATCH 17/22] osx: bigger window. travis: public_read for S3 --- .travis.yml | 1 + .../apple/emulator-osx/emulator-osx/Base.lproj/MainMenu.xib | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b464034df..b049bbe61 100755 --- a/.travis.yml +++ b/.travis.yml @@ -55,6 +55,7 @@ deploy: bucket: flycast-builds local-dir: artifacts upload-dir: android + acl: public_read skip_cleanup: true on: all_branches: true diff --git a/shell/apple/emulator-osx/emulator-osx/Base.lproj/MainMenu.xib b/shell/apple/emulator-osx/emulator-osx/Base.lproj/MainMenu.xib index 15a2e3655..ba45f4d6f 100644 --- a/shell/apple/emulator-osx/emulator-osx/Base.lproj/MainMenu.xib +++ b/shell/apple/emulator-osx/emulator-osx/Base.lproj/MainMenu.xib @@ -171,10 +171,10 @@ - - + + - + From 5b5bc135880f1f8da85471bff60ed2d08cfe8fd5 Mon Sep 17 00:00:00 2001 From: flyinghead Date: Thu, 30 May 2019 19:02:41 +0200 Subject: [PATCH 18/22] Add link to builds page on README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index c4c6e648b..c6c037132 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,10 @@ reicast =========== **reicast** is a multi-platform Sega Dreamcast emulator. +Binaries +======== +Get fresh builds for your system [on the builds page](https://flyinghead.github.io/reicast-builds/) + Disclaimer ========== All code contritbuted to this fork is *not* bound by the Individual Contributor License Agreement of the upstream repository (https://github.com/reicast/reicast-emulator) and shall *not* be considered as a contribution to the upstream repository. From b5a9d0d2582e9a86ac541ee90a9bb2551873045b Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Thu, 30 May 2019 19:46:23 +0200 Subject: [PATCH 19/22] wercker: deploy to S3 --- wercker.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/wercker.yml b/wercker.yml index 22d2c72db..c10db4dcc 100644 --- a/wercker.yml +++ b/wercker.yml @@ -11,3 +11,19 @@ build: - script: name: reicast x64 build code: make -C shell/linux platform=x64 + - script: + name: package app + code: | + S3_DIR=linux/heads/$WERCKER_GIT_BRANCH-$WERCKER_GIT_COMMIT + mkdir -p $S3_DIR + pushd shell/linux + mv -f nosym-reicast.elf reicast + gzip reicast + popd + mv shell/linux/reicast.gz $S3_DIR + - s3sync: + source_dir: linux/heads/$WERCKER_GIT_BRANCH-$WERCKER_GIT_COMMIT + delete-removed: false + bucket-url: s3://flycast-builds + key-id: AKIAJOZQS4H2PHQWYFCA + key-secret: $S3_SECRET_KEY From aa94d7dfe25f51c6045d44d6bd9167d07463ac30 Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Thu, 30 May 2019 19:54:24 +0200 Subject: [PATCH 20/22] wercker: fix S3 path --- wercker.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/wercker.yml b/wercker.yml index c10db4dcc..607684f4d 100644 --- a/wercker.yml +++ b/wercker.yml @@ -14,16 +14,15 @@ build: - script: name: package app code: | - S3_DIR=linux/heads/$WERCKER_GIT_BRANCH-$WERCKER_GIT_COMMIT - mkdir -p $S3_DIR + mkdir s3 pushd shell/linux mv -f nosym-reicast.elf reicast gzip reicast popd - mv shell/linux/reicast.gz $S3_DIR + mv shell/linux/reicast.gz s3 - s3sync: - source_dir: linux/heads/$WERCKER_GIT_BRANCH-$WERCKER_GIT_COMMIT + source_dir: s3 delete-removed: false - bucket-url: s3://flycast-builds + bucket-url: s3://flycast-builds/linux/heads/$WERCKER_GIT_BRANCH-$WERCKER_GIT_COMMIT key-id: AKIAJOZQS4H2PHQWYFCA key-secret: $S3_SECRET_KEY From 94fd42db6f429147f1392c0ec0f92ca983a5aaf0 Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Thu, 30 May 2019 20:00:36 +0200 Subject: [PATCH 21/22] wercker: missing slash --- wercker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wercker.yml b/wercker.yml index 607684f4d..959952cb8 100644 --- a/wercker.yml +++ b/wercker.yml @@ -23,6 +23,6 @@ build: - s3sync: source_dir: s3 delete-removed: false - bucket-url: s3://flycast-builds/linux/heads/$WERCKER_GIT_BRANCH-$WERCKER_GIT_COMMIT + bucket-url: s3://flycast-builds/linux/heads/$WERCKER_GIT_BRANCH-$WERCKER_GIT_COMMIT/ key-id: AKIAJOZQS4H2PHQWYFCA key-secret: $S3_SECRET_KEY From 97eab1be5915f0ba05a1f1855c79db98f5405cbd Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Thu, 30 May 2019 20:09:25 +0200 Subject: [PATCH 22/22] wercker: added naomi build --- wercker.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/wercker.yml b/wercker.yml index 959952cb8..fddb920ba 100644 --- a/wercker.yml +++ b/wercker.yml @@ -20,6 +20,17 @@ build: gzip reicast popd mv shell/linux/reicast.gz s3 + - script: + name: reicast x64 naomi build + code: make -C shell/linux platform=x64 NAOMI=1 + - script: + name: package naomi app + code: | + pushd shell/linux + mv -f nosym-reicast.elf reicast_naomi + gzip reicast_naomi + popd + mv shell/linux/reicast_naomi.gz s3 - s3sync: source_dir: s3 delete-removed: false