Skip to content

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

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

Merged

Conversation

cwakamo
Copy link
Contributor

@cwakamo cwakamo commented Jan 24, 2018

This PR does three things:

Resolves <rdar://problem/36512531>.

…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>.
…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>.
…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>.
@cwakamo
Copy link
Contributor Author

cwakamo commented Jan 24, 2018

Please test with the following PR:
apple/swift-xcode-playground-support#18

@swift-ci Please test

@shahmishal
Copy link
Member

Please test with the following PR:
apple/swift-xcode-playground-support#18

@swift-ci build toolchain

Copy link
Contributor

@Rostepher Rostepher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So long as the additional testing Mishal requested passes, this looks good to me.

@swift-ci
Copy link
Contributor

Linux Toolchain (Ubuntu 16.04)
Download Toolchain
Git Sha - 3a0eaea

Install command
tar zxf swift-PR-14123-3-ubuntu16.04.tar.gz
More info

@swift-ci
Copy link
Contributor

macOS Toolchain
Download Toolchain
Git Sha - 3a0eaea

Install command
tar -zxf swift-PR-14123-8-osx.tar.gz --directory ~/

Copy link
Member

@shahmishal shahmishal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks!

@cwakamo
Copy link
Contributor Author

cwakamo commented Jan 24, 2018

The toolchains built successfully, and I did a sanity check of the macOS toolchain. Going ahead and merging this.

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.

4 participants