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

Merge tvOS support into 1.2 and master #1042

Closed
snej opened this issue Jan 18, 2016 · 1 comment
Closed

Merge tvOS support into 1.2 and master #1042

snej opened this issue Jan 18, 2016 · 1 comment
Assignees
@snej
Labels
Build chore in progress
Milestone
1.2

Comments

@snej
Copy link
Contributor

snej commented Jan 18, 2016

currently on branch release/1.1.1-appleTV
@snej snej self-assigned this Jan 18, 2016
@snej snej added this to the 1.2 milestone Jan 18, 2016
@snej snej mentioned this issue Jan 18, 2016
Closed
@zgramana zgramana mentioned this issue Jan 18, 2016
Closed
snej added a commit that referenced this issue Jan 19, 2016
@snej
Made iOS targets build for AppleTV as well
e4dbc17 
By changing the SUPPORTED_PLATFORMS build setting to a list of all
platforms, I made the iOS targets buildable for both iOS and tvOS, so
we don't need any extra targets or duplicated build settings.

Build the CBL iOS and CBL Listener iOS targets, as usual.
Use the scheme destination pop-up, or the -destination arg of
xcodebuild, to specify which platform to build for.

Fixes #1042
@snej
Copy link
Contributor Author

snej commented Jan 19, 2016

Fixed on branch release/1.2.

I ended up not merging the earlier release/1.1.1-appleTV branch. There were horrible conflicts in multiple pbxproj files due to the divergence between 1.1 and 1.2, and also I found out about a better technique:

Instead of creating extra targets for tvOS (duplicated from the iOS targets), I simply changed the Supported Platforms build setting on the existing iOS targets:

SUPPORTED_PLATFORMS = iphonesimulator iphoneos appletvos appletvsimulator

This allows those targets to build for either iOS or tvOS. The top-level build is determined by the scheme destination pop-up in Xcode, or by the -destination flag to xcodebuild.

In the CBForest project I went even further and merged the Mac OS targets too — so now there's only a single set of targets in there that build for all three platforms! I was a bit scared to do that to CBL right now, but I plan to after 1.2.

@snej snej closed this as completed Jan 19, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@snej snej

Labels
Build chore in progress
Projects
None yet
Milestone
1.2
Development

No branches or pull requests
2 participants
@snej @zgramana