Skip to content

[4.1] [build-script] Fix how the playground frameworks build in build-script. #14817

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.

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

Conversation

cwakamo
Copy link
Contributor

@cwakamo cwakamo commented Feb 25, 2018

This PR does three things by pulling in the changes from #14123:

This is part of <rdar://problem/37861670>.

…undLogger on Linux.

As far as I can tell, this never worked, so removing it cannot break anything.
Now PlaygroundLogger is treated similarly to PlaygroundSupport, directly referencing xcodebuild instead of indirecting through variables.
This commit also introduces explicit error messages when attempting to build PlaygroundLogger or PlaygroundSupport for non-Darwin platforms.

This addresses <rdar://problem/36594779>.

(cherry picked from commit 9bc45e1)
…ucts.

These don't make sense to build separately, and indeed it's likely that PlaygroundLogger will soon depend on PlaygroundSupport.
As a result, build them as one product (playgroundsupport) in build-script.
Aside from removing the playgroundlogger product, this otherwise continues to build PlaygroundLogger and PlaygroundSupport the same way.

This is for <rdar://problem/36512531>.

(cherry picked from commit 806c01d)

Conflicts:
	utils/build_swift/driver_arguments.py
…built.

Instead of building separately, they are now built together using a new workspace with new schemes.
As a result, xcodebuild is now invoked once per-platform, allowing for platform-specific build setting and architecture overrides.

This addresses <rdar://problem/36512531>.

(cherry picked from commit 3a0eaea)
@cwakamo
Copy link
Contributor Author

cwakamo commented Feb 25, 2018

Please test with the following PRs:

apple/swift-xcode-playground-support#22

@swift-ci Please test

@cwakamo
Copy link
Contributor Author

cwakamo commented Feb 25, 2018

@Rostepher @shahmishal If one of y'all could review this for Swift 4.1 nomination that would be great -- I need to nominate this build-script change for 4.1 as I need to bring swift-xcode-playground-support's swift-4.1-branch up to date with master to accommodate changes to support SE-0198 in PlaygroundLogger.

@shahmishal
Copy link
Member

LGTM!

FYI - swift-4.1-branch is under CCC.

@cwakamo
Copy link
Contributor Author

cwakamo commented Feb 26, 2018

• Explanation: In preparation for landing the new PlaygroundLogger implementation on swift-4.1-branch, we need to bring swift-xcode-playground-support's swift-4.1-branch up-to-date with the basis of that implemenation (i.e. the modernized project structure, primarily). This change brings swift-xcode-playground-support/swift-4.1-branch up-to-date with the latest commit that's not solely aligned with master. This also pulls in changes to build-script and build-script-impl on swift/swift-4.1-branch to support building the latest and greatest swift-xcode-playground-support content.
• Scope of Issue: Affects swift-xcode-playground-support and building swift-xcode-playground-support with build-script.
• Origination: Preparation for updating PlaygroundLogger for SE-0198 by way of a better reimplementation of PlaygroundLogger.
• Risk: Low
• Reviewed By: @shahmishal
• Testing: Tested locally; also tested that everything works in CI via PR testing
• Directions for QA: Ensure that the swift-4.1-branch bots continue to build after taking this change.

@cwakamo cwakamo merged commit d3407b2 into swiftlang:swift-4.1-branch Feb 26, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants