mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix build minor and add sccsid

Browse source
This commit is contained in:
Senthil 2016-05-17 20:35:25 -07:00
parent aea6fc62ac
commit 9b17ca75d7
10 changed files with 73 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
build_projects/dotnet-host-build/CompileTargets.cs
View file

@ -106,6 +106,7 @@ namespace Microsoft.DotNet.Host.Build
var ridMacro = $"-DCLI_CMAKE_RUNTIME_ID:STRING={rid}";
var arch = IsWinx86 ? "x86" : "x64";
var baseSupportedRid = $"win7-{arch}";
var cmakeHostVer = $"-DCLI_CMAKE_HOST_VER:STRING={hostVersion.LatestHostVersion}";
var cmakeHostPolicyVer = $"-DCLI_CMAKE_HOST_POLICY_VER:STRING={hostVersion.LatestHostPolicyVersion}";
var cmakeHostFxrVer = $"-DCLI_CMAKE_HOST_FXR_VER:STRING={hostVersion.LatestHostFxrVersion}";
var cmakeBaseRid = $"-DCLI_CMAKE_PKG_RID:STRING={baseSupportedRid}";
@ -115,6 +116,7 @@ namespace Microsoft.DotNet.Host.Build
corehostSrcDir,
archMacro,
ridMacro,
cmakeHostVer,
cmakeHostFxrVer,
cmakeHostPolicyVer,
cmakeBaseRid,
@ -149,6 +151,8 @@ namespace Microsoft.DotNet.Host.Build
ExecIn(cmakeOut, Path.Combine(c.BuildContext.BuildDirectory, "src", "corehost", "build.sh"),
"--arch",
"x64",
"--hostver",
hostVersion.LatestHostVersion,
"--fxrver",
hostVersion.LatestHostFxrVersion,
"--policyver",
@ -187,6 +191,7 @@ namespace Microsoft.DotNet.Host.Build
.Environment("__WorkaroundCliCoreHostFxrVer", hostVersion.LatestHostFxrVersionNoSuffix)
.Environment("__WorkaroundCliCoreHostVer", hostVersion.LatestHostVersionNoSuffix)
.Environment("__WorkaroundCliCoreHostBuildMajor", hostVersion.LatestHostBuildMajor)
.Environment("__WorkaroundCliCoreHostBuildMinor", hostVersion.LatestHostBuildMinor)
.Environment("__WorkaroundCliCoreHostVersionTag", hostVersion.LatestHostPrerelease)
.ForwardStdOut()
.ForwardStdErr()
@ -206,8 +211,10 @@ namespace Microsoft.DotNet.Host.Build
hostVersion.LatestHostFxrVersionNoSuffix,
"--hostver",
hostVersion.LatestHostVersionNoSuffix,
"--build",
"--build-major",
hostVersion.LatestHostBuildMajor,
"--build-minor",
hostVersion.LatestHostBuildMinor,
"--vertag",
hostVersion.LatestHostPrerelease);
}