diff options
author | Elinor Fung <47805090+elinor-fung@users.noreply.github.com> | 2019-05-30 14:58:09 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-30 14:58:09 -0700 |
commit | fa8383fb28be945cae900a5579afd5920f274fd4 (patch) | |
tree | 43db252786cea19fa8515c9e2e5fa81127ec82b5 /build.sh | |
parent | 7e17986ff71a70ba328895e0b99e1de83d1bf5b5 (diff) | |
download | coreclr-fa8383fb28be945cae900a5579afd5920f274fd4.tar.gz coreclr-fa8383fb28be945cae900a5579afd5920f274fd4.tar.bz2 coreclr-fa8383fb28be945cae900a5579afd5920f274fd4.zip |
Remove BuildTools from product build (#24841)
* Remove BuildTools imports from product build
* Split scripts for installing dotnet vs BuildTools
Diffstat (limited to 'build.sh')
-rwxr-xr-x | build.sh | 26 |
1 files changed, 8 insertions, 18 deletions
@@ -136,12 +136,11 @@ restore_optdata() # we only need optdata on a Release build if [[ "$__BuildType" != "Release" ]]; then __SkipRestoreOptData=1; fi + local OptDataProjectFilePath="$__ProjectRoot/src/.nuget/optdata/optdata.csproj" if [[ ( $__SkipRestoreOptData == 0 ) && ( $__isMSBuildOnNETCoreSupported == 1 ) ]]; then echo "Restoring the OptimizationData package" - "$__ProjectRoot/dotnet.sh" msbuild /nologo /verbosity:minimal /clp:Summary \ - /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true \ - /p:UsePartialNGENOptimization=false /maxcpucount \ - /t:RestoreOptData ./build.proj \ + "$__ProjectRoot/dotnet.sh" restore /nologo /verbosity:minimal /clp:Summary /m \ + $OptDataProjectFilePath \ $__CommonMSBuildArgs $__UnprocessedBuildArgs if [ $? != 0 ]; then echo "Failed to restore the optimization data package." @@ -153,13 +152,12 @@ restore_optdata() # Parse the optdata package versions out of msbuild so that we can pass them on to CMake local DotNetCli="$__ProjectRoot/.dotnet/dotnet" if [ ! -f $DotNetCli ]; then - source "$__ProjectRoot/init-tools.sh" + source "$__ProjectRoot/init-dotnet.sh" if [ $? != 0 ]; then - echo "Failed to restore buildtools." + echo "Failed to install dotnet." exit 1 fi fi - local OptDataProjectFilePath="$__ProjectRoot/src/.nuget/optdata/optdata.csproj" __PgoOptDataVersion=$(DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 $DotNetCli msbuild $OptDataProjectFilePath /t:DumpPgoDataPackageVersion /nologo) if [ $? != 0 ]; then echo "Failed to get PGO data package version." @@ -420,9 +418,7 @@ build_CoreLib() fi $__ProjectRoot/dotnet.sh restore /nologo /verbosity:minimal /clp:Summary \ - /l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll\;LogFile=binclash.log \ - /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true \ - /p:UsePartialNGENOptimization=false /maxcpucount /p:IncludeRestoreOnlyProjects=true /p:ArcadeBuild=true\ + /p:PortableBuild=true /maxcpucount /p:IncludeRestoreOnlyProjects=true /p:ArcadeBuild=true\ $__ProjectDir/src/build.proj \ /flp:Verbosity=normal\;LogFile=$__LogsDir/System.Private.CoreLib_$__BuildOS__$__BuildArch__$__BuildType.log \ /p:__IntermediatesDir=$__IntermediatesDir /p:__RootBinDir=$__RootBinDir \ @@ -434,9 +430,7 @@ build_CoreLib() fi $__ProjectRoot/dotnet.sh msbuild /nologo /verbosity:minimal /clp:Summary \ - /l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll\;LogFile=binclash.log \ - /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true \ - /p:UsePartialNGENOptimization=false /maxcpucount /p:ArcadeBuild=true\ + /p:PortableBuild=true /maxcpucount /p:ArcadeBuild=true\ $__ProjectDir/src/build.proj \ /flp:Verbosity=normal\;LogFile=$__LogsDir/System.Private.CoreLib_$__BuildOS__$__BuildArch__$__BuildType.log \ /p:__IntermediatesDir=$__IntermediatesDir /p:__RootBinDir=$__RootBinDir \ @@ -505,8 +499,7 @@ generate_NugetPackages() # Package build uses the Arcade system and scripts, relying on it to restore required toolsets as part of build $__ProjectRoot/eng/common/build.sh -r -b -projects $__SourceDir/.nuget/packages.builds \ -verbosity minimal -bl:$__LogsDir/Nuget_$__BuildOS__$__BuildArch__$__BuildType.binlog \ - /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true \ - /p:UsePartialNGENOptimization=false /p:ArcadeBuild=true \ + /p:PortableBuild=true /p:ArcadeBuild=true \ /p:__IntermediatesDir=$__IntermediatesDir /p:__RootBinDir=$__RootBinDir /p:__DoCrossArchBuild=$__CrossBuild \ $__CommonMSBuildArgs $__UnprocessedBuildArgs @@ -1009,10 +1002,7 @@ __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs" # Set the remaining variables based upon the determined build configuration __BinDir="$__RootBinDir/Product/$__BuildOS.$__BuildArch.$__BuildType" __PackagesBinDir="$__BinDir/.nuget" -__ToolsDir="$__RootBinDir/tools" -__TestWorkingDir="$__RootBinDir/tests/$__BuildOS.$__BuildArch.$__BuildType" export __IntermediatesDir="$__RootBinDir/obj/$__BuildOS.$__BuildArch.$__BuildType" -__TestIntermediatesDir="$__RootBinDir/tests/obj/$__BuildOS.$__BuildArch.$__BuildType" __isMSBuildOnNETCoreSupported=0 __CrossComponentBinDir="$__BinDir" |