Skip to content

[CMake] Always build the "non-overlay" apinotes #16851

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

Rostepher
Copy link
Contributor

Purpose

This PR forces swiftlang to always "rebuild" the "non-overlay" apinotes found in the apinotes directory when compiling.

rdar://40496966

@Rostepher Rostepher self-assigned this May 25, 2018
@Rostepher Rostepher requested review from zisko and jrose-apple May 25, 2018 21:15
@Rostepher
Copy link
Contributor Author

@swift-ci please test

@jrose-apple
Copy link
Contributor

I think this will build them both ways; it'd really be better to stop building them with the overlays. Or did you want to save that for a follow-up?

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 07ab9b0ab8a1d04c1a105e4bc75aa76791439e2c

@Rostepher Rostepher closed this May 25, 2018
@Rostepher
Copy link
Contributor Author

Closing this, I don't think this is the right solution.

@Rostepher Rostepher reopened this May 26, 2018
@Rostepher Rostepher force-pushed the always-build-non-overlay-apinotes branch from 07ab9b0 to 04e520f Compare May 26, 2018 00:40
@Rostepher Rostepher force-pushed the always-build-non-overlay-apinotes branch from 04e520f to 6ab1b3d Compare May 26, 2018 00:40
@Rostepher
Copy link
Contributor Author

@swift-ci test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 07ab9b0ab8a1d04c1a105e4bc75aa76791439e2c

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 07ab9b0ab8a1d04c1a105e4bc75aa76791439e2c

if (NOT IS_DIRECTORY "${SWIFT_SOURCE_DIR}/stdlib/public/SDK/${framework_name}")
list(APPEND SWIFTLIB_SINGLE_API_NOTES "${framework_name}")
endif()
# Always build the "non-overlay" apinotes to keep them in sync
Copy link
Contributor

Choose a reason for hiding this comment

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

Comment nitpick: this is saying "Always build all API notes", not just the non-overlay ones.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Well, it's building all the apinotes found in swift/apinotes/, but I can adjust the comment.

@Rostepher Rostepher merged commit bfbce36 into swiftlang:master May 29, 2018
@Rostepher Rostepher deleted the always-build-non-overlay-apinotes branch May 29, 2018 17:34
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.

3 participants