summaryrefslogtreecommitdiff
path: root/build.cmd
diff options
context:
space:
mode:
authorjashook <jashoo@microsoft.com>2019-06-13 20:29:27 +0000
committerjashook <jashoo@microsoft.com>2019-06-13 20:29:27 +0000
commit5e00fa0e6c82f67061572c21d6bfa429ebcc84c8 (patch)
treebe31b4dcfcac6f18eb894a12946fbe183cb65f84 /build.cmd
parentbc980f3aa76229155efb4c7e024829b31e3a9633 (diff)
downloadcoreclr-5e00fa0e6c82f67061572c21d6bfa429ebcc84c8.tar.gz
coreclr-5e00fa0e6c82f67061572c21d6bfa429ebcc84c8.tar.bz2
coreclr-5e00fa0e6c82f67061572c21d6bfa429ebcc84c8.zip
Address PR feedback.
Diffstat (limited to 'build.cmd')
-rw-r--r--build.cmd37
1 files changed, 27 insertions, 10 deletions
diff --git a/build.cmd b/build.cmd
index 7bf070f3e6..9bcafecdea 100644
--- a/build.cmd
+++ b/build.cmd
@@ -389,24 +389,36 @@ if %__RestoreOptData% EQU 1 (
)
)
+set PgoDataPackageVersionOutputFile="%__IntermediatesDir%\optdataversion.txt"
+set IbcDataPackageVersionOutputFile="%__IntermediatesDir%\ibcoptdataversion.txt"
+
REM Parse the optdata package versions out of msbuild so that we can pass them on to CMake
-call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpPgoDataPackageVersion /nologo %__CommonMSBuildArgs%
+call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpPgoDataPackageVersion /nologo %__CommonMSBuildArgs% /p:PgoDataPackageVersionOutputFile=%PgoDataPackageVersionOutputFile%
-if not exist "%__IntermediatesDir%\optdataversion.txt" (
+ if not not !errorlevel! == 0 (
+ echo "Failed to get PGO data package version."
+ exit /b 1
+)
+if not exist "%PgoDataPackageVersionOutputFile%" (
echo "Failed to get PGO data package version."
exit /b !errorlevel!
)
-set /p __PgoOptDataVersion=<"%__IntermediatesDir%\optdataversion.txt"
+set /p __PgoOptDataVersion=<"%PgoDataPackageVersionOutputFile%"
-call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpIbcDataPackageVersion /nologo %__CommonMSBuildArgs%
+call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpIbcDataPackageVersion /nologo %__CommonMSBuildArgs% /p:IbcDataPackageVersionOutputFile=%IbcDataPackageVersionOutputFile%
-if not exist "%__IntermediatesDir%\ibcoptdataversion.txt" (
- echo "Failed to get PGO data package version."
+ if not not !errorlevel! == 0 (
+ echo "Failed to get IBC data package version."
+ exit /b 1
+)
+
+if not exist "%IbcDataPackageVersionOutputFile%" (
+ echo "Failed to get IBC data package version."
exit /b !errorlevel!
)
-set /p __IbcOptDataVersion=<"%__IntermediatesDir%\ibcoptdataversion.txt"
+set /p __IbcOptDataVersion=<"%IbcDataPackageVersionOutputFile%"
REM =========================================================================================
REM ===
@@ -645,14 +657,19 @@ if %__BuildCoreLib% EQU 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
- call "%__ProjectDir%\dotnet.cmd" msbuild "!IbcMergeProjectFilePath!" /t:DumpIbcMergePackageVersion /nologo %__CommonMSBuildArgs%
+ set IbcMergePackageVersionOutputFile="%__IntermediatesDir%\ibcmergeversion.txt"
+ call "%__ProjectDir%\dotnet.cmd" msbuild "!IbcMergeProjectFilePath!" /t:DumpIbcMergePackageVersion /nologo %__CommonMSBuildArgs% /p:IbcMergePackageVersionOutputFile=%IbcMergePackageVersionOutputFile%
- if not exist "%__IntermediatesDir%\ibcmergeversion.txt" (
+ if not not !errorlevel! == 0 (
+ echo "Failed to determine IBC Merge version."
+ exit /b 1
+ )
+ if not exist "%IbcMergePackageVersionOutputFile%" (
echo "Failed to determine IBC Merge version."
exit /b 1
)
- set /p __IbcMergeVersion=<"%__IntermediatesDir%\ibcmergeversion.txt"
+ set /p __IbcMergeVersion=<"%IbcMergePackageVersionOutputFile%"
set IbcMergePath=%__PackagesDir%\microsoft.dotnet.ibcmerge\!__IbcMergeVersion!\tools\netcoreapp2.0\ibcmerge.dll
if exist !IbcMergePath! (