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.

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

SR-3086: Xcode project generation puts modules from external packages together with local ones #777

Merged
merged 3 commits into from Nov 10, 2016

Conversation

abertelrud
Copy link
Contributor

When external packages are present, add a Dependencies group, and add modules from the external packages to appropriate directories underneath. This is just a structure navigator change; there is no change to linkage semantics. The structure of the groups tries to respect whether the package uses shallow or deep package format, but does not depend on all of the package dependencies ending up inside a Packages subdirectory in the source.

This addresses https://bugs.swift.org/browse/SR-3086

The diffs are staged into three separate commits to make them easier to read.

…n; this is just to make the next diff containing the actual changes more clear.
… generated Xcode project, and add modules from the external packages to appropriate directories underneath. This is just a structure navigator change; there is no change to linkage semantics.

This addresses https://bugs.swift.org/browse/SR-3086 "Xcode project generation puts modules from external packages together with local ones".
@abertelrud
Copy link
Contributor Author

@swift-ci Please test

Copy link
Member

@ankitspd ankitspd left a comment

Choose a reason for hiding this comment

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

LGTM!

@abertelrud
Copy link
Contributor Author

macOS failure seems to be in Swift itself.

@thomaspaulmann
Copy link

thomaspaulmann commented Nov 3, 2016

Did you experience also trouble with SourceKit based on this? Since Xcode 8.1 and the version of SPM, I don't have code completion for generated xcode projects with the package manager.

@ankitspd
Copy link
Member

ankitspd commented Nov 7, 2016

@swift-ci please test linux

@ankitspd
Copy link
Member

@swift-ci please test OS X

@ankitspd ankitspd merged commit ad36285 into apple:master Nov 10, 2016
@ecarter202
Copy link

Are we to re-install the package manager?

@tomandersen
Copy link

Kitura/Kitura#822 is the same issue.

@tomandersen
Copy link

There are some comments at Kitura/Kitura#822 about using the older package manager from SPM 3 to generate the xcode project.

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.

None yet

5 participants