Skip to content

Commit 7db0a42

Browse files
committed
Harvest the SwiftPM/Swift Build resources in /usr/share/pm
1 parent dca65b9 commit 7db0a42

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

platforms/Windows/cli/cli.wixproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,25 @@
66
INCLUDE_SWIFT_DOCC=$(INCLUDE_SWIFT_DOCC);
77
SWIFT_FORMAT_BUILD=$(SWIFT_FORMAT_BUILD);
88
SWIFT_DOCC_RENDER_ARTIFACT_ROOT_DIST=$(SWIFT_DOCC_RENDER_ARTIFACT_ROOT)\dist;
9+
_USR_SHARE_PM=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\share\pm;
910
</DefineConstants>
1011
</PropertyGroup>
1112

1213
<ItemGroup>
1314
<PackageReference Include="WixToolset.Heat" Version="4.0.5" />
1415
</ItemGroup>
1516

17+
<ItemGroup>
18+
<HarvestDirectory Include="$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\share\pm">
19+
<ComponentGroupName>PackageManagerResources</ComponentGroupName>
20+
<DirectoryRefId>_usr_share_pm</DirectoryRefId>
21+
<PreprocessorVariable>var._USR_SHARE_PM</PreprocessorVariable>
22+
<SuppressCom>true</SuppressCom>
23+
<SuppressRegistry>true</SuppressRegistry>
24+
<SuppressRootDirectory>true</SuppressRootDirectory>
25+
</HarvestDirectory>
26+
</ItemGroup>
27+
1628
<ItemGroup Condition=" '$(INCLUDE_SWIFT_DOCC)' == 'True' ">
1729
<HarvestDirectory Include="$(SWIFT_DOCC_RENDER_ARTIFACT_ROOT)\dist">
1830
<ComponentGroupName>DocCRender</ComponentGroupName>

platforms/Windows/cli/cli.wxs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@
344344
<ComponentGroupRef Id="llbuild" />
345345
<ComponentGroupRef Id="SwiftBuild" />
346346
<ComponentGroupRef Id="package_manager" />
347+
<ComponentGroupRef Id="PackageManagerResources" />
347348

348349
<ComponentGroupRef Id="DocC" />
349350
<?if $(INCLUDE_SWIFT_DOCC) = True?>

platforms/Windows/shared/shared.wxs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
<Directory Id="_usr_share_docc" Name="docc">
5353
<Directory Id="_usr_share_docc_render" Name="render" />
5454
</Directory>
55+
<Directory Id="_usr_share_pm" Name="pm" />
5556
</Directory>
5657
</Directory>
5758
</Directory>

0 commit comments

Comments
 (0)