diff --git a/utils/build-windows-toolchain.bat b/utils/build-windows-toolchain.bat index 1c94847261a21..ab8e9d015bb2e 100644 --- a/utils/build-windows-toolchain.bat +++ b/utils/build-windows-toolchain.bat @@ -20,6 +20,7 @@ mkdir %TEMP% 2>&1 1>nul echo set PYTHON_HOME=%PYTHON_HOME%> %TEMP%\call-build.cmd echo set SKIP_TESTS=%SKIP_TESTS%>> %TEMP%\call-build.cmd echo set SKIP_PACKAGING=%SKIP_PACKAGING%>> %TEMP%\call-build.cmd +echo set SKIP_EXPERIMENTAL_SDK=%SKIP_EXPERIMENTAL_SDK%>> %TEMP%\call-build.cmd echo set SKIP_UPDATE_CHECKOUT=%SKIP_UPDATE_CHECKOUT%>> %TEMP%\call-build.cmd echo set REPO_SCHEME=%REPO_SCHEME%>> %TEMP%\call-build.cmd echo set WINDOWS_SDKS=%WINDOWS_SDKS%>> %TEMP%\call-build.cmd @@ -73,6 +74,10 @@ if not "%SKIP_PACKAGING%"=="1" set "SkipPackagingArg= " set "WindowsSDKsArg= " if not "%WINDOWS_SDKS%"=="" set "WindowsSDKsArg=-WindowsSDKs %WINDOWS_SDKS%" +:: Build the -SkipExperimentalSDK argument, if any +set SkipExperimentalSDKArg=-SkipExperimentalSDK +if not "%SKIP_EXPERIMENTAL_SDK%"=="1" set "SkipExperimentalSDKArg= " + call :CloneRepositories || (exit /b 1) :: We only have write access to BuildRoot, so use that as the image root. @@ -81,6 +86,7 @@ powershell.exe -ExecutionPolicy RemoteSigned -File %~dp0build.ps1 ^ -BinaryCache %BuildRoot% ^ -ImageRoot %BuildRoot% ^ %SkipPackagingArg% ^ + %SkipExperimentalSDKArg% ^ %WindowsSDKsArg% ^ %TestArg% ^ -Stage %PackageRoot% ^ diff --git a/utils/build.ps1 b/utils/build.ps1 index 35b32049e3218..ad089424e3200 100644 --- a/utils/build.ps1 +++ b/utils/build.ps1 @@ -70,7 +70,10 @@ This component is currently only supported in Android builds. If set, does not run the build phase. .PARAMETER SkipPackaging -If set, skips building the msi's and installer +If set, skips building the msi's and installer. + +.PARAMETER SkipExperimentalSDK +If set, skips building the experimental SDKs. .PARAMETER DebugInfo If set, debug information will be generated for the builds. @@ -137,6 +140,7 @@ param [switch] $Android = $false, [switch] $SkipBuild = $false, [switch] $SkipPackaging = $false, + [switch] $SkipExperimentalSDK = $false, [switch] $IncludeDS2 = $false, [string[]] $Test = @(), [string] $Stage = "", @@ -2942,6 +2946,9 @@ function Build-SDK([Hashtable] $Platform, [switch] $IncludeMacros = $false) { } function Build-ExperimentalSDK([Hashtable] $Platform) { + if ($SkipExperimentalSDK) { + return + } # TODO(compnerd) we currently build the experimental SDK with just the static # variant. We should aim to build both dynamic and static variants. Invoke-BuildStep Build-ExperimentalRuntime $Platform -Static