diff options
| author | William Godbe <wigodbe@microsoft.com> | 2016-07-13 15:14:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-13 15:14:26 -0700 |
| commit | d1770839b1ab1a2dc2922c9567559cae295e61b6 (patch) | |
| tree | 183146569dd8b058085ba8650e069514d1bc98f1 | |
| parent | ec23a84b3cf065ad35a8f3bcf44554674241b799 (diff) | |
| parent | c89c893bf1162457deaf5d80971799d770fa92ce (diff) | |
| download | coreclr-d1770839b1ab1a2dc2922c9567559cae295e61b6.tar.gz coreclr-d1770839b1ab1a2dc2922c9567559cae295e61b6.tar.bz2 coreclr-d1770839b1ab1a2dc2922c9567559cae295e61b6.zip | |
Merge pull request #6255 from wtgodbe/targetingpack
Build the TargetingPack package as part of build-packages scripts
| -rw-r--r-- | build-packages.cmd | 9 | ||||
| -rwxr-xr-x | build-packages.sh | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/build-packages.cmd b/build-packages.cmd index 5429581956..3552ab2ae8 100644 --- a/build-packages.cmd +++ b/build-packages.cmd @@ -51,6 +51,15 @@ if NOT [!ERRORLEVEL!]==[0] ( exit /b 1 ) +rem Build the TargetingPack package +set __msbuildArgs="%__ProjectDir%\src\.nuget\Microsoft.TargetingPack.Private.CoreCLR\Microsoft.TargetingPack.Private.CoreCLR.pkgproj" !allargs! +echo msbuild.exe %__msbuildArgs% !options! >> %packagesLog% +call msbuild.exe %__msbuildArgs% !options! +if NOT [!ERRORLEVEL!]==[0] ( + echo ERROR: An error occurred while building packages, see %packagesLog% for more details. + exit /b 1 +) + echo Done Building Packages. exit /b diff --git a/build-packages.sh b/build-packages.sh index 0403c3f1f0..baa6516ec8 100755 --- a/build-packages.sh +++ b/build-packages.sh @@ -156,6 +156,15 @@ if [ $? -ne 0 ]; then exit 1 fi + # Build the TargetingPack package + $__ProjectRoot/Tools/corerun "$__MSBuildPath" /nologo "$__ProjectRoot/src\.nuget\Microsoft.TargetingPack.Private.CoreCLR\Microsoft.TargetingPack.Private.CoreCLR.pkgproj" /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$binclashlog" /t:Build /p:__BuildOS=$__BuildOS /p:__BuildArch=$__BuildArch /p:__BuildType=$__BuildType /p:__IntermediatesDir=$__IntermediatesDir /p:BuildNugetPackage=false /p:UseSharedCompilation=false + +if [ $? -ne 0 ]; then + echo -e "\nAn error occurred. Aborting build-packages.sh ." >> $build_packages_log + echo "ERROR: An error occurred while building packages, see $build_packages_log for more details." + exit 1 +fi + echo "Done building packages." echo -e "\nDone building packages." >> $build_packages_log exit 0 |