Skip to content

Fix default Windows install directory regression from WiX v4 port #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 1, 2023
Merged

Fix default Windows install directory regression from WiX v4 port #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
00bb26a
Fix regression on default install dir after wix v4 port
tristanlabelle Mar 30, 2023
5da593a
Switched to StandardDirectory for runtime wxs
tristanlabelle Mar 31, 2023
52f8977
Fixed WindowsVolume reference for C:\Library-targeting wxs's
tristanlabelle Mar 31, 2023
c917be4
Capitalized Swift under Program Files
tristanlabelle Mar 31, 2023
60d61ea
Change overridable install dir to the level above Library
tristanlabelle Mar 31, 2023
623d906
Uniformize comments
tristanlabelle Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions platforms/Windows/devtools-amd64.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,26 @@
<?endif?>

<!-- Directory Structure -->
<Directory Id="INSTALLDIR">
<Directory Id="Developer" Name="Developer">
<Directory Id="Toolchains" Name="Toolchains">
<Directory Id="xctoolchain" Name="unknown-Asserts-development.xctoolchain">
<Directory Id="_usr" Name="usr">
<Directory Id="_usr_bin" Name="bin">
</Directory>
<Directory Id="_usr_lib" Name="lib">
<!-- FIXME(compnerd) should we include the SPM import libraries? -->
<Directory Id="_usr_lib_swift" Name="swift">
<Directory Id="_usr_lib_swift_pm" Name="pm">
<Directory Id="_usr_lib_swift_pm_ManifestAPI" Name="ManifestAPI">
</Directory>
<Directory Id="_usr_lib_swift_pm_PluginAPI" Name="PluginAPI">
<!-- WindowsVolume is not a StandardDirectory value, but rather a standard property. See https://github.com/wixtoolset/issues/issues/7314 -->
<SetDirectory Id="WINDOWSVOLUME" Value="[WindowsVolume]" />
<Directory ComponentGuidGenerationSeed="07cd7a30-e084-447d-af16-ca3a013c5147" Id="WINDOWSVOLUME">
<Directory Id="INSTALLDIR">
<Directory Id="Library" Name="Library">
<Directory Id="Developer" Name="Developer">
<Directory Id="Toolchains" Name="Toolchains">
<Directory Id="xctoolchain" Name="unknown-Asserts-development.xctoolchain">
<Directory Id="_usr" Name="usr">
<Directory Id="_usr_bin" Name="bin">
</Directory>
<Directory Id="_usr_lib" Name="lib">
<!-- FIXME(compnerd) should we include the SPM import libraries? -->
<Directory Id="_usr_lib_swift" Name="swift">
<Directory Id="_usr_lib_swift_pm" Name="pm">
<Directory Id="_usr_lib_swift_pm_ManifestAPI" Name="ManifestAPI">
</Directory>
<Directory Id="_usr_lib_swift_pm_PluginAPI" Name="PluginAPI">
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>
Expand All @@ -38,8 +44,6 @@
</Directory>
</Directory>

<SetDirectory Id="INSTALLDIR" Value="[WindowsVolume]Library" Condition="NOT INSTALLDIR" />

<!-- Components -->
<ComponentGroup Id="SwiftCollections">
<Component Id="Collections.dll" Directory="_usr_bin" Guid="fd0862f1-2e80-4040-8736-b73fc9c4230d">
Expand Down
36 changes: 20 additions & 16 deletions platforms/Windows/devtools-arm64.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,26 @@
<?endif?>

<!-- Directory Structure -->
<Directory Id="INSTALLDIR">
<Directory Id="Developer" Name="Developer">
<Directory Id="Toolchains" Name="Toolchains">
<Directory Id="xctoolchain" Name="unknown-Asserts-development.xctoolchain">
<Directory Id="_usr" Name="usr">
<Directory Id="_usr_bin" Name="bin">
</Directory>
<Directory Id="_usr_lib" Name="lib">
<!-- FIXME(compnerd) should we include the SPM import libraries? -->
<Directory Id="_usr_lib_swift" Name="swift">
<Directory Id="_usr_lib_swift_pm" Name="pm">
<Directory Id="_usr_lib_swift_pm_ManifestAPI" Name="ManifestAPI">
</Directory>
<Directory Id="_usr_lib_swift_pm_PluginAPI" Name="PluginAPI">
<!-- WindowsVolume is not a StandardDirectory value, but rather a standard property. See https://github.com/wixtoolset/issues/issues/7314 -->
<SetDirectory Id="WINDOWSVOLUME" Value="[WindowsVolume]" />
<Directory ComponentGuidGenerationSeed="61297eca-77a2-4749-b2f7-3b7ae6304140" Id="WINDOWSVOLUME">
<Directory Id="INSTALLDIR">
<Directory Id="Library" Name="Library">
<Directory Id="Developer" Name="Developer">
<Directory Id="Toolchains" Name="Toolchains">
<Directory Id="xctoolchain" Name="unknown-Asserts-development.xctoolchain">
<Directory Id="_usr" Name="usr">
<Directory Id="_usr_bin" Name="bin">
</Directory>
<Directory Id="_usr_lib" Name="lib">
<!-- FIXME(compnerd) should we include the SPM import libraries? -->
<Directory Id="_usr_lib_swift" Name="swift">
<Directory Id="_usr_lib_swift_pm" Name="pm">
<Directory Id="_usr_lib_swift_pm_ManifestAPI" Name="ManifestAPI">
</Directory>
<Directory Id="_usr_lib_swift_pm_PluginAPI" Name="PluginAPI">
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>
Expand All @@ -38,8 +44,6 @@
</Directory>
</Directory>

<SetDirectory Id="INSTALLDIR" Value="[WindowsVolume]Library" Condition="NOT INSTALLDIR" />

<!-- Components -->
<ComponentGroup Id="SwiftCollections">
<Component Id="Collections.dll" Directory="_usr_bin" Guid="b705e7a1-698a-4608-b53f-48578380696c">
Expand Down
16 changes: 8 additions & 8 deletions platforms/Windows/runtime-amd64.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
<?endif?>

<!-- Directory Structure -->
<Directory Id="INSTALLDIR">
<!-- TODO(compnerd) use $(var.ProductVersion) -->
<Directory Id="_" Name="runtime-development">
<Directory Id="_usr" Name="usr">
<Directory Id="_usr_bin" Name="bin">
<StandardDirectory Id="ProgramFiles64Folder">
<Directory Id="INSTALLDIR" Name="Swift">
<!-- TODO(compnerd) use $(var.ProductVersion) -->
<Directory Id="_" Name="runtime-development">
<Directory Id="_usr" Name="usr">
<Directory Id="_usr_bin" Name="bin">
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>

<SetDirectory Id="INSTALLDIR" Value="[ProgramFiles64Folder]swift" Condition="NOT INSTALLDIR" />
</StandardDirectory>

<!-- Components -->
<ComponentGroup Id="SwiftRuntime" Directory="_usr_bin">
Expand Down
17 changes: 8 additions & 9 deletions platforms/Windows/runtime-arm64.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,17 @@
<?endif?>

<!-- Directory Structure -->
<Directory Id="INSTALLDIR">
<!-- TODO(compnerd) use $(var.ProductVersion) -->
<Directory Id="_" Name="runtime-development">
<Directory Id="_usr" Name="usr">
<Directory Id="_usr_bin" Name="bin">
<StandardDirectory Id="ProgramFiles64Folder">
<Directory Id="INSTALLDIR" Name="Swift">
<!-- TODO(compnerd) use $(var.ProductVersion) -->
<Directory Id="_" Name="runtime-development">
<Directory Id="_usr" Name="usr">
<Directory Id="_usr_bin" Name="bin">
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>


<SetDirectory Id="INSTALLDIR" Value="[ProgramFiles64Folder]swift" Condition="NOT INSTALLDIR" />
</StandardDirectory>

<!-- Components -->
<ComponentGroup Id="SwiftRuntime" Directory="_usr_bin">
Expand Down
16 changes: 8 additions & 8 deletions platforms/Windows/runtime-x86.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
<?endif?>

<!-- Directory Structure -->
<Directory Id="INSTALLDIR">
<!-- TODO(compnerd) use $(var.ProductVersion) -->
<Directory Id="_" Name="runtime-development">
<Directory Id="_usr" Name="usr">
<Directory Id="_usr_bin" Name="bin">
<StandardDirectory Id="ProgramFilesFolder">
<Directory Id="INSTALLDIR" Name="Swift">
<!-- TODO(compnerd) use $(var.ProductVersion) -->
<Directory Id="_" Name="runtime-development">
<Directory Id="_usr" Name="usr">
<Directory Id="_usr_bin" Name="bin">
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>

<SetDirectory Id="INSTALLDIR" Value="[ProgramFilesFolder]swift" Condition="NOT INSTALLDIR" />
</StandardDirectory>

<!-- Components -->
<ComponentGroup Id="SwiftRuntime" Directory="_usr_bin">
Expand Down
155 changes: 79 additions & 76 deletions platforms/Windows/sdk-amd64.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,93 +14,99 @@
<?endif?>

<!-- Directory Structure -->
<Directory Id="INSTALLDIR">
<Directory Id="Developer" Name="Developer">
<Directory Id="DeveloperPlatforms" Name="Platforms">
<Directory Id="WindowsPlatform" Name="Windows.platform">
<Directory Id="WindowsPlatform_Developer" Name="Developer">
<Directory Id="WindowsPlatform_Developer_Library" Name="Library">

<!-- XCTest -->
<!--
FIXME(compnerd) this should actually be the proper version
of XCTest, and needs to be reflected in the plist as well.
-->
<Directory Id="XCTest" Name="XCTest-development">
<Directory Id="XCTest_usr" Name="usr">
<Directory Id="XCTest_usr_bin64" Name="bin64">
</Directory>
<Directory Id="XCTest_usr_lib" Name="lib">
<Directory Id="XCTest_usr_lib_swift" Name="swift">
<Directory Id="XCTest_usr_lib_swift_windows" Name="windows">
<Directory Id="XCTest_usr_lib_swift_windows_x86_64" Name="x86_64">
</Directory>
<Directory Id="XCTest.swiftmodule" Name="XCTest.swiftmodule">
<!-- WindowsVolume is not a StandardDirectory value, but rather a standard property. See https://github.com/wixtoolset/issues/issues/7314 -->
<SetDirectory Id="WINDOWSVOLUME" Value="[WindowsVolume]" />
<Directory ComponentGuidGenerationSeed="bedc1fea-99ee-40be-ab38-3101698f2c0b" Id="WINDOWSVOLUME">
<Directory Id="INSTALLDIR">
<Directory Id="Library" Name="Library">
<Directory Id="Developer" Name="Developer">
<Directory Id="DeveloperPlatforms" Name="Platforms">
<Directory Id="WindowsPlatform" Name="Windows.platform">
<Directory Id="WindowsPlatform_Developer" Name="Developer">
<Directory Id="WindowsPlatform_Developer_Library" Name="Library">

<!-- XCTest -->
<!--
FIXME(compnerd) this should actually be the proper version
of XCTest, and needs to be reflected in the plist as well.
-->
<Directory Id="XCTest" Name="XCTest-development">
<Directory Id="XCTest_usr" Name="usr">
<Directory Id="XCTest_usr_bin64" Name="bin64">
</Directory>
<Directory Id="XCTest_usr_lib" Name="lib">
<Directory Id="XCTest_usr_lib_swift" Name="swift">
<Directory Id="XCTest_usr_lib_swift_windows" Name="windows">
<Directory Id="XCTest_usr_lib_swift_windows_x86_64" Name="x86_64">
</Directory>
<Directory Id="XCTest.swiftmodule" Name="XCTest.swiftmodule">
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>

<Directory Id="SDKs" Name="SDKs">
<Directory Id="SDKs" Name="SDKs">

<!-- Windows.sdk -->
<Directory Id="WindowsSDK" Name="Windows.sdk">
<Directory Id="WindowsSDK_usr" Name="usr">
<Directory Id="WindowsSDK_usr_include" Name="include">
<Directory Id="WindowsSDK_usr_include_Block" Name="Block">
</Directory>
<Directory Id="WindowsSDK_usr_include_dispatch" Name="dispatch">
</Directory>
<Directory Id="WindowsSDK_usr_include_os" Name="os">
</Directory>
<Directory Id="WindowsSDK_usr_include_swift" Name="swift">
<Directory Id="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror">
</Directory>
</Directory>
</Directory>
<Directory Id="WindowsSDK_usr_lib" Name="lib">
<Directory Id="WindowsSDK_usr_lib_swift" Name="swift">
<Directory Id="WindowsSDK_usr_lib_swift_shims" Name="shims">
</Directory>
<Directory Id="WindowsSDK_usr_lib_swift_windows" Name="windows">
<Directory Id="_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule">
</Directory>
<Directory Id="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule">
<!-- Windows.sdk -->
<Directory Id="WindowsSDK" Name="Windows.sdk">
<Directory Id="WindowsSDK_usr" Name="usr">
<Directory Id="WindowsSDK_usr_include" Name="include">
<Directory Id="WindowsSDK_usr_include_Block" Name="Block">
</Directory>
<Directory Id="Distributed.swiftmodule" Name="Distributed.swiftmodule">
<Directory Id="WindowsSDK_usr_include_dispatch" Name="dispatch">
</Directory>
<Directory Id="_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule">
<Directory Id="WindowsSDK_usr_include_os" Name="os">
</Directory>
<Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule">
<Directory Id="WindowsSDK_usr_include_swift" Name="swift">
<Directory Id="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror">
</Directory>
</Directory>
<Directory Id="CRT.swiftmodule" Name="CRT.swiftmodule">
</Directory>
<Directory Id="Cxx.swiftmodule" Name="Cxx.swiftmodule">
</Directory>
<Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule">
</Directory>
<Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule">
</Directory>
<Directory Id="FoundationNetworking.swiftmodule" Name="FoundationNetworking.swiftmodule">
</Directory>
<Directory Id="FoundationXML.swiftmodule" Name="FoundationXML.swiftmodule">
</Directory>
<Directory Id="Swift.swiftmodule" Name="Swift.swiftmodule">
</Directory>
<Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule">
</Directory>
<Directory Id="WinSDK.swiftmodule" Name="WinSDK.swiftmodule">
</Directory>
<Directory Id="WindowsSDK_usr_lib_swift_windows_x86_64" Name="x86_64">
</Directory>
<Directory Id="WindowsSDK_usr_lib" Name="lib">
<Directory Id="WindowsSDK_usr_lib_swift" Name="swift">
<Directory Id="WindowsSDK_usr_lib_swift_shims" Name="shims">
</Directory>
<Directory Id="WindowsSDK_usr_lib_swift_windows" Name="windows">
<Directory Id="_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule">
</Directory>
<Directory Id="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule">
</Directory>
<Directory Id="Distributed.swiftmodule" Name="Distributed.swiftmodule">
</Directory>
<Directory Id="_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule">
</Directory>
<Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule">
</Directory>
<Directory Id="CRT.swiftmodule" Name="CRT.swiftmodule">
</Directory>
<Directory Id="Cxx.swiftmodule" Name="Cxx.swiftmodule">
</Directory>
<Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule">
</Directory>
<Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule">
</Directory>
<Directory Id="FoundationNetworking.swiftmodule" Name="FoundationNetworking.swiftmodule">
</Directory>
<Directory Id="FoundationXML.swiftmodule" Name="FoundationXML.swiftmodule">
</Directory>
<Directory Id="Swift.swiftmodule" Name="Swift.swiftmodule">
</Directory>
<Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule">
</Directory>
<Directory Id="WinSDK.swiftmodule" Name="WinSDK.swiftmodule">
</Directory>
<Directory Id="WindowsSDK_usr_lib_swift_windows_x86_64" Name="x86_64">
</Directory>
</Directory>
</Directory>
</Directory>
<Directory Id="WindowsSDK_usr_share" Name="share">
</Directory>
</Directory>
</Directory>
<Directory Id="WindowsSDK_usr_share" Name="share">
</Directory>
</Directory>
</Directory>
</Directory>
Expand All @@ -109,9 +115,6 @@
</Directory>
</Directory>
</Directory>


<SetDirectory Id="INSTALLDIR" Value="[WindowsVolume]Library" Condition="NOT INSTALLDIR" />

<!-- Components -->
<ComponentGroup Id="XCTest">
Expand Down Expand Up @@ -488,7 +491,7 @@

<Component Id="EnvironmentVariables" Directory="INSTALLDIR" Guid="bd3ddc62-4c5c-4f6b-806e-02d2c6a65b65">
<!-- <Condition> %PROCESSOR_ARCHITECTURE~="amd64" </Condition> -->
<Environment Id="SDKRoot" Action="set" Name="SDKROOT" Part="all" Permanent="no" System="yes" Value="[INSTALLDIR]Developer\Platforms\Windows.platform\Developer\SDKs\Windows.sdk" />
<Environment Id="SDKRoot" Action="set" Name="SDKROOT" Part="all" Permanent="no" System="yes" Value="[INSTALLDIR]Library\Developer\Platforms\Windows.platform\Developer\SDKs\Windows.sdk" />
</Component>

<!-- Features -->
Expand Down
Loading