From c451d6dd60d5cf02ff718ee440ccf9a85ee671a8 Mon Sep 17 00:00:00 2001
From: David Pinedo <david@lunarg.com>
Date: Fri, 3 Jun 2016 18:32:58 -0600
Subject: winrtinstaller: add more logging debug code to powershell script
 invocation

---
 windowsRuntimeInstaller/InstallerRT.nsi | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/windowsRuntimeInstaller/InstallerRT.nsi b/windowsRuntimeInstaller/InstallerRT.nsi
index 077beaea..6421c00a 100644
--- a/windowsRuntimeInstaller/InstallerRT.nsi
+++ b/windowsRuntimeInstaller/InstallerRT.nsi
@@ -415,6 +415,7 @@ Section
         pop $0
         Rename "$TEMP\ConfigLayersAndVulkanDLL.log" "$TEMP\VulkanRTinstall\ConfigLayersAndVulkanDLL.log"
         ${If} $0 != 0
+            LogText "ConfigLayersAndVulkanDLL.ps1 return value is $0"
             # PS Script failed, see if we can run a simple ps command and a simple ps script
             nsExec::ExecToStack 'powershell -NoProfile -NoLogo -NonInteractive -WindowStyle Hidden -inputformat none -Command Write-Output Diagnostic0 | Out-File  -encoding ascii -filePath "$TEMP\VulkanRTinstall\Diagnostic0.log"'
             File Diagnostic1.ps1
@@ -449,6 +450,7 @@ Section
         pop $0
         Rename "$TEMP\ConfigLayersAndVulkanDLL.log" "$TEMP\VulkanRTinstall\ConfigLayersAndVulkanDLL.log"
         ${If} $0 != 0
+            LogText "ConfigLayersAndVulkanDLL.ps1 return value is $0"
             # PS Script failed, see if we can run a simple ps command and a simple ps script
             nsExec::ExecToStack 'powershell -NoProfile -NoLogo -NonInteractive -WindowStyle Hidden -inputformat none -Command Write-Output Diagnostic0 | Out-File  -encoding ascii -filePath "$TEMP\VulkanRTinstall\Diagnostic0.log"'
             File Diagnostic1.ps1
@@ -628,7 +630,7 @@ Section "uninstall"
 
     # Finish logging
     LogSet off
-    Rename "$INSTDIR\install.log" "$INSTDIR\Uninstall.log"
+    Rename "$INSTDIR\install.log" "$TEMP\VulkanRTuninstall\Uninstall.log"
 
 SectionEnd
 !endif
@@ -704,7 +706,7 @@ Function un.CheckForError
 
         # Finish logging and move log file to TEMP dir
         LogSet off
-        Delete "$TEMP\VulkanRTuninstall\Uninstall.log"
+        Rename "$INSTDIR\install.log" "$TEMP\VulkanRTuninstall\Uninstall.log"
 
         Quit
     ${EndIf}
-- 
cgit v1.2.3