Cross-compilation: fix bundles not unpacked on installation #6361
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
`swift experimental-destination install` subcommand works with bundle directories, but fails to unpack bundle archives. We should pass an instance of an archiver to the installation function to unpack destination bundle archives if needed. Since `withTemporaryDirectory` is `async`, `SwiftDestinationTool` had to be converted to `AsyncParsableCommand` and also gain `@main` attribute for that to work. Additionally, `@main` attribute requires `-parse-as-library` passed in CMake.
MaxDesiatov
requested review from
abertelrud,
neonichu and
tomerd
as code owners
|
@swift-ci smoke test |
|
@swift-ci smoke test |
|
@swift-ci test windows |
|
@swift-ci smoke test |
|
@swift-ci smoke test linux |
|
@swift-ci test windows |
neonichu
approved these changes
Mar 31, 2023
|
@swift-ci smoke test |
|
@swift-ci test windows |
|
@swift-ci smoke test |
This comment was marked as duplicate.
This comment was marked as duplicate.
1 similar comment
|
@swift-ci test windows |
tomerd
reviewed
Apr 3, 2023
| @@ -12,8 +12,8 @@ | |||
|
|
|||
| import ArgumentParser | |||
|
|
|||
| struct ConfigureDestination: ParsableCommand { | |||
| static let configuration = CommandConfiguration( | |||
| public struct ConfigureDestination: ParsableCommand { | |||
There was a problem hiding this comment.
curious why these became public?
There was a problem hiding this comment.
The reason is that SwiftDestinationTool referencing this type had to be moved to a different target so that it could gain the @main attribute.
tomerd
approved these changes
Apr 3, 2023
|
Interesting - I suspect it might be this PR, but I'm not sure. I'm seeing a new failure around this time: |
MaxDesiatov
added a commit
that referenced
this pull request
Apr 4, 2023
This fixes an issue with the Windows build highlighted in #6361 (comment)
MaxDesiatov
added a commit
that referenced
this pull request
Apr 4, 2023
This fixes an issue with the Windows build highlighted in #6361 (comment)
MaxDesiatov
added a commit
that referenced
this pull request
Apr 4, 2023
This fixes an issue with the Windows build highlighted in #6361 (comment)
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.
Motivation:
swift experimental-destination installsubcommand works with bundle directories, but fails to unpack bundle archives.rdar://107367895
Modifications:
We should pass an instance of an archiver to the installation function to unpack destination bundle archives if needed. Since
withTemporaryDirectoryisasync,SwiftDestinationToolhad to be converted toAsyncParsableCommandand also gain@mainattribute for that to work. Additionally,@mainattribute requires-parse-as-librarypassed in CMake.