Skip to content

Harvest the SwiftPM/Swift Build resources in /usr/share/pm #1

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

Closed
wants to merge 1 commit into from
Closed

Harvest the SwiftPM/Swift Build resources in /usr/share/pm #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions platforms/Windows/cli/cli.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,25 @@
INCLUDE_SWIFT_DOCC=$(INCLUDE_SWIFT_DOCC);
SWIFT_FORMAT_BUILD=$(SWIFT_FORMAT_BUILD);
SWIFT_DOCC_RENDER_ARTIFACT_ROOT_DIST=$(SWIFT_DOCC_RENDER_ARTIFACT_ROOT)\dist;
_USR_SHARE_PM=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\share\pm;
</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="WixToolset.Heat" Version="4.0.5" />
</ItemGroup>

<ItemGroup>
<HarvestDirectory Include="$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\share\pm">
<ComponentGroupName>PackageManagerResources</ComponentGroupName>
<DirectoryRefId>_usr_share_pm</DirectoryRefId>
<PreprocessorVariable>var._USR_SHARE_PM</PreprocessorVariable>
<SuppressCom>true</SuppressCom>
<SuppressRegistry>true</SuppressRegistry>
<SuppressRootDirectory>true</SuppressRootDirectory>
</HarvestDirectory>
</ItemGroup>

<ItemGroup Condition=" '$(INCLUDE_SWIFT_DOCC)' == 'True' ">
<HarvestDirectory Include="$(SWIFT_DOCC_RENDER_ARTIFACT_ROOT)\dist">
<ComponentGroupName>DocCRender</ComponentGroupName>
Expand Down
1 change: 1 addition & 0 deletions platforms/Windows/cli/cli.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@
<ComponentGroupRef Id="llbuild" />
<ComponentGroupRef Id="SwiftBuild" />
<ComponentGroupRef Id="package_manager" />
<ComponentGroupRef Id="PackageManagerResources" />

<ComponentGroupRef Id="DocC" />
<?if $(INCLUDE_SWIFT_DOCC) = True?>
Expand Down
1 change: 1 addition & 0 deletions platforms/Windows/shared/shared.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
<Directory Id="_usr_share_docc" Name="docc">
<Directory Id="_usr_share_docc_render" Name="render" />
</Directory>
<Directory Id="_usr_share_pm" Name="pm" />
</Directory>
</Directory>
</Directory>
Expand Down