Skip to content

Conversation

@bulbazord
Copy link
Contributor

@bulbazord bulbazord commented Aug 9, 2019

This commit introduces a CMake target for each component, adds install targets
for them, and switches build-script-impl to use the target install-components
for installation. Each of the targets for each component depends on each
of the individual targets and outputs that are associated with the
corresponding swift-component.

This is equivalent to what already exists, because right now install rules are
only generated for components that we want to install. Therefore, this commit
should be an NFC.

NOTE: This is a resubmission (with modifications) of an earlier change. I originally
committed this but there were problems with some installation rules.

@bulbazord bulbazord changed the title Resubmit "[CMake][NFC] Introduce component targets for proper dependency tracking Resubmit "[CMake][NFC] Introduce component targets for proper dependency tracking" Aug 9, 2019
@bulbazord
Copy link
Contributor Author

@swift-ci please smoke test

@bulbazord
Copy link
Contributor Author

@swift-ci please clean test

@swift-ci
Copy link
Contributor

swift-ci commented Aug 9, 2019

Build failed
Swift Test Linux Platform
Git Sha - 38e7c25a7ccaf1554056ca4af168f209aea0d3bf

@swift-ci
Copy link
Contributor

swift-ci commented Aug 9, 2019

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

@bulbazord
Copy link
Contributor Author

@swift-ci please smoke test

@bulbazord
Copy link
Contributor Author

@swift-ci please clean test

@swift-ci
Copy link
Contributor

swift-ci commented Aug 9, 2019

Build failed
Swift Test Linux Platform
Git Sha - 38e7c25a7ccaf1554056ca4af168f209aea0d3bf

@swift-ci
Copy link
Contributor

swift-ci commented Aug 9, 2019

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

@bulbazord
Copy link
Contributor Author

@swift-ci please clean test Linux platform

@swift-ci
Copy link
Contributor

swift-ci commented Aug 9, 2019

Build failed
Swift Test Linux Platform
Git Sha - 38e7c25a7ccaf1554056ca4af168f209aea0d3bf

@bulbazord
Copy link
Contributor Author

@swift-ci please clean test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 38e7c25a7ccaf1554056ca4af168f209aea0d3bf

@swift-ci
Copy link
Contributor

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

@bulbazord
Copy link
Contributor Author

@swift-ci please clean test Linux platform

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 38e7c25a7ccaf1554056ca4af168f209aea0d3bf

@bulbazord bulbazord force-pushed the component-targets-done-right branch from 38e7c25 to 1f3bd32 Compare August 19, 2019 18:36
@bulbazord
Copy link
Contributor Author

@swift-ci please clean test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 38e7c25a7ccaf1554056ca4af168f209aea0d3bf

@swift-ci
Copy link
Contributor

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

@bulbazord
Copy link
Contributor Author

@swift-ci please test Linux platform

@bulbazord bulbazord force-pushed the component-targets-done-right branch from 1f3bd32 to 5a15a02 Compare August 19, 2019 22:00
@bulbazord
Copy link
Contributor Author

@swift-ci please clean test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 1f3bd327fef153c9ab46ef9d39c81d3fc111f328

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 5a15a023665eb77cf7ac5fa05b1deb3c8871c398

@bulbazord bulbazord force-pushed the component-targets-done-right branch from 5a15a02 to 41ce8cb Compare August 20, 2019 16:51
@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 5a15a023665eb77cf7ac5fa05b1deb3c8871c398

@bulbazord
Copy link
Contributor Author

@swift-ci please clean test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 41ce8cbb9fb9b36254e7d498d778966f9159e6f9

@bulbazord
Copy link
Contributor Author

@swift-ci please clean test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 41ce8cbb9fb9b36254e7d498d778966f9159e6f9

This commit introduces a CMake target for each component, adds install targets
for them, and switches build-script-impl to use the target `install-components`
for installation. Each of the targets for each component depends on each
of the individual targets and outputs that are associated with the
corresponding swift-component.

This is equivalent to what already exists, because right now install rules are
only generated for components that we want to install. Therefore, this commit
should be an NFC.

This is a resubmission (with modifications) of an earlier change. I originally
committed this but there were problems with some installation rules.
@bulbazord bulbazord force-pushed the component-targets-done-right branch from 41ce8cb to 61be4d9 Compare August 22, 2019 17:17
@bulbazord
Copy link
Contributor Author

@swift-ci please clean test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 41ce8cbb9fb9b36254e7d498d778966f9159e6f9

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 41ce8cbb9fb9b36254e7d498d778966f9159e6f9

@bulbazord
Copy link
Contributor Author

Looks like it's working now! @compnerd

@bulbazord
Copy link
Contributor Author

I'm not sure if there's something wrong, but from the results of the Toolchain builds it looks like they succeeded. I think this is good to go in 😃

@JDevlieghere JDevlieghere merged commit a325154 into swiftlang:master Aug 22, 2019
@bulbazord bulbazord deleted the component-targets-done-right branch August 22, 2019 23:18
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