windowsrtinstaller: Change lincense info.
Also removed extra white space.
diff --git a/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1 b/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1
index f1c6c0a..5cc5cfb 100644
--- a/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1
+++ b/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1
@@ -1,27 +1,35 @@
+# Copyright (c) 2015-2016 The Khronos Group Inc.
+# Copyright (c) 2015-2016 Valve Corporation
+# Copyright (c) 2015-2016 LunarG, Inc.
#
-# Copyright (C) 2016 Valve Corporation
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and/or associated documentation files (the "Materials"), to
+# deal in the Materials without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Materials, and to permit persons to whom the Materials are
+# furnished to do so, subject to the following conditions:
#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
+# The above copyright notice(s) and this permission notice shall be included in
+# all copies or substantial portions of the Materials.
#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
+# The Materials are Confidential Information as defined by the Khronos
+# Membership Agreement until designated non-confidential by Khronos, at which
+# point this condition clause shall be removed.
#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+#
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE
+# USE OR OTHER DEALINGS IN THE MATERIALS.
#
# Author: David Pinedo <david@LunarG.com>
+# Author: Mark Young <mark@LunarG.com>
#
+
# This Powershell script is used by the Vulkan Run Time Installer/Uninstaller to:
# - Copy the most recent vulkan-<majorabi>-*.dll in C:\Windows\System32
# to vulkan-<majorabi>.dll
@@ -78,10 +86,10 @@
{
# Push the current path on the stack and go to $dir
Push-Location -Path $dir
-
+
# Create a list for all the DLLs in the folder
$VulkanDllList=@()
-
+
# Find all DLL objects in this directory
dir -name vulkan-$majorabi-*.dll |
ForEach-Object {
@@ -159,7 +167,7 @@
$mrVulkaninfo=$mrVulkanDll -replace ".dll",".exe"
$mrVulkaninfo=$mrVulkaninfo -replace "vulkan","vulkaninfo"
copy $mrVulkaninfo vulkaninfo.exe
-
+
# Create the name used in the registry for the SDK associated with $mrVulkanDll.
$major=$VulkanDLLList[-1].Split('@')[1]
$minor=$VulkanDLLList[-1].Split('@')[2]
@@ -167,7 +175,7 @@
$buildno=$VulkanDLLList[-1].Split('@')[4]
$prerelease=$VulkanDLLList[-1].Split('@')[5]
$prebuildno=$VulkanDLLList[-1].Split('@')[6]
-
+
$sdktempname="VulkanSDK"+$major + "." + $minor + "." + $patch + "." + $buildno
if ($prerelease -ne "") {
$sdktempname=$sdktempname + "." + $prerelease
@@ -176,7 +184,7 @@
$sdktempname=$sdktempname + "." + $prebuildno
}
}
-
+
# Return to our previous folder
Pop-Location
@@ -201,7 +209,7 @@
$mrVulkanDllInstallDir=""
$VulkanSdkDirs=@()
-Get-ChildItem -Path Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall |
+Get-ChildItem -Path Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall |
ForEach-Object {
$regkey=$_ -replace ".*\\",""
if ($_ -match "\\VulkanSDK") {
diff --git a/windowsRuntimeInstaller/InstallerRT.nsi b/windowsRuntimeInstaller/InstallerRT.nsi
index 12834fe..d4d6834 100644
--- a/windowsRuntimeInstaller/InstallerRT.nsi
+++ b/windowsRuntimeInstaller/InstallerRT.nsi
@@ -1,26 +1,34 @@
# NSIS Script for creating the Windows Vulkan RT installer.
#
-# Copyright (C) 2016 Valve Corporation
+# Copyright (c) 2015-2016 The Khronos Group Inc.
+# Copyright (c) 2015-2016 Valve Corporation
+# Copyright (c) 2015-2016 LunarG, Inc.
#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and/or associated documentation files (the "Materials"), to
+# deal in the Materials without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Materials, and to permit persons to whom the Materials are
+# furnished to do so, subject to the following conditions:
#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
+# The above copyright notice(s) and this permission notice shall be included in
+# all copies or substantial portions of the Materials.
#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# The Materials are Confidential Information as defined by the Khronos
+# Membership Agreement until designated non-confidential by Khronos, at which
+# point this condition clause shall be removed.
+#
+# THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
#
-# Author: David Pinedo <david@lunarg.com>
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE
+# USE OR OTHER DEALINGS IN THE MATERIALS.
+#
+# Author: David Pinedo <david@LunarG.com>
+# Author: Mark Young <mark@LunarG.com>
#
@@ -173,7 +181,7 @@
RequestExecutionLevel admin
Function .onInit
-
+
FunctionEnd
AddBrandingImage left 150
@@ -214,7 +222,7 @@
# The reference count is stored in the regisry value IC
ReadRegDword $1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCTNAME}${PRODUCTVERSION}" "InstallCount"
IntOp $1 $1 + 1
-
+
# If the registry entry isn't there, it will throw an error as well as return a blank value. So, clear the errors.
${If} ${Errors}
ClearErrors
@@ -308,7 +316,7 @@
SetOutPath "$TEMP"
# If running on a 64-bit OS machine, we need to install the 64-bit Visual Studio re-distributable
${If} ${RunningX64}
-
+
File vcredist_x64.exe
ExecWait '"$TEMP\vcredist_x64.exe" /passive /norestart'
@@ -318,9 +326,9 @@
File vcredist_x86.exe
ExecWait '"$TEMP\vcredist_x86.exe" /passive /norestart'
- ${Endif}
+ ${Endif}
RedistributablesInstalled:
-
+
Call UninstallIfError
SectionEnd
@@ -438,9 +446,9 @@
IfRebootFlag 0 noreboot
MessageBox MB_YESNO "A reboot is required to finish the uninstall. Do you wish to reboot now?" /SD IDNO IDNO returnerror
Reboot
-
+
returnerror:
-
+
# Set an error message to output because we should reboot but didn't (whether because silent uninstall or user choice)
SetErrorLevel 3 # ERROR_TOO_MANY_OPEN_FILES