summaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
authorJarret Shook <jarret_shook@outlook.com>2019-06-14 08:31:47 -0700
committerGitHub <noreply@github.com>2019-06-14 08:31:47 -0700
commit41f0cc37361e7b1dd37ca981b82a47b47b842db9 (patch)
treeed773f806d382066d85c5956132f52d4bde100ed /build.sh
parente879d9c7b2b7d7a75c0101ff4861d6f87e223bc0 (diff)
parentd006ed403b942d42114445c23699af1ebdba2662 (diff)
downloadcoreclr-41f0cc37361e7b1dd37ca981b82a47b47b842db9.tar.gz
coreclr-41f0cc37361e7b1dd37ca981b82a47b47b842db9.tar.bz2
coreclr-41f0cc37361e7b1dd37ca981b82a47b47b842db9.zip
Merge pull request #25138 from jashook/write_pgo_opt_version_to_intermediates_dir
Change how build.sh/build.cmd parse the PGO and IBC versions
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh22
1 files changed, 13 insertions, 9 deletions
diff --git a/build.sh b/build.sh
index 25caf6a122..8952ab9850 100755
--- a/build.sh
+++ b/build.sh
@@ -151,22 +151,26 @@ restore_optdata()
if [ $__isMSBuildOnNETCoreSupported == 1 ]; then
# Parse the optdata package versions out of msbuild so that we can pass them on to CMake
- # Init dotnet
- source "${__ProjectRoot}/init-dotnet.sh"
- local DotNetCli=${_InitializeDotNetCli}/dotnet
+ local PgoDataPackageVersionOutputFile="${__IntermediatesDir}/optdataversion.txt"
+ local IbcDataPackageVersionOutputFile="${__IntermediatesDir}/ibcoptdataversion.txt"
- __PgoOptDataVersion=$(DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 $DotNetCli msbuild $OptDataProjectFilePath /t:DumpPgoDataPackageVersion /nologo)
- if [ $? != 0 ]; then
+ # Writes into ${PgoDataPackageVersionOutputFile}
+ ${__ProjectDir}/dotnet.sh msbuild $OptDataProjectFilePath /t:DumpPgoDataPackageVersion ${__CommonMSBuildArgs} /p:PgoDataPackageVersionOutputFile=${PgoDataPackageVersionOutputFile} /nologo 2>&1 > /dev/null
+ if [ $? != 0 ] || [ ! -f "${PgoDataPackageVersionOutputFile}" ]; then
echo "Failed to get PGO data package version."
exit $?
fi
- __PgoOptDataVersion=$(echo $__PgoOptDataVersion | sed 's/^\s*//')
- __IbcOptDataVersion=$(DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 $DotNetCli msbuild $OptDataProjectFilePath /t:DumpIbcDataPackageVersion /nologo)
- if [ $? != 0 ]; then
+
+ __PgoOptDataVersion=$(<"${PgoDataPackageVersionOutputFile}")
+
+ # Writes into ${IbcDataPackageVersionOutputFile}
+ ${__ProjectDir}/dotnet.sh msbuild $OptDataProjectFilePath /t:DumpIbcDataPackageVersion ${__CommonMSBuildArgs} /p:IbcDataPackageVersionOutputFile=${IbcDataPackageVersionOutputFile} /nologo 2>&1 > /dev/null
+ if [ $? != 0 ] || [ ! -f "${IbcDataPackageVersionOutputFile}" ]; then
echo "Failed to get IBC data package version."
exit $?
fi
- __IbcOptDataVersion=$(echo $__IbcOptDataVersion | sed 's/^[[:blank:]]*//')
+
+ __IbcOptDataVersion=$(<"${IbcDataPackageVersionOutputFile}")
fi
}