From a2cebceafec8341fcab0236a3c81a27f935aeb38 Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Tue, 21 Feb 2017 17:42:39 -0800
Subject: Rename findTargetPlatformVersion to getWindowsSDK

---
 scripts/bootstrap.ps1                 |  4 ++--
 scripts/findTargetPlatformVersion.ps1 | 42 -----------------------------------
 scripts/getWindowsSDK.ps1             | 42 +++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 44 deletions(-)
 delete mode 100644 scripts/findTargetPlatformVersion.ps1
 create mode 100644 scripts/getWindowsSDK.ps1

(limited to 'scripts')

diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index 9907e31fb..fea05964b 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -26,8 +26,8 @@ try{
     $msbuildExeWithPlatformToolset = & $scriptsDir\findAnyMSBuildWithCppPlatformToolset.ps1
     $msbuildExe = $msbuildExeWithPlatformToolset[0]
     $platformToolset = $msbuildExeWithPlatformToolset[1]
-    $targetPlatformVersion = & $scriptsDir\findTargetPlatformVersion.ps1
-    & $msbuildExe "/p:VCPKG_VERSION=-$gitHash" "/p:DISABLE_METRICS=$disableMetrics" /p:Configuration=Release /p:Platform=x86 /p:PlatformToolset=$platformToolset /p:TargetPlatformVersion=$targetPlatformVersion /m dirs.proj
+    $windowsSDK = & $scriptsDir\getWindowsSDK.ps1
+    & $msbuildExe "/p:VCPKG_VERSION=-$gitHash" "/p:DISABLE_METRICS=$disableMetrics" /p:Configuration=Release /p:Platform=x86 /p:PlatformToolset=$platformToolset /p:TargetPlatformVersion=$windowsSDK /m dirs.proj
 
     Write-Verbose("Placing vcpkg.exe in the correct location")
 
diff --git a/scripts/findTargetPlatformVersion.ps1 b/scripts/findTargetPlatformVersion.ps1
deleted file mode 100644
index 650e0b4ed..000000000
--- a/scripts/findTargetPlatformVersion.ps1
+++ /dev/null
@@ -1,42 +0,0 @@
-[CmdletBinding()]
-param(
-
-)
-
-$scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
-$programFiles32 = & $scriptsDir\getProgramFiles32bit.ps1
-$programFilesP = & $scriptsDir\getProgramFilesPlatformBitness.ps1
-$CandidateProgramFiles = $programFiles32, $programFilesP
-
-# Windows 10 SDK
-foreach ($ProgramFiles in $CandidateProgramFiles)
-{
-    $folder = "$ProgramFiles\Windows Kits\10\Include"
-    if (!(Test-Path $folder))
-    {
-        continue
-    }
-
-    $win10sdkVersions = @(Get-ChildItem $folder | Where-Object {$_.Name -match "^10"} | Sort-Object)
-    [array]::Reverse($win10sdkVersions) # Newest SDK first
-
-    foreach ($win10sdkV in $win10sdkVersions)
-    {
-        if (Test-Path "$folder\$win10sdkV\um\windows.h")
-        {
-            return $win10sdkV.ToString()
-        }
-    }
-}
-
-# Windows 8.1 SDK
-foreach ($ProgramFiles in $CandidateProgramFiles)
-{
-    $folder = "$ProgramFiles\Windows Kits\8.1\Include"
-    if (Test-Path $folder)
-    {
-        return "8.1"
-    }
-}
-
-throw "Could not detect a Windows SDK / TargetPlatformVersion"
\ No newline at end of file
diff --git a/scripts/getWindowsSDK.ps1 b/scripts/getWindowsSDK.ps1
new file mode 100644
index 000000000..650e0b4ed
--- /dev/null
+++ b/scripts/getWindowsSDK.ps1
@@ -0,0 +1,42 @@
+[CmdletBinding()]
+param(
+
+)
+
+$scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
+$programFiles32 = & $scriptsDir\getProgramFiles32bit.ps1
+$programFilesP = & $scriptsDir\getProgramFilesPlatformBitness.ps1
+$CandidateProgramFiles = $programFiles32, $programFilesP
+
+# Windows 10 SDK
+foreach ($ProgramFiles in $CandidateProgramFiles)
+{
+    $folder = "$ProgramFiles\Windows Kits\10\Include"
+    if (!(Test-Path $folder))
+    {
+        continue
+    }
+
+    $win10sdkVersions = @(Get-ChildItem $folder | Where-Object {$_.Name -match "^10"} | Sort-Object)
+    [array]::Reverse($win10sdkVersions) # Newest SDK first
+
+    foreach ($win10sdkV in $win10sdkVersions)
+    {
+        if (Test-Path "$folder\$win10sdkV\um\windows.h")
+        {
+            return $win10sdkV.ToString()
+        }
+    }
+}
+
+# Windows 8.1 SDK
+foreach ($ProgramFiles in $CandidateProgramFiles)
+{
+    $folder = "$ProgramFiles\Windows Kits\8.1\Include"
+    if (Test-Path $folder)
+    {
+        return "8.1"
+    }
+}
+
+throw "Could not detect a Windows SDK / TargetPlatformVersion"
\ No newline at end of file
-- 
cgit v1.2.3