diff options
| author | wtgodbe <wigodbe@microsoft.com> | 2016-08-04 13:29:43 -0700 |
|---|---|---|
| committer | wtgodbe <wigodbe@microsoft.com> | 2016-08-04 13:51:25 -0700 |
| commit | 775a5c4de092b17e9a35d62cf7d8523b493d58c5 (patch) | |
| tree | 2bc02e97ca435e20be3fd390127bb6d95b4c84ba | |
| parent | 010f42a541f9d1e787774a538d9b923a506ea8f2 (diff) | |
| download | coreclr-775a5c4de092b17e9a35d62cf7d8523b493d58c5.tar.gz coreclr-775a5c4de092b17e9a35d62cf7d8523b493d58c5.tar.bz2 coreclr-775a5c4de092b17e9a35d62cf7d8523b493d58c5.zip | |
Use packages.builds when generating nuget packages
| -rw-r--r-- | build-packages.cmd | 34 | ||||
| -rwxr-xr-x | build-packages.sh | 30 |
2 files changed, 3 insertions, 61 deletions
diff --git a/build-packages.cmd b/build-packages.cmd index 3297bfc214..c49ffe7a93 100644 --- a/build-packages.cmd +++ b/build-packages.cmd @@ -7,39 +7,9 @@ set allargs=%* if /I [%1] == [/?] goto Usage if /I [%1] == [/help] goto Usage -call %__ProjectDir%/run.cmd build-packages -Project=%__ProjectDir%/src/.nuget/Microsoft.NETCore.Runtime.CoreClr/Microsoft.NETCore.Runtime.CoreCLR.builds -FilterToOSGroup=Windows_NT %allargs% +call %__ProjectDir%/run.cmd build-packages -Project=%__ProjectDir%\src\.nuget\packages.builds -FilterToOSGroup=Windows_NT %allargs% if NOT [!ERRORLEVEL!]==[0] ( - echo ERROR: An error occurred while building CoreCLR Runtime package, see build-packages.log for more details. - exit /b 1 -) - -call %__ProjectDir%/run.cmd build-packages -Project=%__ProjectDir%/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds -FilterToOSGroup=Windows_NT %allargs% -if NOT [!ERRORLEVEL!]==[0] ( - echo ERROR: An error occurred while building Jit package, see build-packages.log for more details. - exit /b 1 -) - -call %__ProjectDir%/run.cmd build-packages -Project=%__ProjectDir%/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds -FilterToOSGroup=Windows_NT %allargs% -if NOT [!ERRORLEVEL!]==[0] ( - echo ERROR: An error occurred while building ILAsm package, see build-packages.log for more details. - exit /b 1 -) - -call %__ProjectDir%/run.cmd build-packages -Project=%__ProjectDir%/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds -FilterToOSGroup=Windows_NT %allargs% -if NOT [!ERRORLEVEL!]==[0] ( - echo ERROR: An error occurred while building ILDAsm package, see build-packages.log for more details. - exit /b 1 -) - -call %__ProjectDir%/run.cmd build-packages -Project=%__ProjectDir%/src/.nuget/Microsoft.TargetingPack.Private.CoreCLR/Microsoft.TargetingPack.Private.CoreCLR.pkgproj -FilterToOSGroup=Windows_NT %allargs% -if NOT [!ERRORLEVEL!]==[0] ( - echo ERROR: An error occurred while building CoreCLR TargetingPack package, see build-packages.log for more details. - exit /b 1 -) - -call %__ProjectDir%/run.cmd build-packages -Project=%__ProjectDir%\src\.nuget\Microsoft.NETCore.TestHost\Microsoft.NETCore.TestHost.builds -FilterToOSGroup=Windows_NT %allargs% -if NOT [!ERRORLEVEL!]==[0] ( - echo ERROR: An error occurred while building packages, see %packagesLog% for more details. + echo ERROR: An error occurred while building packages, see build-packages.log for more details. exit /b 1 ) diff --git a/build-packages.sh b/build-packages.sh index 5e03ac294b..6ac0ab23aa 100755 --- a/build-packages.sh +++ b/build-packages.sh @@ -34,40 +34,12 @@ while :; do shift done -$__ProjectRoot/run.sh build-packages -Project=$__ProjectRoot/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds -DistroRid=\${OSRid}-$__Arch -UseSharedCompilation=false -BuildNugetPackage=false $unprocessedBuildArgs +$__ProjectRoot/run.sh build-packages -Project=$__ProjectRoot/src/.nuget/packages.builds -DistroRid=\${OSRid}-$__Arch -UseSharedCompilation=false -BuildNugetPackage=false $unprocessedBuildArgs if [ $? -ne 0 ] then echo "ERROR: An error occurred while building packages; See build-packages.log for more details." exit 1 fi -$__ProjectRoot/run.sh build-packages -Project=$__ProjectRoot/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds -DistroRid=\${OSRid}-$__Arch -UseSharedCompilation=false -BuildNugetPackage=false $unprocessedBuildArgs -if [ $? -ne 0 ] -then - echo "ERROR: An error occurred while building packages; See build-packages.log for more details." - exit 1 -fi - -$__ProjectRoot/run.sh build-packages -Project=$__ProjectRoot/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds -DistroRid=\${OSRid}-$__Arch -UseSharedCompilation=false -BuildNugetPackage=false $unprocessedBuildArgs -if [ $? -ne 0 ] -then - echo "ERROR: An error occurred while building packages; See build-packages.log for more details." - exit 1 -fi - -$__ProjectRoot/run.sh build-packages -Project=$__ProjectRoot/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds -DistroRid=\${OSRid}-$__Arch -UseSharedCompilation=false -BuildNugetPackage=false $unprocessedBuildArgs -if [ $? -ne 0 ] -then - echo "ERROR: An error occurred while building packages; See build-packages.log for more details." - exit 1 -fi - -# Build the TestHost package -$__ProjectRoot/run.sh build-packages -Project=$__ProjectRoot/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds -DistroRid=\${OSRid}-$__Arch -UseSharedCompilation=false -BuildNugetPackage=false $unprocessedBuildArgs -if [ $? -ne 0 ]; then - echo "ERROR: An error occurred while building packages, see $build_packages_log for more details." - exit 1 -fi - echo "Done building packages." exit 0 |