From 969323e33092bc7bf89153e4c3d8f950d57d3e41 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Tue, 20 Jun 2023 15:05:00 -0400
Subject: [PATCH] Windows: correct mistakes in the build rules (#1472)

- 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
---
 Platforms/Windows/SwiftFormat.wixproj | 2 +-
 Platforms/Windows/SwiftFormat.wxs     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Platforms/Windows/SwiftFormat.wixproj b/Platforms/Windows/SwiftFormat.wixproj
index 10c05fd7..eeb31502 100644
--- a/Platforms/Windows/SwiftFormat.wixproj
+++ b/Platforms/Windows/SwiftFormat.wixproj
@@ -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' ">
diff --git a/Platforms/Windows/SwiftFormat.wxs b/Platforms/Windows/SwiftFormat.wxs
index 2ef366c7..5b04b9ed 100644
--- a/Platforms/Windows/SwiftFormat.wxs
+++ b/Platforms/Windows/SwiftFormat.wxs
@@ -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" />