From: David Pinedo <david@lunarg.com>
Date: Tue, 5 Apr 2016 22:40:08 +0000 (-0600)
Subject: winrtinstaller: fix install dir not being removed on uninstall.
X-Git-Tag: upstream/1.1.92~3388
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fe137a84c19e0a68f29288e9dba6c4b9969cd8c2;p=platform%2Fupstream%2FVulkan-Tools.git

winrtinstaller: fix install dir not being removed on uninstall.

This problem was introduced when logging was added.
---

diff --git a/windowsRuntimeInstaller/InstallerRT.nsi b/windowsRuntimeInstaller/InstallerRT.nsi
index c51c7cc..239634d 100644
--- a/windowsRuntimeInstaller/InstallerRT.nsi
+++ b/windowsRuntimeInstaller/InstallerRT.nsi
@@ -504,13 +504,14 @@ SectionEnd
 !ifdef UNINSTALLER
 Section "uninstall"
 
-    # Turn on logging
-    LogSet on
-
     # Remove contents of temp dir
     SetOutPath "$TEMP\VulkanRT"
     RmDir /R "$TEMP\VulkanRT"
 
+    # Turn on logging
+    StrCpy $INSTDIR $TEMP\VulkanRT
+    LogSet on
+
     # If running on a 64-bit OS machine, disable registry re-direct since we're running as a 32-bit executable.
     ${If} ${RunningX64}
 
@@ -520,7 +521,6 @@ Section "uninstall"
     ${Endif}
 
     # Look up the install dir and remove files from that directory.
-    # We do this so that the uninstaller can be run from any directory.
     ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCTNAME}${PRODUCTVERSION}" "InstallDir"
     StrCpy $IDir $0
 
@@ -657,7 +657,7 @@ Section "uninstall"
 
     # Finish logging and move log file to TEMP dir
     LogSet off
-    Rename "$INSTDIR\install.log" "$TEMP\VulkanRT\Uninstall.log"
+    Rename "$INSTDIR\install.log" "$INSTDIR\Uninstall.log"
 
 SectionEnd
 !endif