diff options
| author | AlexGhiondea <AlexGhiondea@users.noreply.github.com> | 2016-05-31 10:54:23 -0700 |
|---|---|---|
| committer | AlexGhiondea <AlexGhiondea@users.noreply.github.com> | 2016-05-31 10:54:23 -0700 |
| commit | 06a1826fe80c496570b9732946804722cf805692 (patch) | |
| tree | 98100736c0d9f3a730cea4eb402bbf4b5ffb489e /build.cmd | |
| parent | 19a88d8a92e08c8506f6e69c3964dc77329c108a (diff) | |
| parent | c004a43d75c5e7e2959ac3fcfbafca2f23d20bb4 (diff) | |
| download | coreclr-06a1826fe80c496570b9732946804722cf805692.tar.gz coreclr-06a1826fe80c496570b9732946804722cf805692.tar.bz2 coreclr-06a1826fe80c496570b9732946804722cf805692.zip | |
Merge pull request #5189 from AlexGhiondea/buildPackage
Include the targeting pack in the build process.
Diffstat (limited to 'build.cmd')
| -rw-r--r-- | build.cmd | 42 |
1 files changed, 4 insertions, 38 deletions
@@ -489,51 +489,17 @@ set __msbuildLogArgs=^ /consoleloggerparameters:Summary ^ /verbosity:minimal -if not defined __SkipCoreLibBuild ( - set __msbuildArgs="%__ProjectFilesDir%\src\.nuget\Microsoft.NETCore.Runtime.CoreClr\Microsoft.NETCore.Runtime.CoreCLR.builds" /p:Platform=%__BuildArch% - %_msbuildexe% !__msbuildArgs! %__msbuildLogArgs% - if errorlevel 1 ( - echo %__MsgPrefix%Error: Nuget package generation failed build failed. Refer to the build log files for details: - echo %__BuildLog% - echo %__BuildWrn% - echo %__BuildErr% - exit /b 1 - ) -) - -if not defined __SkipNativeBuild ( - set __msbuildArgs="%__ProjectFilesDir%\src\.nuget\Microsoft.NETCore.Jit\Microsoft.NETCore.Jit.builds" /p:Platform=%__BuildArch% - %_msbuildexe% !__msbuildArgs! %__msbuildLogArgs% - if errorlevel 1 ( - echo %__MsgPrefix%Error: Nuget package generation failed build failed. Refer to the build log files for details: - echo %__BuildLog% - echo %__BuildWrn% - echo %__BuildErr% - exit /b 1 - ) -) - -rem Build the ILAsm package -set __msbuildArgs="%__ProjectFilesDir%\src\.nuget\Microsoft.NETCore.ILAsm\Microsoft.NETCore.ILAsm.builds" /p:Platform=%__BuildArch% -%_msbuildexe% %__msbuildArgs% %__msbuildLogArgs% +REM The conditions as to what to build are captured in the builds file. +set __msbuildArgs="%__ProjectFilesDir%\src\.nuget\packages.builds" /p:Platform=%__BuildArch% +%_msbuildexe% !__msbuildArgs! %__msbuildLogArgs% if errorlevel 1 ( - echo %__MsgPrefix%Error: ILAsm Nuget package generation failed build failed. Refer to the build log files for details: + echo %__MsgPrefix%Error: Nuget package generation failed build failed. Refer to the build log files for details: echo %__BuildLog% echo %__BuildWrn% echo %__BuildErr% exit /b 1 ) -rem Build the ILDAsm package -set __msbuildArgs="%__ProjectFilesDir%\src\.nuget\Microsoft.NETCore.ILDAsm\Microsoft.NETCore.ILDAsm.builds" /p:Platform=%__BuildArch% -%_msbuildexe% %__msbuildArgs% %__msbuildLogArgs% -if errorlevel 1 ( - echo %__MsgPrefix%Error: ILDAsm Nuget package generation failed build failed. Refer to the build log files for details: - echo %__BuildLog% - echo %__BuildWrn% - echo %__BuildErr% - exit /b 1 -) :SkipNuget |