diff options
author | Alex Ghiondea <ghiondea.alexandru@microsoft.com> | 2016-05-24 10:59:37 -0700 |
---|---|---|
committer | Alex Ghiondea <ghiondea.alexandru@microsoft.com> | 2016-05-27 14:22:56 -0700 |
commit | c004a43d75c5e7e2959ac3fcfbafca2f23d20bb4 (patch) | |
tree | cef2f048529aebff61b6f36635cfc71cd9c21fc9 /build.cmd | |
parent | 2e73ba95a266ac513ebef607107c5facd0825741 (diff) | |
download | coreclr-c004a43d75c5e7e2959ac3fcfbafca2f23d20bb4.tar.gz coreclr-c004a43d75c5e7e2959ac3fcfbafca2f23d20bb4.tar.bz2 coreclr-c004a43d75c5e7e2959ac3fcfbafca2f23d20bb4.zip |
Introduce a central packages.builds file that controls building the nuget packages.
This removes the need to have individual packages added to the build scripts to generate them.
Diffstat (limited to 'build.cmd')
-rw-r--r-- | build.cmd | 42 |
1 files changed, 4 insertions, 38 deletions
@@ -491,51 +491,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 |