Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support the "Xcode (iOS)" Projucer exporter #551

Merged
merged 30 commits into from
Nov 9, 2019
Merged

Support the "Xcode (iOS)" Projucer exporter #551

merged 30 commits into from
Nov 9, 2019

Conversation

McMartin
Copy link
Owner

@McMartin McMartin commented Nov 6, 2019 •
edited
Loading

Related to #458.

This PR is made of the following commit "groups":

  • commit 7fe3eaf documents per-exporter CMake requirements
  • commits 6828d9b and 940cf8b only deal with renaming
  • commits from e9fb724 to 169af4d add the core of the iOS support
  • commits from d9495f8 to 50806cd update generated CMakeLists.txt files (most of the changes were done by Jucer2Reprojucer)
  • commits from 1da9069 to 8022fab add support for various settings that are specific to the "Xcode (iOS)" exporter
  • commits 387b70e and 9f88d82 extend CI and polish the README

@MartyLake: please review, thanks!

This was referenced Nov 6, 2019
Open
Merged
@MartyLake
Copy link
Collaborator

LGTM, even if it's hard to say I read every single line of it

@McMartin
Copy link
Owner Author

McMartin commented Nov 7, 2019

First-class support for iOS was added in CMake 3.14. When I opened this PR, I didn't want to make that a hard requirement, since the code of FRUT itself only requires CMake version 3.4 minimum. However, after a bit of testing on macOS, and considering that Visual Studio 2019 is also only supported since CMake 3.14, I changed my mind. In this new version of the PR, CMake 3.14 is required for iOS. Instead of calling cmake -G Xcode -DJUCER_IOS=ON and using JUCER_IOS in Reprojucer.cmake, we now call cmake -G Xcode -DCMAKE_SYSTEM_NAME=iOS and we use IOS in Reprojucer.cmake.

@MartyLake: please re-review this PR. To help you understand what changed, you can read the diff between bb0cb70 and 96933d1. I also updated the PR description with the new commit groups. Thanks!

@McMartin McMartin requested a review from MartyLake November 7, 2019 22:45
@McMartin McMartin force-pushed the support-iOS branch 2 times, most recently from 2f048a9 to 96933d1 Compare November 7, 2019 22:51
@McMartin
Copy link
Owner Author

McMartin commented Nov 8, 2019

We hit a new problem. Reprojucer.cmake needs to build its helper executables (BinaryDataBuilder, IconBuilder, PListMerger, and the new XcassetsBuilder), but these executables can only be built and run on macOS, not iOS. Since Reprojucer.cmake uses the try_compile CMake command, CMAKE_SYSTEM_NAME=iOS (and everything that comes with it) is passed down when configuring the helper executables. This obviously fails because the Cocoa framework cannot be found in the iphoneos SDK.

@MartyLake: please don't review yet, fixing this problem might require quite some changes.

@McMartin
Copy link
Owner Author

McMartin commented Nov 8, 2019

After reading more about try_compile I came to the conclusion that it is not the right tool in the first place. try_compile should be used to determine if something can/would compile, it shouldn't be used to just build and install other CMake projects at configure time. I'll open a new PR to replace try_compile by something else in _FRUT_build_and_install_helper_exe, and then I'll rebase this one again. Stay tuned!

@McMartin McMartin mentioned this pull request Nov 8, 2019
Merged
@McMartin
Document CMake requirements per exporter
7fe3eaf 
The code of FRUT still only requires CMake 3.4 minimum to run.
@McMartin
Rename osx_frameworks to xcode_frameworks
6828d9b 
This matches XcodeProjectExporter::XcodeTarget::xcodeFrameworks and
XcodeProjectExporter::xcodeFrameworks in
JUCE/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h.

This also makes room for introducing iOS frameworks.
@McMartin
Rename osx_libs to xcode_libs
940cf8b 
This matches XcodeProjectExporter::XcodeTarget::xcodeLibs and
XcodeProjectExporter::xcodeLibs in
JUCE/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h.

This also makes room for introducing iOS libs.
@McMartin
Add XcassetsBuilder helper executable
e9fb724 
It will be used by Reprojucer.cmake to generate an "Images.xcassets"
bundle like Projucer does.
@McMartin
Improve code in preparation for subsequent commits
f939c8f
@McMartin McMartin removed the blocked label Nov 9, 2019
@McMartin
Copy link
Owner Author

McMartin commented Nov 9, 2019

@MartyLake: I've rebased the branch on top of the latest master after merging #553 and force-pushed. This PR is now ready for review again, please have another look, thanks!

@MartyLake
Copy link
Collaborator

MartyLake commented Nov 9, 2019 •
edited
Loading

LGTM, no obvious typo :D

McMartin added 19 commits November 9, 2019 20:17
@McMartin
Update generated/JUCE-5.2.1
cce3ef0
@McMartin
Update generated/JUCE-5.3.1
beb060b
@McMartin
Update generated/JUCE-5.4.3
bf25c0d
@McMartin
Update generated/JUCE-5.4.4
50806cd
@McMartin
Support the "iOS Deployment Target" configuration setting
1da9069
@McMartin
Support the "Device Family" exporter setting
d77b252
@McMartin
Support the "iPhone/iPad Screen Orientation" exporter settings
0978018
@McMartin
Support the "File Sharing Enabled" exporter setting
9a98b97
@McMartin
Support the "Support Document Browser" exporter setting
0cc9f6e
@McMartin
Support the "Status Bar Hidden" exporter setting
28a0be5 
Even though the logic seems broken, it matches what Projucer does.
@McMartin
Support the "Bluetooth Access" exporter settings
c5c2b92
@McMartin
Support the "Background Capability" exporter settings
ba5aef9
@McMartin
Support the "App Groups Capability" exporter setting
ebb7c6f
@McMartin
Support the "iCloud Permissions" exporter setting
b73fff2
@McMartin
Support the "Custom Xcassets Folder" exporter setting
77ddd04
@McMartin
Support the "Custom Launch Storyboard" exporter setting
c7128fd
@McMartin
Update generated CMakeLists.txt files
8022fab
@McMartin
Run tests and configure all JUCE projects for iOS on Travis CI
387b70e
@McMartin
Update README
9f88d82
@McMartin McMartin merged commit a21aea7 into master Nov 9, 2019
@McMartin McMartin deleted the support-iOS branch November 9, 2019 19:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MartyLake MartyLake Awaiting requested review from MartyLake

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@McMartin @MartyLake