Rebase swift's component system ontop of LLVM's component system. #20910
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gottesmm
force-pushed
the
swift-component-ontop-llvm-component
branch
3 times, most recently
from
0e4fee9 to
a4ba363
Compare
LLVM's component system works by all installable things having individual
install-* targets. Swift's component system is intended to categorize
installable things with high level categories like a package maintainer would
want (e.x. compiler, editor-integration, etc). What this commit does is:
1. If a swift component is supposed to be installed, rather than just setting a
variable, we also define an install-${swift_component} custom target.
2. When we call swift_install_in_category, we now require a 2nd argument which
is a custom target install name. This must be a unique name since we will define
a rule based off of the provided name (install-${target_install_name}). If one
is trying to install a target, please use the target name as the target install
name. If one is installing a file or directory, this must just be a unique name
among all targets.
This allows for us to plug into LLVM's cmake install component system without
giving up the nice high level components for swift.
gottesmm
force-pushed
the
swift-component-ontop-llvm-component
branch
from
a4ba363 to
d8bd9b1
Compare
|
@swift-ci build toolchain |
compnerd
reviewed
Nov 30, 2018
| FILES "${UNIVERSAL_LIBRARY_NAME}" | ||
| DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/${resource_dir}/${resource_dir_sdk_subdir}" | ||
| PERMISSIONS ${file_permissions}) | ||
| if(sdk STREQUAL WINDOWS) | ||
| foreach(arch ${SWIFT_SDK_WINDOWS_ARCHITECTURES}) | ||
| if(TARGET ${name}-windows-${arch}_IMPLIB) | ||
| get_target_property(import_library ${name}-windows-${arch}_IMPLIB IMPORTED_LOCATION) | ||
| swift_install_in_component(${SWIFTLIB_INSTALL_IN_COMPONENT} | ||
| swift_install_in_component(${SWIFTLIB_INSTALL_IN_COMPONENT} ${import_library} |
There was a problem hiding this comment.
This really should be part of the component itself. The import library is needed to be built against, and normally install(TARGET) will do the work for you.
| @@ -348,7 +348,7 @@ function(_compile_swift_files | |||
| list(APPEND module_outputs "${interface_file}") | |||
| endif() | |||
|
|
|||
| swift_install_in_component("${SWIFTFILE_INSTALL_IN_COMPONENT}" | |||
| swift_install_in_component("${SWIFTFILE_INSTALL_IN_COMPONENT}" ${module_base}-module | |||
There was a problem hiding this comment.
I think that it would be better to install the module with the module itself. You cannot use the module for development otherwise.
|
A huge amount of stuff has changed in the mean time. Do you still want this @gottesmm? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
LLVM's component system works by all installable things having individual
install-* targets. Swift's component system is intended to categorize
installable things with high level categories like a package maintainer would
want (e.x. compiler, editor-integration, etc). What this commit does is:
If a swift component is supposed to be installed, rather than just setting a
variable, we also define an install-${swift_component} custom target.
When we call swift_install_in_category, we now require a 2nd argument which
is a custom target install name. This must be a unique name since we will define
a rule based off of the provided name (install-${target_install_name}). If one
is trying to install a target, please use the target name as the target install
name. If one is installing a file or directory, this must just be a unique name
among all targets.
This allows for us to plug into LLVM's cmake install component system without
giving up the nice high level components for swift.