Add -scanner-prefix-map-paths option and fix multiArg option parsing
#1949
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
Sources/SwiftDriver/ExplicitModuleBuilds/ExplicitDependencyBuildPlanner.swift
Outdated
Show resolved
Hide resolved
Sources/SwiftDriver/ExplicitModuleBuilds/ExplicitDependencyBuildPlanner.swift
Outdated
Show resolved
Hide resolved
sina-mahdavi
force-pushed
the
sina-mahdavi/new-scanner-prefix-map-option
branch
from
7236a5a to
bdbdd6b
Compare
cachemeifyoucan
approved these changes
Jul 10, 2025
Sources/SwiftDriver/ExplicitModuleBuilds/ExplicitDependencyBuildPlanner.swift
Outdated
Show resolved
Hide resolved
|
@swift-ci please test |
Thank you! Also, should I squash my commits into one before merging? |
|
@swift-ci please test |
Yes. Please never push individual review feedback fixes to any repositories. You can either use |
sina-mahdavi
force-pushed
the
sina-mahdavi/new-scanner-prefix-map-option
branch
from
c5b2bea to
0876a15
Compare
|
@swift-ci please test |
|
@swift-ci please test Windows platform |
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.
The current command-line option for specifying prefix mappings for the dependency scanner does not handle paths containing equal signs. This PR adds a new option
-scanner-prefix-map-pathsthat has a multiArg format instead of being=-separated and fixes this issue. The old-scanner-prefix-mapoption is still preserved, but is made driver-only and gets translated to the new option format by the driver.This also fixes the parsing of
.multiArgoptions inOptionParsing.swiftso that their corresponding arguments are not added to the general inputs list and are attached to their option correctly.Corresponding PR on Swift: swiftlang/swift#82745