GitHub/SwiftFormat
1
0
Fork 0
mirror of https://github.com/nicklockwood/SwiftFormat.git synced 2026-05-17 10:30:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Windows: correct mistakes in the build rules (#1472)

Browse Source 
- Correct the closing tag from `Directory` to match the opening tag of
`StandardDirectory`.
- Fix the standard directory name to a valid identifier.
- Remove errant `_` in the path specifier.
- Rename `Manufacturer` to `ManufacturerFolder` as the former is
  reserved
This commit is contained in:
Saleem Abdulrasool
2023-06-20 15:05:00 -04:00
committed by GitHub
parent 5531d67adb
commit 969323e330
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Platforms/Windows/SwiftFormat.wixproj
+1 -1
View File
@@ -19,7 +19,7 @@
<Import Project="WiXCodeSigning.targets" />
<PropertyGroup>
<DefineConstants>ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);SWIFTFORMAT_BUILD=$(SWIFT_FORMAT_BUILD)</DefineConstants>
<DefineConstants>ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);SWIFTFORMAT_BUILD=$(SWIFTFORMAT_BUILD)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(ProductArchitecture)' == 'amd64' ">
Platforms/Windows/SwiftFormat.wxs
+3 -3
View File
@@ -12,15 +12,15 @@
<Media Id="1" Cabinet="SwiftFormat.cab" EmbedCab="yes" />
<StandardDirectory Id="%ProgramFiles64Folder%">
<Directory Id="Manufacturer" Name="nicklockwood">
<StandardDirectory Id="ProgramFiles64Folder">
<Directory Id="ManufacturerFolder" Name="nicklockwood">
<Directory Id="INSTALLDIR" Name="SwiftFormat">
<Directory Id="_usr" Name="usr">
<Directory Id="_usr_bin" Name="bin" />
</Directory>
</Directory>
</Directory>
</Directory>
</StandardDirectory>
<Component Directory="_usr_bin" Id="swiftformat.exe">
<File Id="swiftformat.exe" Source="$(var.SWIFTFORMAT_BUILD)\swiftformat.exe" Checksum="yes" KeyPath="yes" />