Fix default Windows install directory regression from WiX v4 port #185
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
tristanlabelle
requested review from
shahmishal,
tomerd and
compnerd
as code owners
tristanlabelle
changed the title
|
Oops there seems to be a bad merge in there, gimme a sec |
|
False alarm, there's no bad merge, just a confusing diff. |
compnerd
added a commit
to compnerd/apple-swift
that referenced
this pull request
Mar 31, 2023
compnerd
approved these changes
Apr 1, 2023
|
Tested at swiftlang/swift#64815 |
compnerd
added a commit
to compnerd/apple-swift
that referenced
this pull request
Apr 2, 2023
compnerd
pushed a commit
to compnerd/swift-installer-scripts
that referenced
this pull request
Apr 3, 2023
swiftlang#185) * Fix regression on default install dir after wix v4 port * Switched to StandardDirectory for runtime wxs * Fixed WindowsVolume reference for C:\Library-targeting wxs's * Capitalized Swift under Program Files * Change overridable install dir to the level above Library * Uniformize comments
compnerd
pushed a commit
that referenced
this pull request
Apr 4, 2023
#185) * Fix regression on default install dir after wix v4 port * Switched to StandardDirectory for runtime wxs * Fixed WindowsVolume reference for C:\Library-targeting wxs's * Capitalized Swift under Program Files * Change overridable install dir to the level above Library * Uniformize comments
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 rules around
<SetDirectory>changed between WiX v3 and v4, so our port resulted in the INSTALLDIR defaulting toC:\instead of eitherC:\Program Files\swiftorC:\Library.Changes:
<StandardDirectory>to root inProgramFiles, and capitalizeSwiftfor consistency with all other programsC:\Library, use<SetDirectory>+<Directory>as a means of rooting atWindowsVolume, also change the customizable installation path to theC:\underneathLibrary(so the installer will write theLibrarydirectory under the users' path rather than start at theDeveloperdirectory)How tested: