From f331d6dfe4c9cc696e0cfbbf1cba6dcfa2c179d2 Mon Sep 17 00:00:00 2001
From: David Pinedo <david@lunarg.com>
Date: Fri, 29 Jan 2016 12:20:49 -0700
Subject: windowsrtinstaller: change licensing and change logo displayed in UI

---
 windowsRuntimeInstaller/InstallerRT.nsi      |  11 ++++++++---
 windowsRuntimeInstaller/LICENSE.rtf          | Bin 1700 -> 0 bytes
 windowsRuntimeInstaller/VULKANRT_LICENSE.rtf | Bin 0 -> 2276 bytes
 windowsRuntimeInstaller/VulkanLogo.bmp       | Bin 16950 -> 27626 bytes
 4 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 windowsRuntimeInstaller/LICENSE.rtf
 create mode 100644 windowsRuntimeInstaller/VULKANRT_LICENSE.rtf

diff --git a/windowsRuntimeInstaller/InstallerRT.nsi b/windowsRuntimeInstaller/InstallerRT.nsi
index 80cb6274..6c711388 100644
--- a/windowsRuntimeInstaller/InstallerRT.nsi
+++ b/windowsRuntimeInstaller/InstallerRT.nsi
@@ -180,7 +180,9 @@ RequestExecutionLevel admin
 AddBrandingImage left 150
 Caption "${PRODUCTNAME} ${PRODUCTVERSION} Setup"
 Name "${PRODUCTNAME} ${PRODUCTVERSION}"
+LIcenseData "VULKANRT_LICENSE.rtf"
 Page custom brandimage "" ": Brand Image"
+Page license
 Page directory
 Page instfiles
 UninstallCaption "\${PRODUCTNAME} ${PRODUCTVERSION} Uninstall"
@@ -232,7 +234,8 @@ Section
 
         SetOutPath "$INSTDIR"
         File ${ICOFILE}
-        File LICENSE.rtf
+        FILE VULKANRT_LICENSE.RTF
+        File ..\LICENSE.txt
         File ConfigLayersAndVulkanDLL.ps1
 
         # Run the ConfigLayersAndVulkanDLL.ps1 script to copy the most recent version of
@@ -263,7 +266,8 @@ Section
 
         SetOutPath "$INSTDIR"
         File ${ICOFILE}
-        File LICENSE.rtf
+        File VULKANRT_LICENSE.rtf
+        File ..\LICENSE.txt
         File ConfigLayersAndVulkanDLL.ps1
 
         # Run the ConfigLayersAndVulkanDLL.ps1 script to copy the most recent version of
@@ -402,7 +406,8 @@ Section "uninstall"
         DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCTNAME}${PRODUCTVERSION}"
 
         # Remove files in install dir
-        Delete /REBOOTOK "$INSTDIR\LICENSE.rtf"
+        Delete /REBOOTOK "$INSTDIR\VULKANRT_LICENSE.rtf"
+        Delete /REBOOTOK "$INSTDIR\LICENSE.txt"
         Delete /REBOOTOK "$INSTDIR\UninstallVulkanRT.exe"
         Delete /REBOOTOK "$INSTDIR\Vulkan.ico"
         Delete /REBOOTOK "$INSTDIR\ConfigLayersAndVulkanDLL.ps1"
diff --git a/windowsRuntimeInstaller/LICENSE.rtf b/windowsRuntimeInstaller/LICENSE.rtf
deleted file mode 100644
index 6a179698..00000000
Binary files a/windowsRuntimeInstaller/LICENSE.rtf and /dev/null differ
diff --git a/windowsRuntimeInstaller/VULKANRT_LICENSE.rtf b/windowsRuntimeInstaller/VULKANRT_LICENSE.rtf
new file mode 100644
index 00000000..2b8840c3
Binary files /dev/null and b/windowsRuntimeInstaller/VULKANRT_LICENSE.rtf differ
diff --git a/windowsRuntimeInstaller/VulkanLogo.bmp b/windowsRuntimeInstaller/VulkanLogo.bmp
index 37894027..07e792ba 100644
Binary files a/windowsRuntimeInstaller/VulkanLogo.bmp and b/windowsRuntimeInstaller/VulkanLogo.bmp differ
-- 
cgit v1.2.3