Skip to content

Simplify wix files for SwiftFormat. #549

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
May 26, 2023
Merged

Simplify wix files for SwiftFormat. #549

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
52 changes: 0 additions & 52 deletions installer-scripts/SwiftFormat-arm64.wxs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions installer-scripts/SwiftFormat.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
<!-- <Import Project="WiXCodeSigning.targets" /> -->

<PropertyGroup>
<DefineConstants>ProductVersion=$(ProductVersion);SWIFTFORMAT_BUILD=$(SWIFTFORMAT_BUILD)</DefineConstants>
<DefineConstants>ProductVersion=$(ProductVersion);ProductArchitecture=$(ProductArchitecture);SWIFTFORMAT_BUILD=$(SWIFTFORMAT_BUILD)</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="WixToolset.UI.wixext" Version="4.0.0" />
</ItemGroup>

<ItemGroup>
<Compile Include="SwiftFormat-$(ProductArchitecture).wxs" />
<Compile Include="SwiftFormat.wxs" />
</ItemGroup>
</Project>
28 changes: 12 additions & 16 deletions installer-scripts/SwiftFormat-amd64.wxs → installer-scripts/SwiftFormat.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,38 @@
<Package
Language="1033"
Manufacturer="nicklockwood"
Name="SwiftFormat for Windows x86_64"
Name="SwiftFormat"
UpgradeCode="98e01ac8-a17d-43fd-99ed-1cd8b58715bf"
Version="$(var.ProductVersion)"
Scope="perMachine">
<SummaryInformation Description="SwiftFormat for Windows x86_64" />
<SummaryInformation Description="SwiftFormat" />

<!-- NOTE(compnerd) use pre-3.0 schema for better compatibility. -->
<Media Id="1" Cabinet="SwiftFormat.cab" EmbedCab="yes" />

<!-- Directory Structure -->
<!-- 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="7818d7fe-5173-4a41-9809-e72263ea9738" Id="WINDOWSVOLUME">
<Directory Id="INSTALLDIR">
<Directory Id="Library" Name="Library">
<Directory Id="Developer" Name="Developer">
<Directory Id="Tools" Name="Tools">
<Component Id="swiftformat.exe">
<File Id="swiftformat.exe" Source="$(var.SWIFTFORMAT_BUILD)\swiftformat.exe" Checksum="yes" />
</Component>
</Directory>
</Directory>
</Directory>

<Component Id="EnvironmentVariables" Guid="b46687c3-f836-47e5-9b43-d9fd2552a731">
<Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Library\Developer\Tools" />
</Component>
</Directory>
</Directory>

<!-- Components -->
<ComponentGroup Id="SwiftFormat">
<Component Id="swiftformat.exe" Directory="Tools" Guid="77126634-5f91-40a7-b344-035ce99ef46f">
<File Id="swiftformat.exe" Source="$(var.SWIFTFORMAT_BUILD)\swiftformat.exe" Checksum="yes" />
</Component>
</ComponentGroup>

<Component Id="EnvironmentVariables" Directory="INSTALLDIR" Guid="b46687c3-f836-47e5-9b43-d9fd2552a731">
<Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Library\Developer\Tools" />
</Component>

<Feature Id="SwiftFormat" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="SwiftFormat for Windows x86_64" Level="1" Title="SwiftFormat (Windows x86_64)">
<ComponentGroupRef Id="SwiftFormat" />
<Feature Id="SwiftFormat" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="SwiftFormat" Level="1" Title="SwiftFormat">
<ComponentRef Id="swiftformat.exe" />
<ComponentRef Id="EnvironmentVariables" />
</Feature>

Expand Down