Skip to content

build: introduce and switch to GYB_SOURCES #23201

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Mar 20, 2019
Merged

build: introduce and switch to GYB_SOURCES #23201

merged 1 commit into from
Mar 20, 2019

Conversation

compnerd
Copy link
Member

This avoids us having to pattern match every source file which should
help speed up the CMake generation. A secondary optimization is
possible with CMake 3.14 which has the ability to remove the last
extension component without having to resort to regular expressions. It
also helps easily identify the GYB'ed sources.

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

CC: @gottesmm @Rostepher @gwynne

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - d313a8edfa67c1bfde525da02b0ae397c0b49878

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - d313a8edfa67c1bfde525da02b0ae397c0b49878

@gottesmm
Copy link
Contributor

I think this change makes sense at a high level. A few requests:

  1. Can you put a newline in between GYB_SOURCES and the previous file. This will help to reduce merge conflicts IIUC if someone adds more files out of tree that are not gybed. Otherwise, we will continually hit merge conflicts I think.
  2. Can you split the commit into two commits (not separate PRs), one introducing the change and the other applying it. Would just make it easier to review.

@compnerd compnerd force-pushed the patience-is-not-always-a-virtue branch 2 times, most recently from 6464fca to e150173 Compare March 10, 2019 20:40
@compnerd
Copy link
Member Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - d313a8edfa67c1bfde525da02b0ae397c0b49878

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - d313a8edfa67c1bfde525da02b0ae397c0b49878

@compnerd
Copy link
Member Author

@swift-ci please test macOS platform

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - e150173750998dd7273e86001cc355ba6f784a62

@compnerd
Copy link
Member Author

@swift-ci please test macOS platform

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - e150173750998dd7273e86001cc355ba6f784a62

@compnerd compnerd force-pushed the patience-is-not-always-a-virtue branch from e150173 to 38a7de1 Compare March 11, 2019 04:38
@compnerd
Copy link
Member Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 38a7de18bfdfb1bb60d06f50e57af98940362281

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 38a7de18bfdfb1bb60d06f50e57af98940362281

@compnerd
Copy link
Member Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 38a7de18bfdfb1bb60d06f50e57af98940362281

@compnerd compnerd force-pushed the patience-is-not-always-a-virtue branch from 38a7de1 to 1a35a62 Compare March 11, 2019 17:15
@compnerd
Copy link
Member Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 38a7de18bfdfb1bb60d06f50e57af98940362281

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 38a7de18bfdfb1bb60d06f50e57af98940362281

@compnerd
build: introduce and switch to GYB_SOURCES
8ed5c1a 
This avoids us having to pattern match every source file which should
help speed up the CMake generation.  A secondary optimization is
possible with CMake 3.14 which has the ability to remove the last
extension component without having to resort to regular expressions.  It
also helps easily identify the GYB'ed sources.
@compnerd compnerd force-pushed the patience-is-not-always-a-virtue branch from 1a35a62 to 8ed5c1a Compare March 11, 2019 20:49
@compnerd
Copy link
Member Author

@swift-ci please test

@gottesmm
Copy link
Contributor

LGTM.

@gottesmm gottesmm merged commit 384882d into swiftlang:master Mar 20, 2019
@compnerd compnerd deleted the patience-is-not-always-a-virtue branch March 20, 2019 20:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@compnerd @swift-ci @gottesmm