From: David Pinedo <david@lunarg.com>
Date: Fri, 29 Jan 2016 19:20:49 +0000 (-0700)
Subject: windowsrtinstaller: change licensing and change logo displayed in UI
X-Git-Tag: upstream/1.1.92~3957
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f331d6dfe4c9cc696e0cfbbf1cba6dcfa2c179d2;p=platform%2Fupstream%2FVulkan-Tools.git

windowsrtinstaller: change licensing and change logo displayed in UI
---

diff --git a/windowsRuntimeInstaller/InstallerRT.nsi b/windowsRuntimeInstaller/InstallerRT.nsi
index 80cb627..6c71138 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 6a17969..0000000
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 0000000..2b8840c
Binary files /dev/null and b/windowsRuntimeInstaller/VULKANRT_LICENSE.rtf differ
diff --git a/windowsRuntimeInstaller/VulkanLogo.bmp b/windowsRuntimeInstaller/VulkanLogo.bmp
index 3789402..07e792b 100644
Binary files a/windowsRuntimeInstaller/VulkanLogo.bmp and b/windowsRuntimeInstaller/VulkanLogo.bmp differ