From fa0f6af356637d99c55d73f089ec6028e1da0fd5 Mon Sep 17 00:00:00 2001
From: Pascal Muetschard <pmuetschard@google.com>
Date: Thu, 27 Jul 2017 14:14:43 -0700
Subject: [PATCH] Fix MSI installer to actually respect user picked location.

---
 kokoro/windows/build.bat | 2 +-
 kokoro/windows/gapid.wxs | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/kokoro/windows/build.bat b/kokoro/windows/build.bat
index 59309c465f..bc92c6eb28 100644
--- a/kokoro/windows/build.bat
+++ b/kokoro/windows/build.bat
@@ -95,7 +95,7 @@ zip -r gapid-%VERSION%-windows.zip gapid
 
 REM Create an MSI installer.
 copy %SRC%\kokoro\windows\gapid.wxs .
-%WIX%\heat.exe dir gapid -ag -cg gapid -dr gapid -template fragment -sreg -sfrag -srd -o component.wxs
+%WIX%\heat.exe dir gapid -ag -cg gapid -dr GAPID -template fragment -sreg -sfrag -srd -o component.wxs
 %WIX%\candle.exe gapid.wxs component.wxs
 %WIX%\light.exe gapid.wixobj component.wixobj -b gapid -ext WixUIExtension -cultures:en-us -o gapid-%VERSION%.msi
 
diff --git a/kokoro/windows/gapid.wxs b/kokoro/windows/gapid.wxs
index 4fd6ee2859..1d36a8a20b 100644
--- a/kokoro/windows/gapid.wxs
+++ b/kokoro/windows/gapid.wxs
@@ -24,15 +24,14 @@
     <MediaTemplate EmbedCab="yes" />
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder" Name="PFiles">
-        <Directory Id="gapid" Name="gapid">
-        </Directory>
+        <Directory Id="GAPID" Name="gapid" />
       </Directory>
     </Directory>
     <Feature Id="GAPID"  Title="Graphics API Debugger" Level="1">
       <ComponentGroupRef Id="gapid" />
     </Feature>
 
-    <Property Id="WIXUI_INSTALLDIR" Value="gapid" />
+    <Property Id="WIXUI_INSTALLDIR" Value="GAPID" />
     <!-- From WixUI_InstallDir.wxs - without a license dialog -->
     <UI Id="gapid">
       <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />