Skip to content

swift-lang: shuffle the source directory structure (NFC) #29823

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
Feb 18, 2020

Conversation

compnerd
Copy link
Member

This moves the swift-lang library out of the tools/SourceKit directory
and into the stdlib directory. As it stands, the library required that
the standard library and the SDK overlay was being built. This is
implicitly done when building the stdlib subdirectory. Furthermore, it
had an odd tie between the flags for Swift and SourceKit which now have
the logic separated. This clearly delineates the host and target
components in the repository.

Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.

Resolves SR-NNNN.

@compnerd
Copy link
Member Author

@swift-ci please test

@compnerd
Copy link
Member Author

compnerd commented Feb 13, 2020

CC: @nathawes @akyrtzi @gottesmm @drexin

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - c8de823ce6ccb9bbf1e92417a1092e8d0ef94c0b

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - c8de823ce6ccb9bbf1e92417a1092e8d0ef94c0b

@nathawes
Copy link
Contributor

I think SwiftLang's only being used by the stress tester at the moment. Long term it should probably be a package that the stress tester and SourceKit-LSP both use to talk to sourcekitd, but for now we can just copy it (or SourceKit-LSP's sourcekitd wrapper code) into the stress tester repo and remove it. I'm working on something else at the minute but should be able to give that a go tomorrow or early next week.

@compnerd
Copy link
Member Author

@karwa this is also related to that change btw

@compnerd
Copy link
Member Author

@nathawes - this is going to kinda block some work that I am hoping to get done. Do you think you could manage to do this today?

@akyrtzi
Copy link
Contributor

akyrtzi commented Feb 14, 2020

@compnerd could you clarify, are the changes in this PR allowing the stress-tester to build and run successfully?

@compnerd
Copy link
Member Author

@akyrtzi this should have no impact on the current status quo. Moving the sources into the stress-tester repository is a better solution. This just moves the sources out of source kit and into the stdlib directory.

@akyrtzi
Copy link
Contributor

akyrtzi commented Feb 14, 2020

If it preserves status quo I don't see a reason not to take this PR and move the sources later.

@compnerd
Copy link
Member Author

If @nathawes is going to be able to move the sources today, I think that it is a better solution. But, yes, otherwise, I think that I can fix up the small typo issue, and move forward.

@nathawes
Copy link
Contributor

@compnerd I don't think I'll be done by today, sorry, so feel free to go ahead with this PR.

@compnerd
Copy link
Member Author

@nathawes, alright, thanks.

@compnerd
Copy link
Member Author

@swift-ci please clean test

@compnerd
Copy link
Member Author

@swift-ci please test Windows platform

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - e2f13355ed842c2892c7ec2d78913a19f8a97a94

This moves the swift-lang library out of the tools/SourceKit directory
and into the stdlib directory.  As it stands, the library required that
the standard library and the SDK overlay was being built.  This is
implicitly done when building the stdlib subdirectory.  Furthermore, it
had an odd tie between the flags for Swift and SourceKit which now have
the logic separated.  This clearly delineates the host and target
components in the repository.
@compnerd
Copy link
Member Author

@swift-ci please clean test

@compnerd
Copy link
Member Author

@swift-ci please test Windows platform

1 similar comment
@compnerd
Copy link
Member Author

@swift-ci please test Windows platform

@compnerd compnerd merged commit 61832cb into swiftlang:master Feb 18, 2020
@compnerd compnerd deleted the swift-lang-rises branch February 18, 2020 16:22
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