diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2018-06-12 17:12:33 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2018-06-12 17:13:17 -0700 |
| commit | 56cc9ac15ce63c81a64537d01ace890bd62b5e79 (patch) | |
| tree | e00033e3c4dbd171758c690d0ae1d3902a0fd9d9 /scripts | |
| parent | f2a8b4f1fbd47b6bb704c029c01fcaa606de3ffa (diff) | |
| download | vcpkg-56cc9ac15ce63c81a64537d01ace890bd62b5e79.tar.gz vcpkg-56cc9ac15ce63c81a64537d01ace890bd62b5e79.zip | |
Make bootstrap.bat parameters match bootstrap.sh
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/bootstrap.ps1 | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 5a6a41943..25a769998 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -1,10 +1,24 @@ [CmdletBinding()] param( - [ValidateNotNullOrEmpty()][string]$disableMetrics = "0", + $badParam, + [Parameter(Mandatory=$False)][switch]$disableMetrics = $false, [Parameter(Mandatory=$False)][string]$withVSPath = "", [Parameter(Mandatory=$False)][string]$withWinSDK = "" ) Set-StrictMode -Version Latest +# Powershell2-compatible way of forcing named-parameters +if ($badParam) +{ + if ($disableMetrics -and $badParam -eq "1") + { + Write-Warning "'disableMetrics 1' is deprecated, please change to 'disableMetrics' (without '1')" + } + else + { + throw "Only named parameters are allowed" + } +} + $scriptsDir = split-path -parent $script:MyInvocation.MyCommand.Definition $withVSPath = $withVSPath -replace "\\$" # Remove potential trailing backslash @@ -306,9 +320,15 @@ $msbuildExe = $msbuildExeWithPlatformToolset[0] $platformToolset = $msbuildExeWithPlatformToolset[1] $windowsSDK = getWindowsSDK -withWinSDK $withWinSDK +$disableMetricsValue = "0" +if ($disableMetrics) +{ + $disableMetricsValue = "1" +} + $arguments = ( "`"/p:VCPKG_VERSION=-nohash`"", -"`"/p:DISABLE_METRICS=$disableMetrics`"", +"`"/p:DISABLE_METRICS=$disableMetricsValue`"", "/p:Configuration=release", "/p:Platform=x86", "/p:PlatformToolset=$platformToolset", |