From 3a247ee82a33aab155e4db3820034a80d3022bb3 Mon Sep 17 00:00:00 2001
From: David Pinedo <david@lunarg.com>
Date: Mon, 4 Apr 2016 11:43:50 -0600
Subject: winrtinstaller: sort in config script: <prerelease> is least
 significant

Also added execute permission to CreateInstallerRT.sh
---
 windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1 | 10 ++++++----
 windowsRuntimeInstaller/CreateInstallerRT.sh         |  0
 2 files changed, 6 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 windowsRuntimeInstaller/CreateInstallerRT.sh

(limited to 'windowsRuntimeInstaller')

diff --git a/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1 b/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1
index 9df6a26f..08768ccf 100644
--- a/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1
+++ b/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1
@@ -86,14 +86,16 @@ function notNumeric ($x) {
 # We first create an array, with one array element for each vulkan-*dll in
 # C:\Windows\System32 (and C:\Windows\SysWOW64 on 64-bit systems), with each element
 # containing:
-#    <major>=<minor>=<patch>=<buildno>=<prerelease>=<prebuildno>=
+#    <major>=<minor>=<patch>=<buildno>=<prebuildno>=<prerelease>=
 #     filename
 #    @<major>@<minor>@<patch>@<buildno>@<prerelease>@<prebuildno>@
 # [Note that the above three lines are one element in the array.]
 # The build identifiers separated by "=" are suitable for sorting, i.e.
 # expanded to 10 digits with leading 0s. If <prerelease> or <prebuildno> are
 # not specified, "zzzzzzzzzz" is substituted for them, so that they sort
-# to a position after those that do specify them.
+# to a position after those that do specify them. Note that <prerelease>
+# is "less significant" in the sort than <prebuildno>, and that <prerelease> is
+# always treated as an alpha string, even though it may contain numeric characters.
 # The build identifiers separated by "@" are the original values extracted
 # from the file name. They are used later to find the path to the SDK
 # install directory for the given filename.
@@ -206,12 +208,12 @@ function UpdateVulkanSysFolder([string]$dir, [int]$writeSdkName)
        $minor = $minor.padleft(10,'0')
        $patch = $patch.padleft(10,'0')
        $buildno = $buildno.padleft(10,'0')
-       $prerelease = $prerelease.padleft(10,'0')
+       $prerelease = $prerelease.padright(10,'z')
        $prebuildno = $prebuildno.padleft(10,'0')
 
        # Add a new element to the $VulkanDllList array
        echo "Adding $_ to Vulkan dll list " >>$log
-       $script:VulkanDllList+="$major=$minor=$patch=$buildno=$prerelease=$prebuildno= $_ @$majorOrig@$minorOrig@$patchOrig@$buildnoOrig@$prereleaseOrig@$prebuildnoOrig@"
+       $script:VulkanDllList+="$major=$minor=$patch=$buildno=$prebuildno=$prerelease= $_ @$majorOrig@$minorOrig@$patchOrig@$buildnoOrig@$prereleaseOrig@$prebuildnoOrig@"
    }
 
     # If $VulkanDllList contains at least one element, there's at least one vulkan*.dll file.
diff --git a/windowsRuntimeInstaller/CreateInstallerRT.sh b/windowsRuntimeInstaller/CreateInstallerRT.sh
old mode 100644
new mode 100755
-- 
cgit v1.2.3