X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build.cmd;h=bd6d355fd941d6163ccc08df5a0ee19a54dfd8e9;hb=b8f926288af2f8deef09835d97d66a5f9bfda082;hp=ebc789bcc2fd40ab86303cf543e88015c1587d2d;hpb=c82bd22d4bab4369c0989a1c2ca2758d29a0da36;p=platform%2Fupstream%2Fcoreclr.git diff --git a/build.cmd b/build.cmd index ebc789b..bd6d355 100644 --- a/build.cmd +++ b/build.cmd @@ -6,20 +6,21 @@ setlocal EnableDelayedExpansion EnableExtensions set "__MsgPrefix=BUILD: " echo %__MsgPrefix%Starting Build at %TIME% + set __ThisScriptFull="%~f0" set __ThisScriptDir="%~dp0" call "%__ThisScriptDir%"\setup_vs_tools.cmd if NOT '%ERRORLEVEL%' == '0' exit /b 1 -if defined VS150COMNTOOLS ( - set "__VSToolsRoot=%VS150COMNTOOLS%" - set "__VCToolsRoot=%VS150COMNTOOLS%\..\..\VC\Auxiliary\Build" - set __VSVersion=vs2017 -) else ( - set "__VSToolsRoot=%VS140COMNTOOLS%" - set "__VCToolsRoot=%VS140COMNTOOLS%\..\..\VC" - set __VSVersion=vs2015 +if defined VS160COMNTOOLS ( + set "__VSToolsRoot=%VS160COMNTOOLS%" + set "__VCToolsRoot=%VS160COMNTOOLS%\..\..\VC\Auxiliary\Build" + set __VSVersion=vs2019 +) else if defined VS150COMNTOOLS ( + set "__VSToolsRoot=%VS150COMNTOOLS%" + set "__VCToolsRoot=%VS150COMNTOOLS%\..\..\VC\Auxiliary\Build" + set __VSVersion=vs2017 ) :: Work around Jenkins CI + msbuild problem: Jenkins sometimes creates very large environment @@ -57,8 +58,7 @@ set "__PackagesDir=%DotNetRestorePackagesPath%" if [%__PackagesDir%]==[] set "__PackagesDir=%__ProjectDir%\packages" set "__RootBinDir=%__ProjectDir%\bin" set "__LogsDir=%__RootBinDir%\Logs" -set "__PgoOptDataVersion=" -set "__IbcOptDataVersion=" +set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs" set __BuildAll= @@ -75,6 +75,8 @@ set __PgoInstrument=0 set __PgoOptimize=1 set __EnforcePgo=0 set __IbcTuning= +set __IbcOptimize=0 +set __IbcOnly=0 REM __PassThroughArgs is a set of things that will be passed through to nested calls to build.cmd REM when using "all". @@ -84,11 +86,13 @@ REM __UnprocessedBuildArgs are args that we pass to msbuild (e.g. /p:__BuildArch set "__args= %*" set processedArgs= set __UnprocessedBuildArgs= -set __RunArgs= +set __CommonMSBuildArgs= set __BuildCoreLib=1 set __BuildSOS=1 set __BuildNative=1 +set __BuildCrossArchNative=0 +set __SkipCrossArchNative=0 set __BuildTests=1 set __BuildPackages=1 set __BuildNativeCoreLib=1 @@ -96,6 +100,13 @@ set __BuildManagedTools=1 set __RestoreOptData=1 set __GenerateLayout=0 set __CrossgenAltJit= +set __SkipRestoreArg= +set __OfficialBuildIdArg= +set __CrossArch= +set __SkipNugetPackage=0 +set __PgoOptDataVersion= +set __IbcOptDataVersion= +set __IbcMergeVersion= @REM CMD has a nasty habit of eating "=" on the argument list, so passing: @REM -priority=1 @@ -106,12 +117,14 @@ set __Priority= :Arg_Loop if "%1" == "" goto ArgsDone -if /i "%1" == "-?" goto Usage -if /i "%1" == "-h" goto Usage -if /i "%1" == "-help" goto Usage +if /i "%1" == "/?" goto Usage +if /i "%1" == "-?" goto Usage +if /i "%1" == "/h" goto Usage +if /i "%1" == "-h" goto Usage +if /i "%1" == "/help" goto Usage +if /i "%1" == "-help" goto Usage if /i "%1" == "--help" goto Usage - if /i "%1" == "-all" (set __BuildAll=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "-x64" (set __BuildArchX64=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "-x86" (set __BuildArchX86=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) @@ -165,16 +178,22 @@ if /i "%1" == "-configureonly" (set __ConfigureOnly=1&set __BuildNative=1& if /i "%1" == "-skipconfigure" (set __SkipConfigure=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "-skipmscorlib" (set __BuildCoreLib=0&set __BuildNativeCoreLib=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "-skipnative" (set __BuildNative=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) +if /i "%1" == "-skipcrossarchnative" (set __SkipCrossArchNative=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "-skiptests" (set __BuildTests=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "-skipbuildpackages" (set __BuildPackages=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "-skiprestoreoptdata" (set __RestoreOptData=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) +if /i "%1" == "-generatelayout" (set __GenerateLayout=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "-usenmakemakefiles" (set __NMakeMakefiles=1&set __ConfigureOnly=1&set __BuildNative=1&set __BuildNativeCoreLib=0&set __BuildCoreLib=0&set __BuildTests=0&set __BuildPackages=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "-pgoinstrument" (set __PgoInstrument=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "-enforcepgo" (set __EnforcePgo=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "-nopgooptimize" (set __PgoOptimize=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) +if /i "%1" == "-ibcoptimize" (set __IbcOptimize=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) +if /i "%1" == "-ibconly" (set __IbcOptimize=1&set __IbcOnly=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "-ibcinstrument" (set __IbcTuning=/Tuning&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) -if /i "%1" == "-toolset_dir" (set __ToolsetDir=%2&set __PassThroughArgs=%__PassThroughArgs% %2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop) if /i "%1" == "-crossgenaltjit" (set __CrossgenAltJit=%2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop) +REM TODO remove these once they are no longer used in buildpipeline +if /i "%1" == "-skiprestore" (set __SkipRestoreArg=/p:RestoreDuringBuild=false&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) +if /i "%1" == "-OfficialBuildId" (set __OfficialBuildIdArg=/p:OfficialBuildId=%2&set processedArgs=!processedArgs! %1=%2&shift&shift&goto Arg_Loop) REM TODO these are deprecated remove them eventually REM don't add more, use the - syntax instead @@ -188,6 +207,7 @@ if /i "%1" == "configureonly" (set __ConfigureOnly=1&set __BuildNative=1&s if /i "%1" == "skipconfigure" (set __SkipConfigure=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "skipmscorlib" (set __BuildCoreLib=0&set __BuildNativeCoreLib=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "skipnative" (set __BuildNative=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) +if /i "%1" == "skipcrossarchnative" (set __SkipCrossArchNative=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "skiptests" (set __BuildTests=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "skipbuildpackages" (set __BuildPackages=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "skiprestoreoptdata" (set __RestoreOptData=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) @@ -196,16 +216,19 @@ if /i "%1" == "usenmakemakefiles" (set __NMakeMakefiles=1&set __ConfigureOnly= if /i "%1" == "pgoinstrument" (set __PgoInstrument=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "nopgooptimize" (set __PgoOptimize=0&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "enforcepgo" (set __EnforcePgo=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) +if /i "%1" == "ibcoptimize" (set __IbcOptimize=1&set __PartialNgen=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "ibcinstrument" (set __IbcTuning=/Tuning&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) -if /i "%1" == "toolset_dir" (set __ToolsetDir=%2&set __PassThroughArgs=%__PassThroughArgs% %2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop) +if /i "%1" == "crossgenaltjit" (set __CrossgenAltJit=%2&set processedArgs=!processedArgs! %1 %2&shift&shift&goto Arg_Loop) +REM TODO remove this once it's no longer used in buildpipeline +if /i "%1" == "--" (set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if [!processedArgs!]==[] ( - set __UnprocessedBuildArgs=%__args% + set __UnprocessedBuildArgs=%__args% ) else ( - set __UnprocessedBuildArgs=%__args% - for %%t in (!processedArgs!) do ( - set __UnprocessedBuildArgs=!__UnprocessedBuildArgs:*%%t=! - ) + set __UnprocessedBuildArgs=%__args% + for %%t in (!processedArgs!) do ( + set __UnprocessedBuildArgs=!__UnprocessedBuildArgs:*%%t=! + ) ) :ArgsDone @@ -217,11 +240,8 @@ if defined __Priority ( ) else ( set __PassThroughArgs=-priority=%__Priority% ) - set __UnprocessedBuildArgs=!__UnprocessedBuildArgs! -priority=%__Priority% ) -if %__PgoOptimize%==0 set __RestoreOptData=0 - if defined __BuildAll goto BuildAll set /A __TotalSpecifiedBuildArch=__BuildArchX64 + __BuildArchX86 + __BuildArchArm + __BuildArchArm64 @@ -251,7 +271,7 @@ if %__BuildTypeDebug%==1 set __BuildType=Debug if %__BuildTypeChecked%==1 set __BuildType=Checked if %__BuildTypeRelease%==1 set __BuildType=Release -set __RunArgs=-BuildOS=%__BuildOS% -BuildType=%__BuildType% -BuildArch=%__BuildArch% +set __CommonMSBuildArgs=/p:__BuildOS=%__BuildOS% /p:__BuildType=%__BuildType% /p:__BuildArch=%__BuildArch% !__SkipRestoreArg! !__OfficialBuildIdArg! if %__EnforcePgo%==1 ( if %__BuildArchArm%==1 ( @@ -262,24 +282,31 @@ if %__EnforcePgo%==1 ( ) ) -REM Determine if this is a cross-arch build +REM Determine if this is a cross-arch build. Only do cross-arch build if we're also building native. -if /i "%__BuildArch%"=="arm64" ( - set __DoCrossArchBuild=1 +if %__SkipCrossArchNative% EQU 0 ( + if %__BuildNative% EQU 1 ( + if /i "%__BuildArch%"=="arm64" ( + set __BuildCrossArchNative=1 + ) + if /i "%__BuildArch%"=="arm" ( + set __BuildCrossArchNative=1 + ) ) +) -if /i "%__BuildArch%"=="arm" ( - set __DoCrossArchBuild=1 - ) +REM Set the remaining variables based upon the determined build configuration + +if %__PgoOptimize%==0 set __RestoreOptData=0 +if /i %__BuildType% NEQ Release set __RestoreOptData=0 + +REM REVIEW: why no System.Private.CoreLib NuGet package build for ARM64? +if /i "%__BuildArch%"=="arm64" set __SkipNugetPackage=0 -:: Set the remaining variables based upon the determined build configuration set "__BinDir=%__RootBinDir%\Product\%__BuildOS%.%__BuildArch%.%__BuildType%" set "__IntermediatesDir=%__RootBinDir%\obj\%__BuildOS%.%__BuildArch%.%__BuildType%" if "%__NMakeMakefiles%"=="1" (set "__IntermediatesDir=%__RootBinDir%\nmakeobj\%__BuildOS%.%__BuildArch%.%__BuildType%") set "__PackagesBinDir=%__BinDir%\.nuget" -set "__TestRootDir=%__RootBinDir%\tests" -set "__TestBinDir=%__TestRootDir%\%__BuildOS%.%__BuildArch%.%__BuildType%" -set "__TestIntermediatesDir=%__RootBinDir%\tests\obj\%__BuildOS%.%__BuildArch%.%__BuildType%" set "__CrossComponentBinDir=%__BinDir%" set "__CrossCompIntermediatesDir=%__IntermediatesDir%\crossgen" @@ -288,34 +315,46 @@ if NOT "%__CrossArch%" == "" set __CrossComponentBinDir=%__CrossComponentBinDir% set "__CrossGenCoreLibLog=%__LogsDir%\CrossgenCoreLib_%__BuildOS%__%__BuildArch%__%__BuildType%.log" set "__CrossgenExe=%__CrossComponentBinDir%\crossgen.exe" -:: Generate path to be set for CMAKE_INSTALL_PREFIX to contain forward slash +REM Generate path to be set for CMAKE_INSTALL_PREFIX to contain forward slash set "__CMakeBinDir=%__BinDir%" set "__CMakeBinDir=%__CMakeBinDir:\=/%" -if not exist "%__BinDir%" md "%__BinDir%" -if not exist "%__IntermediatesDir%" md "%__IntermediatesDir%" -if not exist "%__LogsDir%" md "%__LogsDir%" +if not exist "%__BinDir%" md "%__BinDir%" +if not exist "%__IntermediatesDir%" md "%__IntermediatesDir%" +if not exist "%__LogsDir%" md "%__LogsDir%" +if not exist "%__MsbuildDebugLogsDir%" md "%__MsbuildDebugLogsDir%" + +REM Set up the directory for MSBuild debug logs. +set MSBUILDDEBUGPATH=%__MsbuildDebugLogsDir% REM It is convenient to have your Nuget search path include the location where the build REM will place packages. However nuget used during the build will fail if that directory REM does not exist. Avoid this in at least one case by aggressively creating the directory. if not exist "%__BinDir%\.nuget\pkg" md "%__BinDir%\.nuget\pkg" -echo %__MsgPrefix%Commencing CoreCLR Repo build +echo %__MsgPrefix%Commencing CoreCLR product build -:: Set the remaining variables based upon the determined build configuration +REM Set the remaining variables based upon the determined build configuration echo %__MsgPrefix%Checking prerequisites -:: Eval the output from probe-win1.ps1 -for /f "delims=" %%a in ('powershell -NoProfile -ExecutionPolicy ByPass "& ""%__SourceDir%\pal\tools\probe-win.ps1"""') do %%a + +set __CMakeNeeded=1 +if %__BuildNative%==0 if %__BuildNativeCoreLib%==0 if %__BuildTests%==0 set __CMakeNeeded=0 +if %__CMakeNeeded%==1 ( + REM Eval the output from set-cmake-path.ps1 + for /f "delims=" %%a in ('powershell -NoProfile -ExecutionPolicy ByPass "& ""%__SourceDir%\pal\tools\set-cmake-path.ps1"""') do %%a + REM echo Using CMake from %CMakePath% +) REM NumberOfCores is an WMI property providing number of physical cores on machine REM processor(s). It is used to set optimal level of CL parallelism during native build step if not defined NumberOfCores ( -REM Determine number of physical processor cores available on machine -for /f "tokens=*" %%I in ( - 'wmic cpu get NumberOfCores /value ^| find "=" 2^>NUL' - ) do set %%I + REM Determine number of physical processor cores available on machine + set TotalNumberOfCores=0 + for /f "tokens=*" %%I in ( + 'wmic cpu get NumberOfCores /value ^| find "=" 2^>NUL' + ) do set %%I & set /a TotalNumberOfCores=TotalNumberOfCores+NumberOfCores + set NumberOfCores=!TotalNumberOfCores! ) echo %__MsgPrefix%Number of processor cores %NumberOfCores% @@ -327,7 +366,12 @@ REM ============================================================================ @if defined _echo @echo on -@call %__ProjectDir%\run.cmd build -Project=%__ProjectDir%\build.proj -generateHeaderWindows -NativeVersionHeaderFile="%__RootBinDir%\obj\_version.h" %__RunArgs% %__UnprocessedBuildArgs% +call %__ProjectDir%\dotnet.cmd msbuild /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ + /l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^ + /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^ + /p:UsePartialNGENOptimization=false /maxcpucount^ + %__ProjectDir%\build.proj /t:GenerateVersionHeader /p:GenerateVersionHeader=true /p:NativeVersionHeaderFile="%__RootBinDir%\obj\_version.h"^ + %__CommonMSBuildArgs% %__UnprocessedBuildArgs% REM ========================================================================================= REM === @@ -335,9 +379,13 @@ REM === Restore optimization profile data REM === REM ========================================================================================= -if %__RestoreOptData% EQU 1 if %__BuildTypeRelease% EQU 1 ( +if %__RestoreOptData% EQU 1 ( echo %__MsgPrefix%Restoring the OptimizationData Package - @call %__ProjectDir%\run.cmd build -optdata %__RunArgs% %__UnprocessedBuildArgs% + call %__ProjectDir%\dotnet.cmd msbuild /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ + /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^ + /p:UsePartialNGENOptimization=false /maxcpucount^ + ./build.proj /t:RestoreOptData^ + %__CommonMSBuildArgs% %__UnprocessedBuildArgs% if not !errorlevel! == 0 ( echo %__MsgPrefix%Error: Failed to restore the optimization data package. exit /b 1 @@ -345,16 +393,11 @@ if %__RestoreOptData% EQU 1 if %__BuildTypeRelease% EQU 1 ( ) REM Parse the optdata package versions out of msbuild so that we can pass them on to CMake -set DotNetCli=%__ProjectDir%\Tools\dotnetcli\dotnet.exe -if not exist "%DotNetCli%" ( - echo %__MsgPrefix%Assertion failed: dotnet.exe not found at path "%DotNetCli%" - exit /b 1 -) set OptDataProjectFilePath=%__ProjectDir%\src\.nuget\optdata\optdata.csproj -for /f "tokens=*" %%s in ('%DotNetCli% msbuild "%OptDataProjectFilePath%" /t:DumpPgoDataPackageVersion /nologo') do @( +for /f "tokens=*" %%s in ('call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpPgoDataPackageVersion /nologo') do ( set __PgoOptDataVersion=%%s ) -for /f "tokens=*" %%s in ('%DotNetCli% msbuild "%OptDataProjectFilePath%" /t:DumpIbcDataPackageVersion /nologo') do @( +for /f "tokens=*" %%s in ('call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpIbcDataPackageVersion /nologo') do ( set __IbcOptDataVersion=%%s ) @@ -365,7 +408,7 @@ REM === REM ========================================================================================= set __IntermediatesIncDir=%__IntermediatesDir%\src\inc -set __IntermediatesEventingDir=%__IntermediatesDir%\eventing +set __IntermediatesEventingDir=%__IntermediatesDir%\Eventing REM Find python and set it to the variable PYTHON echo import sys; sys.stdout.write(sys.executable) | (py -3 || py -2 || python3 || python2 || python) > %TEMP%\pythonlocation.txt 2> NUL @@ -376,30 +419,26 @@ if NOT DEFINED PYTHON ( exit /b 1 ) -if /i "%__BuildNative%"=="1" ( +if %__BuildNative% EQU 1 ( echo %__MsgPrefix%Laying out dynamically generated files consumed by the native build system echo %__MsgPrefix%Laying out dynamically generated Event test files and etmdummy stub functions "!PYTHON!" -B -Wall %__SourceDir%\scripts\genEventing.py --inc %__IntermediatesIncDir% --dummy %__IntermediatesIncDir%\etmdummy.h --man %__SourceDir%\vm\ClrEtwAll.man --nonextern --noxplatheader|| exit /b 1 echo %__MsgPrefix%Laying out dynamically generated EventPipe Implementation - "!PYTHON!" -B -Wall %__SourceDir%\scripts\genEventPipe.py --man %__SourceDir%\vm\ClrEtwAll.man --intermediate %__IntermediatesEventingDir%\eventpipe --nonextern || exit /b 1 + "!PYTHON!" -B -Wall %__SourceDir%\scripts\genEventPipe.py --man %__SourceDir%\vm\ClrEtwAll.man --exc %__SourceDir%\vm\ClrEtwAllMeta.lst --intermediate %__IntermediatesEventingDir%\eventpipe --nonextern || exit /b 1 echo %__MsgPrefix%Laying out ETW event logging interface "!PYTHON!" -B -Wall %__SourceDir%\scripts\genEtwProvider.py --man %__SourceDir%\vm\ClrEtwAll.man --intermediate %__IntermediatesIncDir% --exc %__SourceDir%\vm\ClrEtwAllMeta.lst || exit /b 1 ) -if /i "%__BuildCoreLib%"=="1" ( +if %__BuildCoreLib% EQU 1 ( echo %__MsgPrefix%Laying out dynamically generated EventSource classes "!PYTHON!" -B -Wall %__SourceDir%\scripts\genRuntimeEventSources.py --man %__SourceDir%\vm\ClrEtwAll.man --intermediate %__IntermediatesEventingDir% || exit /b 1 ) -if /i "%__DoCrossArchBuild%"=="1" ( - if NOT DEFINED PYTHON ( - echo %__MsgPrefix%Error: Could not find a python installation - exit /b 1 - ) +if %__BuildCrossArchNative% EQU 1 ( set __CrossCompIntermediatesIncDir=%__CrossCompIntermediatesDir%\src\inc set __CrossCompIntermediatesEventingDir=%__CrossCompIntermediatesDir%\eventing @@ -409,7 +448,7 @@ if /i "%__DoCrossArchBuild%"=="1" ( "!PYTHON!" -B -Wall %__SourceDir%\scripts\genEventing.py --inc !__CrossCompIntermediatesIncDir! --dummy !__CrossCompIntermediatesIncDir!\etmdummy.h --man %__SourceDir%\vm\ClrEtwAll.man --nonextern || exit /b 1 echo %__MsgPrefix%Laying out dynamically generated EventPipe Implementation - "!PYTHON!" -B -Wall %__SourceDir%\scripts\genEventPipe.py --man %__SourceDir%\vm\ClrEtwAll.man --intermediate !__CrossCompIntermediatesEventingDir!\eventpipe --nonextern || exit /b 1 + "!PYTHON!" -B -Wall %__SourceDir%\scripts\genEventPipe.py --man %__SourceDir%\vm\ClrEtwAll.man --exc %__SourceDir%\vm\ClrEtwAllMeta.lst --intermediate !__CrossCompIntermediatesEventingDir!\eventpipe --nonextern || exit /b 1 echo %__MsgPrefix%Laying out dynamically generated EventSource classes "!PYTHON!" -B -Wall %__SourceDir%\scripts\genRuntimeEventSources.py --man %__SourceDir%\vm\ClrEtwAll.man --intermediate !__CrossCompIntermediatesEventingDir! || exit /b 1 @@ -430,17 +469,7 @@ if %__BuildNative% EQU 1 ( echo %__MsgPrefix%Commencing build of native components for %__BuildOS%.%__BuildArch%.%__BuildType% - set __NativePlatformArgs=-platform=%__BuildArch% - if not "%__ToolsetDir%" == "" ( set __NativePlatformArgs=-useEnv ) - - if not "%__ToolsetDir%" == "" ( - rem arm64 builds currently use private toolset which has not been released yet - REM TODO, remove once the toolset is open. - call :PrivateToolSet - goto GenVSSolution - ) - - :: Set the environment for the native build + REM Set the environment for the native build set __VCBuildArch=x86_amd64 if /i "%__BuildArch%" == "x86" ( set __VCBuildArch=x86 ) if /i "%__BuildArch%" == "arm" ( @@ -466,25 +495,24 @@ if %__BuildNative% EQU 1 ( ) if not exist "!VSINSTALLDIR!DIA SDK" goto NoDIA -:GenVSSolution if defined __SkipConfigure goto SkipConfigure echo %__MsgPrefix%Regenerating the Visual Studio solution pushd "%__IntermediatesDir%" - set __ExtraCmakeArgs=!___SDKVersion! "-DCLR_CMAKE_TARGET_OS=%__BuildOs%" "-DCLR_CMAKE_PACKAGES_DIR=%__PackagesDir%" "-DCLR_CMAKE_PGO_INSTRUMENT=%__PgoInstrument%" "-DCLR_CMAKE_OPTDATA_VERSION=%__PgoOptDataVersion%" "-DCLR_CMAKE_PGO_OPTIMIZE=%__PgoOptimize%" + set __ExtraCmakeArgs=!___SDKVersion! "-DCLR_CMAKE_TARGET_OS=%__BuildOS%" "-DCLR_CMAKE_PACKAGES_DIR=%__PackagesDir%" "-DCLR_CMAKE_PGO_INSTRUMENT=%__PgoInstrument%" "-DCLR_CMAKE_OPTDATA_VERSION=%__PgoOptDataVersion%" "-DCLR_CMAKE_PGO_OPTIMIZE=%__PgoOptimize%" call "%__SourceDir%\pal\tools\gen-buildsys-win.bat" "%__ProjectDir%" %__VSVersion% %__BuildArch% !__ExtraCmakeArgs! @if defined _echo @echo on popd :SkipConfigure - if defined __ConfigureOnly goto SkipNativeBuild - if not exist "%__IntermediatesDir%\install.vcxproj" ( echo %__MsgPrefix%Error: failed to generate native component build project! exit /b 1 ) + if defined __ConfigureOnly goto SkipNativeBuild + set __BuildLogRootName=CoreCLR set __BuildLog="%__LogsDir%\!__BuildLogRootName!_%__BuildOS%__%__BuildArch%__%__BuildType%.log" set __BuildWrn="%__LogsDir%\!__BuildLogRootName!_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn" @@ -492,8 +520,13 @@ if %__BuildNative% EQU 1 ( set __MsbuildLog=/flp:Verbosity=normal;LogFile=!__BuildLog! set __MsbuildWrn=/flp1:WarningsOnly;LogFile=!__BuildWrn! set __MsbuildErr=/flp2:ErrorsOnly;LogFile=!__BuildErr! + set __Logging=!__MsbuildLog! !__MsbuildWrn! !__MsbuildErr! - @call %__ProjectDir%\run.cmd build -Project=%__IntermediatesDir%\install.vcxproj -MsBuildLog=!__MsbuildLog! -MsBuildWrn=!__MsbuildWrn! -MsBuildErr=!__MsbuildErr! -configuration=%__BuildType% %__NativePlatformArgs% %__RunArgs% -MSBuildNodeCount="/m:2" %__UnprocessedBuildArgs% + call %__ProjectDir%\cmake_msbuild.cmd /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ + /l:BinClashLogger,Tools/net46/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^ + /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^ + /p:UsePartialNGENOptimization=false /maxcpucount %__IntermediatesDir%\install.vcxproj^ + !__Logging! /p:Configuration=%__BuildType% /p:Platform=%__BuildArch% %__CommonMSBuildArgs% /m:2 %__UnprocessedBuildArgs% if not !errorlevel! == 0 ( echo %__MsgPrefix%Error: native component build failed. Refer to the build log files for details: @@ -514,13 +547,13 @@ REM === Build Cross-Architecture Native Components (if applicable) REM === REM ========================================================================================= -if /i "%__DoCrossArchBuild%"=="1" ( +if %__BuildCrossArchNative% EQU 1 ( REM Scope environment changes start { setlocal echo %__MsgPrefix%Commencing build of cross architecture native components for %__BuildOS%.%__BuildArch%.%__BuildType% - :: Set the environment for the native build + REM Set the environment for the cross-arch native build set __VCBuildArch=x86_amd64 if /i "%__CrossArch%" == "x86" ( set __VCBuildArch=x86 ) @@ -534,7 +567,7 @@ if /i "%__DoCrossArchBuild%"=="1" ( pushd "%__CrossCompIntermediatesDir%" set __CMakeBinDir=%__CrossComponentBinDir% set "__CMakeBinDir=!__CMakeBinDir:\=/!" - set __ExtraCmakeArgs="-DCLR_CROSS_COMPONENTS_BUILD=1" "-DCLR_CMAKE_TARGET_ARCH=%__BuildArch%" "-DCLR_CMAKE_TARGET_OS=%__BuildOs%" "-DCLR_CMAKE_PACKAGES_DIR=%__PackagesDir%" "-DCLR_CMAKE_PGO_INSTRUMENT=%__PgoInstrument%" "-DCLR_CMAKE_OPTDATA_VERSION=%__PgoOptDataVersion%" "-DCLR_CMAKE_PGO_OPTIMIZE=%__PgoOptimize%" "-DCMAKE_SYSTEM_VERSION=10.0" + set __ExtraCmakeArgs="-DCLR_CROSS_COMPONENTS_BUILD=1" "-DCLR_CMAKE_TARGET_ARCH=%__BuildArch%" "-DCLR_CMAKE_TARGET_OS=%__BuildOS%" "-DCLR_CMAKE_PACKAGES_DIR=%__PackagesDir%" "-DCLR_CMAKE_PGO_INSTRUMENT=%__PgoInstrument%" "-DCLR_CMAKE_OPTDATA_VERSION=%__PgoOptDataVersion%" "-DCLR_CMAKE_PGO_OPTIMIZE=%__PgoOptimize%" "-DCMAKE_SYSTEM_VERSION=10.0" call "%__SourceDir%\pal\tools\gen-buildsys-win.bat" "%__ProjectDir%" %__VSVersion% %__CrossArch% !__ExtraCmakeArgs! @if defined _echo @echo on popd @@ -554,8 +587,14 @@ if /i "%__DoCrossArchBuild%"=="1" ( set __MsbuildLog=/flp:Verbosity=normal;LogFile=!__BuildLog! set __MsbuildWrn=/flp1:WarningsOnly;LogFile=!__BuildWrn! set __MsbuildErr=/flp2:ErrorsOnly;LogFile=!__BuildErr! + set __Logging=!_MsbuildLog! !__MsbuildWrn! !__MsbuildErr! - @call %__ProjectDir%\run.cmd build -Project=%__CrossCompIntermediatesDir%\install.vcxproj -configuration=%__BuildType% -platform=%__CrossArch% -MsBuildLog=!__MsbuildLog! -MsBuildWrn=!__MsbuildWrn! -MsBuildErr=!__MsbuildErr! %__RunArgs% -MSBuildNodeCount="/m:2" %__UnprocessedBuildArgs% + call %__ProjectDir%\cmake_msbuild.cmd /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ + /l:BinClashLogger,Tools/net46/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^ + /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^ + /p:UsePartialNGENOptimization=false /maxcpucount^ + %__CrossCompIntermediatesDir%\install.vcxproj^ + !__Logging! /p:Configuration=%__BuildType% /p:Platform=%__CrossArch% %__CommonMSBuildArgs% /m:2 %__UnprocessedBuildArgs% if not !errorlevel! == 0 ( echo %__MsgPrefix%Error: cross-arch components build failed. Refer to the build log files for details: @@ -580,54 +619,152 @@ if %__BuildCoreLib% EQU 1 ( REM Scope environment changes start { setlocal - echo %__MsgPrefix%Commencing build of System.Private.CoreLib for %__BuildOS%.%__BuildArch%.%__BuildType% - rem Explicitly set Platform causes conflicts in CoreLib project files. Clear it to allow building from VS x64 Native Tools Command Prompt - set Platform= + if %__IbcOnly% EQU 0 ( + echo %__MsgPrefix%Commencing build of System.Private.CoreLib for %__BuildOS%.%__BuildArch%.%__BuildType% + rem Explicitly set Platform causes conflicts in CoreLib project files. Clear it to allow building from VS x64 Native Tools Command Prompt + set Platform= - set __ExtraBuildArgs= - if not defined __IbcTuning ( - set __ExtraBuildArgs=!__ExtraBuildArgs! -OptimizationDataDir="%__PackagesDir%/optimization.%__BuildOS%-%__BuildArch%.IBC.CoreCLR/%__IbcOptDataVersion%/data/" - set __ExtraBuildArgs=!__ExtraBuildArgs! -EnableProfileGuidedOptimization=true - ) - - if "%__BuildSOS%" == "0" ( - set __ExtraBuildArgs=!__ExtraBuildArgs! -SkipSOS=true - ) + set __ExtraBuildArgs= - if "%__BuildManagedTools%" == "1" ( - set __ExtraBuildArgs=!__ExtraBuildArgs! -BuildManagedTools=true - ) - - if /i "%__BuildArch%" == "arm64" ( - set __nugetBuildArgs=-buildNugetPackage=false - ) else if "%__SkipNugetPackage%" == "1" ( - set __nugetBuildArgs=-buildNugetPackage=false - ) else ( - set __nugetBuildArgs=-buildNugetPackage=true - ) + if "%__BuildSOS%" == "0" ( + set __ExtraBuildArgs=!__ExtraBuildArgs! /p:SkipSOS=true + ) - set __BuildLogRootName=System.Private.CoreLib - set __BuildLog="%__LogsDir%\!__BuildLogRootName!_%__BuildOS%__%__BuildArch%__%__BuildType%.log" - set __BuildWrn="%__LogsDir%\!__BuildLogRootName!_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn" - set __BuildErr="%__LogsDir%\!__BuildLogRootName!_%__BuildOS%__%__BuildArch%__%__BuildType%.err" - set __MsbuildLog=/flp:Verbosity=normal;LogFile=!__BuildLog! - set __MsbuildWrn=/flp1:WarningsOnly;LogFile=!__BuildWrn! - set __MsbuildErr=/flp2:ErrorsOnly;LogFile=!__BuildErr! + if "%__BuildManagedTools%" == "1" ( + set __ExtraBuildArgs=!__ExtraBuildArgs! /p:BuildManagedTools=true + ) - @call %__ProjectDir%\run.cmd build -Project=%__ProjectDir%\build.proj -MsBuildLog=!__MsbuildLog! -MsBuildWrn=!__MsbuildWrn! -MsBuildErr=!__MsbuildErr! !__nugetBuildArgs! %__RunArgs% !__ExtraBuildArgs! %__UnprocessedBuildArgs% + if "%__SkipNugetPackage%" == "1" ( + set __ExtraBuildArgs=!__ExtraBuildArgs! /p:BuildNugetPackage=false + ) else ( + set __ExtraBuildArgs=!__ExtraBuildArgs! /p:BuildNugetPackage=true + ) - if not !errorlevel! == 0 ( - echo %__MsgPrefix%Error: System.Private.CoreLib build failed. Refer to the build log files for details: - echo !__BuildLog! - echo !__BuildWrn! - echo !__BuildErr! - exit /b 1 + set __BuildLogRootName=System.Private.CoreLib + set __BuildLog="%__LogsDir%\!__BuildLogRootName!_%__BuildOS%__%__BuildArch%__%__BuildType%.log" + set __BuildWrn="%__LogsDir%\!__BuildLogRootName!_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn" + set __BuildErr="%__LogsDir%\!__BuildLogRootName!_%__BuildOS%__%__BuildArch%__%__BuildType%.err" + set __MsbuildLog=/flp:Verbosity=normal;LogFile=!__BuildLog! + set __MsbuildWrn=/flp1:WarningsOnly;LogFile=!__BuildWrn! + set __MsbuildErr=/flp2:ErrorsOnly;LogFile=!__BuildErr! + set __Logging=!__MsbuildLog! !__MsbuildWrn! !__MsbuildErr! + + call %__ProjectDir%\dotnet.cmd msbuild /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ + /l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^ + /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^ + /p:UsePartialNGENOptimization=false /maxcpucount^ + %__ProjectDir%\build.proj^ + !__Logging! %__CommonMSBuildArgs% !__ExtraBuildArgs! %__UnprocessedBuildArgs% + + if not !errorlevel! == 0 ( + echo %__MsgPrefix%Error: System.Private.CoreLib build failed. Refer to the build log files for details: + echo !__BuildLog! + echo !__BuildWrn! + echo !__BuildErr! + exit /b 1 + ) + ) + if %__IbcOptimize% EQU 1 ( + echo %__MsgPrefix%Commencing IBCMerge of System.Private.CoreLib for %__BuildOS%.%__BuildArch%.%__BuildType% + set IbcMergeProjectFilePath=%__ProjectDir%\src\.nuget\optdata\ibcmerge.csproj + for /f "tokens=*" %%s in ('call "%__ProjectDir%\dotnet.cmd" msbuild "!IbcMergeProjectFilePath!" /t:DumpIbcMergePackageVersion /nologo') do @( + set __IbcMergeVersion=%%s + ) + + set IbcMergePath=%__PackagesDir%\microsoft.dotnet.ibcmerge\!__IbcMergeVersion!\tools\netcoreapp2.0\ibcmerge.dll + if exist !IbcMergePath! ( + echo %__MsgPrefix%Optimizing using IBC training data + set OptimizationDataDir=%__PackagesDir%\optimization.%__BuildOS%-%__BuildArch%.IBC.CoreCLR\!__IbcOptDataVersion!\data\System.Private.CoreLib.dll\ + set InputAssemblyFile=!OptimizationDataDir!System.Private.CoreLib.dll + set TargetOptimizationDataFile=!OptimizationDataDir!System.Private.CoreLib.pgo + + if exist "!InputAssemblyFile!" ( + set RawOptimizationDataFilePattern=!OptimizationDataDir!*.ibc + set RawOptimizationDataFile= + for %%x in (!RawOptimizationDataFilePattern!) do @( + if [!RawOptimizationDataFile!] == [] ( + set RawOptimizationDataFile="%%x" + ) else ( + set RawOptimizationDataFile=!RawOptimizationDataFile! "%%x" + ) + ) + + set IBCMergeCommand=%__ProjectDir%\dotnet.cmd --roll-forward-on-no-candidate-fx 2 "!IbcMergePath!" + + REM Merge the optimization data into the source DLL + set NEXTCMD=!IBCMergeCommand! -q -f -delete -mo "!InputAssemblyFile!" !RawOptimizationDataFile! + echo %__MsgPrefix%!NEXTCMD! >> "%__CrossGenCoreLibLog%" + call !NEXTCMD! >> "%__CrossGenCoreLibLog%" 2>&1 + if NOT !errorlevel! == 0 ( + echo %__MsgPrefix%Error: IbcMerge of System.Private.CoreLib build failed. Refer to %__CrossGenCoreLibLog% + REM Put it in the same log, helpful for Jenkins + type %__CrossGenCoreLibLog% + goto CrossgenFailure + ) + + REM Verify that the optimization data has been merged + set NEXTCMD=!IBCMergeCommand! -mi "!InputAssemblyFile!" + echo %__MsgPrefix%!NEXTCMD! >> "%__CrossGenCoreLibLog%" + call !NEXTCMD! >> "%__CrossGenCoreLibLog%" 2>&1 + if NOT !errorlevel! == 0 ( + echo %__MsgPrefix%Error: IbcMerge of System.Private.CoreLib build failed. Refer to %__CrossGenCoreLibLog% + REM Put it in the same log, helpful for Jenkins + type %__CrossGenCoreLibLog% + goto CrossgenFailure + ) + + REM Save the module as *.pgo to match the convention expected + copy /y !InputAssemblyFile! !TargetOptimizationDataFile! + ) + + if exist "!TargetOptimizationDataFile!" ( + REM Customize IBCMerge's arguments depending on input props + set IBCMergeArguments=-q -f -delete -mo "%__BinDir%\IL\System.Private.CoreLib.dll" -incremental "!TargetOptimizationDataFile!" + + REM Apply optimization data to the compiled assembly + set NEXTCMD=!IBCMergeCommand! !IBCMergeArguments! + echo %__MsgPrefix%!NEXTCMD! >> "%__CrossGenCoreLibLog%" + call !NEXTCMD! >> "%__CrossGenCoreLibLog%" 2>&1 + if NOT !errorlevel! == 0 ( + echo %__MsgPrefix%Error: IbcMerge of System.Private.CoreLib build failed. Refer to %__CrossGenCoreLibLog% + REM Put it in the same log, helpful for Jenkins + type %__CrossGenCoreLibLog% + goto CrossgenFailure + ) + + REM Verify that the optimization data has been applied + set NEXTCMD=!IBCMergeCommand! -mi "%__BinDir%\IL\System.Private.CoreLib.dll" + echo %__MsgPrefix%!NEXTCMD! >> "%__CrossGenCoreLibLog%" + call !NEXTCMD! >> "%__CrossGenCoreLibLog%" 2>&1 + if NOT !errorlevel! == 0 ( + echo %__MsgPrefix%Error: IbcMerge of System.Private.CoreLib build failed. Refer to %__CrossGenCoreLibLog% + REM Put it in the same log, helpful for Jenkins + type %__CrossGenCoreLibLog% + goto CrossgenFailure + ) + ) else ( + echo %__MsgPrefix%!TargetOptimizationDataFile! does not exist >> %__CrossGenCoreLibLog% + echo %__MsgPrefix%Error: IbcMerge of System.Private.CoreLib build failed. Refer to %__CrossGenCoreLibLog% + REM Put it in the same log, helpful for Jenkins + type %__CrossGenCoreLibLog% + goto CrossgenFailure + ) + ) else ( + echo Could not find IBCMerge at !IbcMergePath!. Have you restored src/.nuget/optdata/ibcmerge.csproj? + goto CrossgenFailure + ) ) REM } Scope environment changes end endlocal ) +REM ========================================================================================= +REM === +REM === Build native System.Private.CoreLib. +REM === +REM ========================================================================================= + REM Scope environment changes start { setlocal @@ -653,12 +790,12 @@ if %__BuildNativeCoreLib% EQU 1 ( REM HACK: Workaround for [dotnet/coreclr#13970](https://github.com/dotnet/coreclr/issues/13970) set __PgoRtPath= for /f "tokens=*" %%f in ('where pgort*.dll') do ( - if not defined __PgoRtPath set "__PgoRtPath=%%~f" + if not defined __PgoRtPath set "__PgoRtPath=%%~f" ) echo %__MsgPrefix%Copying "!__PgoRtPath!" into "%__BinDir%" copy /y "!__PgoRtPath!" "%__BinDir%" || ( - echo %__MsgPrefix%Error: copy failed - goto CrossgenFailure + echo %__MsgPrefix%Error: copy failed + goto CrossgenFailure ) REM End HACK ) @@ -682,7 +819,7 @@ if %__BuildNativeCoreLib% EQU 1 ( !NEXTCMD! >> "%__CrossGenCoreLibLog%" 2>&1 if NOT !errorlevel! == 0 ( echo %__MsgPrefix%Error: CrossGen System.Private.CoreLib build failed. Refer to %__CrossGenCoreLibLog% - :: Put it in the same log, helpful for Jenkins + REM Put it in the same log, helpful for Jenkins type %__CrossGenCoreLibLog% goto CrossgenFailure ) @@ -693,7 +830,7 @@ if %__BuildNativeCoreLib% EQU 1 ( !NEXTCMD! >> "%__CrossGenCoreLibLog%" 2>&1 if NOT !errorlevel! == 0 ( echo %__MsgPrefix%Error: CrossGen /CreatePdb System.Private.CoreLib build failed. Refer to %__CrossGenCoreLibLog% - :: Put it in the same log, helpful for Jenkins + REM Put it in the same log, helpful for Jenkins type %__CrossGenCoreLibLog% goto CrossgenFailure ) @@ -702,6 +839,11 @@ if %__BuildNativeCoreLib% EQU 1 ( REM } Scope environment changes end endlocal +REM ========================================================================================= +REM === +REM === Build packages +REM === +REM ========================================================================================= if %__BuildPackages% EQU 1 ( REM Scope environment changes start { @@ -716,12 +858,18 @@ if %__BuildPackages% EQU 1 ( set __MsbuildLog=/flp:Verbosity=normal;LogFile=!__BuildLog! set __MsbuildWrn=/flp1:WarningsOnly;LogFile=!__BuildWrn! set __MsbuildErr=/flp2:ErrorsOnly;LogFile=!__BuildErr! + set __Logging=!__MsbuildLog! !__MsbuildWrn! !__MsbuildErr! REM The conditions as to what to build are captured in the builds file. - @call %__ProjectDir%\run.cmd build -Project=%__SourceDir%\.nuget\packages.builds -platform=%__BuildArch% -MsBuildLog=!__MsbuildLog! -MsBuildWrn=!__MsbuildWrn! -MsBuildErr=!__MsbuildErr! %__RunArgs% %__UnprocessedBuildArgs% + call %__ProjectDir%\dotnet.cmd msbuild /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ + /l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^ + /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^ + /p:UsePartialNGENOptimization=false /maxcpucount^ + %__SourceDir%\.nuget\packages.builds^ + !__Logging! /p:Platform=%__BuildArch% %__CommonMSBuildArgs% %__UnprocessedBuildArgs% if not !errorlevel! == 0 ( - echo %__MsgPrefix%Error: Nuget package generation failed build failed. Refer to the build log files for details: + echo %__MsgPrefix%Error: Nuget package generation failed. Refer to the build log files for details: echo !__BuildLog! echo !__BuildWrn! echo !__BuildErr! @@ -741,13 +889,11 @@ REM ============================================================================ if %__BuildTests% EQU 1 ( echo %__MsgPrefix%Commencing build of tests for %__BuildOS%.%__BuildArch%.%__BuildType% - REM Construct the arguments to pass to the test build script. - - rem arm64 builds currently use private toolset which has not been released yet - REM TODO, remove once the toolset is open. - if not "%__ToolsetDir%" == "" call :PrivateToolSet - - set NEXTCMD=call %__ProjectDir%\build-test.cmd %__BuildArch% %__BuildType% %__UnprocessedBuildArgs% + set __PriorityArg= + if defined __Priority ( + set __PriorityArg=-priority=%__Priority% + ) + set NEXTCMD=call %__ProjectDir%\build-test.cmd %__BuildArch% %__BuildType% !__PriorityArg! %__UnprocessedBuildArgs% echo %__MsgPrefix%!NEXTCMD! !NEXTCMD! @@ -758,12 +904,6 @@ if %__BuildTests% EQU 1 ( ) else if %__GenerateLayout% EQU 1 ( echo %__MsgPrefix%Generating layout for %__BuildOS%.%__BuildArch%.%__BuildType% - REM Construct the arguments to pass to the runtest build script. - - rem arm64 builds currently use private toolset which has not been released yet - REM TODO, remove once the toolset is open. - if not "%__ToolsetDir%" == "" call :PrivateToolSet - set NEXTCMD=call %__ProjectDir%\tests\runtest.cmd %__BuildArch% %__BuildType% GenerateLayoutOnly %__UnprocessedBuildArgs% echo %__MsgPrefix%!NEXTCMD! !NEXTCMD! @@ -780,11 +920,8 @@ REM === All builds complete! REM === REM ========================================================================================= -echo %__MsgPrefix%Repo successfully built. Finished at %TIME% +echo %__MsgPrefix%Build succeeded. Finished at %TIME% echo %__MsgPrefix%Product binaries are available at !__BinDir! -if %__BuildTests% EQU 1 ( - echo %__MsgPrefix%Test binaries are available at !__TestBinDir! -) exit /b 0 REM ========================================================================================= @@ -876,7 +1013,7 @@ echo. echo Usage: echo build.cmd [option1] [option2] echo or: -echo build.cmd all [option1] [option2] -- ... +echo build.cmd all [option1] [option2] echo. echo All arguments are optional. The options are: echo. @@ -884,21 +1021,22 @@ echo.-? -h -help --help: view this message. echo -all: Builds all configurations and platforms. echo Build architecture: one of -x64, -x86, -arm, -arm64 ^(default: -x64^). echo Build type: one of -Debug, -Checked, -Release ^(default: -Debug^). -echo -- ... : all arguments following this tag will be passed directly to msbuild. echo mscorlib version: one of -freebsdmscorlib, -linuxmscorlib, -netbsdmscorlib, -osxmscorlib, echo or -windowsmscorlib. If one of these is passed, only System.Private.CoreLib is built, echo for the specified platform ^(FreeBSD, Linux, NetBSD, OS X or Windows, echo respectively^). echo add nativemscorlib to go further and build the native image for designated mscorlib. -echo -toolset_dir ^