Skip to content

[build-script] Install SwiftSyntax to usr/lib instead of usr/lib/swift #28663

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
merged 1 commit into from
Jan 13, 2020

Conversation

ahoppen
Copy link
Member

@ahoppen ahoppen commented Dec 9, 2019

SwiftSyntax in the toolchain is only needed to run the stress tester executable. If a third-party library wants to use it, they are supposed to depend on the SwiftPM package.

As such, SwiftSyntax should not be installed in usr/lib/swift where the standard library lives. This PR changes the install location of SwiftSyntax to be usr/lib.

This also removes the code to install SwiftSyntax's .swiftmodule and .swiftdoc file since that code path was never exercised.

@ahoppen ahoppen requested review from akyrtzi and beccadax December 9, 2019 21:18
@ahoppen
Copy link
Member Author

ahoppen commented Dec 9, 2019

@swift-ci Please test

@ahoppen
Copy link
Member Author

ahoppen commented Dec 9, 2019

@swift-ci Please build toolchain

@akyrtzi
Copy link
Contributor

akyrtzi commented Dec 9, 2019

Is @swift-ci Please build toolchain running the package integration tests? (to ensure the stress-tester is working fine).

@swift-ci
Copy link
Contributor

swift-ci commented Dec 9, 2019

Linux Toolchain (Ubuntu 16.04)
Download Toolchain
Git Sha - 961db23c762905d90cf8750677d1b9914c151807

Install command
tar zxf swift-PR-28663-326-ubuntu16.04.tar.gz
More info

@swift-ci
Copy link
Contributor

swift-ci commented Dec 9, 2019

Build failed
Swift Test OS X Platform
Git Sha - 961db23c762905d90cf8750677d1b9914c151807

@swift-ci
Copy link
Contributor

swift-ci commented Dec 9, 2019

macOS Toolchain
Download Toolchain
Git Sha - 961db23c762905d90cf8750677d1b9914c151807

Install command
tar -zxf swift-PR-28663-443-osx.tar.gz --directory ~/

SwiftSyntax is not part of the standard library and thus should not be
installed in usr/lib/swift.

This also removes the code to install SwiftSyntax's .swiftmodule file
since that code path was never exercised.
@ahoppen ahoppen force-pushed the install-swiftsyntax-usr-lib branch from 961db23 to 91ca8ca Compare December 10, 2019 02:28
@ahoppen
Copy link
Member Author

ahoppen commented Dec 10, 2019

Verified that the stress tester still runs in the new toolchain and that libSwiftSyntax now lives in /usr/lib

Fixed some Python Lint errors, re-running CI to pick them up.

@swift-ci Please smoke test

Copy link
Contributor

@beccadax beccadax left a comment

Choose a reason for hiding this comment

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

Thank you!

@compnerd
Copy link
Member

compnerd commented Jan 7, 2020

@swift-ci please smoke test macOS platform

@ahoppen
Copy link
Member Author

ahoppen commented Jan 13, 2020

Oh, forgot about this one.

@swift-ci Please smoke test and merge

@ahoppen
Copy link
Member Author

ahoppen commented Jan 13, 2020

@swift-ci Please smoke test

@compnerd
Copy link
Member

@ahoppen seems that it has passed, I'll go ahead and merge :)

@compnerd compnerd merged commit d8cc616 into swiftlang:master Jan 13, 2020
@ahoppen
Copy link
Member Author

ahoppen commented Jan 13, 2020

@compnerd Thanks!

@ahoppen ahoppen deleted the install-swiftsyntax-usr-lib branch April 5, 2022 14:47
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.

5 participants