[opencv] 157/251: winrt: update script for MSVS2017 / SDK 10.0

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 3.3.0
in repository opencv.

commit 1081cee35f3702a533b686090d21fdef1db620e1
Author: Alexander Alekhin <alexander.alekhin at intel.com>
Date:   Wed Jul 26 12:02:43 2017 +0300

    winrt: update script for MSVS2017 / SDK 10.0
---
 platforms/winrt/setup_winrt.ps1 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/platforms/winrt/setup_winrt.ps1 b/platforms/winrt/setup_winrt.ps1
index 47a9946..ca62a71 100644
--- a/platforms/winrt/setup_winrt.ps1
+++ b/platforms/winrt/setup_winrt.ps1
@@ -58,8 +58,8 @@ Param(
     [parameter(Mandatory=$False)]
     [String]
     [ValidateNotNull()]
-    [ValidateSet("Visual Studio 12 2013","Visual Studio 11 2012")]
-    $GENERATOR = "Visual Studio 12 2013",
+    [ValidateSet("Visual Studio 15 2017","Visual Studio 14 2015","Visual Studio 12 2013","Visual Studio 11 2012")]
+    $GENERATOR = "Visual Studio 15 2017",
 
     [parameter(Mandatory=$False)]
     [String]
@@ -168,11 +168,11 @@ Function Execute() {
     $versions = New-Object System.Collections.ArrayList
     $VERSIONS_IN.Split("," ,[System.StringSplitOptions]::RemoveEmptyEntries) | ForEach {
         $_ = $_.Trim()
-        if ("8.0","8.1" -Contains $_) {
+        if ("8.0","8.1","10.0" -Contains $_) {
             [void]$versions.Add($_)
             D "$_ is valid"
         } else {
-            Throw "$($_) is not valid! Please use 8.0, 8.1"
+            Throw "$($_) is not valid! Please use 8.0, 8.1, 10.0"
         }
     }
     D "Processed Versions: $versions"
@@ -345,7 +345,7 @@ Function ShowHelp() {
     Write-Host "     setup_winrt -b 'WP' 'x86,ARM' -test PERF "
     Write-Host "     setup_winrt -architecture x86 -platform WP "
     Write-Host "     setup_winrt -arc x86 -plat 'WP,WS' "
-    Write-Host "     setup_winrt -a x86 -g 'Visual Studio 11 2012' -pl WP "
+    Write-Host "     setup_winrt -a x86 -g 'Visual Studio 15 2017' -pl WP "
     Write-Host " WHERE: "
     Write-Host "     options -  Options to call "
     Write-Host "                 -h: diplays command line help "
@@ -358,7 +358,7 @@ Function ShowHelp() {
     Write-Host "     version - Array of platform versions. "
     Write-Host "                 Default: 8.1 "
     Write-Host "                 Example: '8.0,8.1' "
-    Write-Host "                 Options: 8.0, 8.1. Available options may be limited depending on your local setup (e.g. SDK availability). "
+    Write-Host "                 Options: 8.0, 8.1, 10.0. Available options may be limited depending on your local setup (e.g. SDK availability). "
     Write-Host "                 Note that you'll need to use quotes to specify more than one version. "
     Write-Host "     architecture - Array of target architectures to build for. "
     Write-Host "                 Default: x86 "

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git