Skip to content

WiX: adjust for dynamic cmark, require swift-format #271

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 1 commit into from
Jan 28, 2024
Merged

WiX: adjust for dynamic cmark, require swift-format #271

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
11 changes: 11 additions & 0 deletions platforms/Windows/bld/bld.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,15 @@
<Directory Id="_usr_share_swift" Name="swift" />
</DirectoryRef>

<ComponentGroup Id="cmark_gfm" Directory="_usr_bin">
<Component>
<File Source="$(TOOLCHAIN_ROOT)\usr\bin/cmark-gfm.dll" />
</Component>
<Component>
<File Source="$(TOOLCHAIN_ROOT)\usr\bin/cmark-gfm-extensions.dll" />
</Component>
</ComponentGroup>

<ComponentGroup Id="binutils" Directory="_usr_bin">
<!-- TODO(compnerd) can we use symbolic links to llvm-ar.exe instead? -->
<Component>
Expand Down Expand Up @@ -393,6 +402,8 @@
</ComponentGroup>

<Feature Id="BuildTools" AllowAbsent="no" Title="!(loc.Bld_ProductName)">
<ComponentGroupRef Id="cmark_gfm" />

<ComponentGroupRef Id="binutils" />
<ComponentGroupRef Id="lto" />
<ComponentGroupRef Id="clang" />
Expand Down
1 change: 0 additions & 1 deletion platforms/Windows/cli/cli.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
SWIFT_DOCC_BUILD=$(SWIFT_DOCC_BUILD);
INCLUDE_SWIFT_DOCC=$(INCLUDE_SWIFT_DOCC);
SWIFT_FORMAT_BUILD=$(SWIFT_FORMAT_BUILD);
INCLUDE_SWIFT_FORMAT=$(INCLUDE_SWIFT_FORMAT);
SWIFT_DOCC_RENDER_ARTIFACT_ROOT_DIST=$(SWIFT_DOCC_RENDER_ARTIFACT_ROOT)\dist;
</DefineConstants>
</PropertyGroup>
Expand Down
15 changes: 7 additions & 8 deletions platforms/Windows/cli/cli.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,14 +239,13 @@
<?endif?>
</ComponentGroup>

<ComponentGroup Id="swift_format" Directory="ToolsVersioned">
<?if $(INCLUDE_SWIFT_FORMAT) == true ?>
<Component Id="swift_format.exe">
<File Source="$(SWIFT_FORMAT_BUILD)\swift-format.exe" />
</Component>

<ComponentRef Id="SystemToolsEnvironmentVariables" />
<?endif?>
<ComponentGroup Id="swift_format" Directory="_usr_bin">
<Component>
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-format.exe" />
</Component>
<Component>
<File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftFormat.dll" />
</Component>
</ComponentGroup>

<Feature Id="CLITools" AllowAbsent="no" Title="!(loc.Cli_ProductName)">
Expand Down
2 changes: 1 addition & 1 deletion platforms/Windows/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ MSBuild automatically imports Directory.Build.props files in your tree. We use D
| ArePackageCabsEmbedded | Always set to false to keep the .cab files external to the .msi files. This save user disk space: Burn caches packages so it can always uninstall and repair. MSI also caches packages for uninstall. If the cab is embedded, you have two copies and MSI doesn't always use its cached copy as a source for repair. With an external .cab, MSI caches only the tiny .msi file and not the (relatively huge) .cab. |
| BundleFlavor, IsBundleCompressed | BundleFlavor defaults to `online` to build an online bundle. Set by the invocation of MSBuild to build an online or offline bundle. Controls IsBundleCompressed. |
| DefineConstants | Passes a subset of MSBuild properties into the WiX build as preprocessor variables. |
| INCLUDE_SWIFT_FORMAT, INCLUDE_SWIFT_INSPECT | swift-format and swift-inspect are currently conditionalized out. Set these to `true` to include them. The properties `SWIFT_FORMAT_BUILD` and `SWIFT_INSPECT_BUILD` define the directories to find the .exes. |
| INCLUDE_SWIFT_INSPECT | swift-inspect is currently conditionalized out. Set it to `true` to include it. The property `SWIFT_INSPECT_BUILD` defines the directory to find the artifacts. |
| INCLUDE_X86_SDK, INCLUDE_ARM64_SDK | The x86 and Arm64 SDKs are currently conditionalized out, pending build changes. Set these to `true` to include them in the bundles. Note that bundle\theme.xml currently has commented-out checkboxes that need to be restored when the x86 and Arm64 SDKs are brought back. |


Expand Down