提交 103d7743 编写于 作者: J Josh Peterson

Obtain mono-build-tools-extra from Stevedore

Instead of cloning the mono-build-tools-extra and building the tools in
it, now get the binaries from Stevedore. These are only used on macOS
builds of Mono.
上级 2c7486e7
......@@ -87,6 +87,11 @@ namespace BuildProgram
new Tuple<string, string>(
"MacBuildEnvironment/9df1e3b3b120_2fc8e616a2e5dfb7907fc42d9576b427e692223c266dc3bc305de4bf03714e30.7z",
"testing"));
Artifacts.Add("mono-build-tools-extra",
new Tuple<string, string>(
"mono-build-tools-extra/70f9c4060363d11b3e69f000c8ff2c9ac8112bc2_e66148037ab6371658815c726e27e7ee7bdfdd705fb734708d07cbdfe7d8141e.7z",
"testing"));
}
private static void RegisterLinuxArtifacts()
......@@ -130,4 +135,4 @@ namespace BuildProgram
"testing"));
}
}
}
}
\ No newline at end of file
......@@ -190,8 +190,6 @@ print(">>> External build deps = $externalBuildDeps\n");
# abs_path ends up returning an empty string
$externalBuildDeps = abs_path($externalBuildDeps) if (-d $externalBuildDeps);
my $extraBuildTools = "$monoroot/../../mono-build-tools-extra/build";
my $existingExternalMonoRoot = "$externalBuildDeps/MonoBleedingEdge";
my $existingExternalMono = "";
my $existingExternalMonoBinDir = "";
......@@ -281,23 +279,6 @@ if ($build)
push @configureparams, "--with-monotouch=no";
}
if (!(-d "$extraBuildTools"))
{
# Check out on the fly
print(">>> Checking out mono build tools extra to : $extraBuildTools\n");
my $repo = 'git@github.cds.internal.unity3d.com:unity/mono-build-tools-exta.git';
print(">>> Cloning $repo at $extraBuildTools\n");
my $checkoutResult = system("git", "clone", "--recurse-submodules", $repo, "$extraBuildTools");
if ($checkoutResult ne 0)
{
die("Failed to checkout mono build tools extra\n");
}
# Only clean up if the dir exists. Otherwise abs_path will return empty string
$extraBuildTools = abs_path($extraBuildTools) if (-d $extraBuildTools);
}
if ($existingMonoRootPath eq "")
{
print(">>> No existing mono supplied. Checking for external...\n");
......
......@@ -11,18 +11,7 @@ if($^O ne "darwin")
my $monoroot = File::Spec->rel2abs(dirname(__FILE__) . "/../..");
my $monoroot = abs_path($monoroot);
my $extraBuildTools = "$monoroot/../../mono-build-tools-extra/build";
print ">>> Building the ProfileStubber utility\n";
my $result = system("xbuild",
"$extraBuildTools/mono-build-tools-extra.sln",
"/p:Configuration=Release");
if ($result ne 0)
{
die("Failed to build ProfileStubber utility\n");
}
my $extraBuildTools = "$monoroot/external/buildscripts/artifacts/Stevedore/mono-build-tools-extra";
my $profileRoot = "tmp/lib/mono";
my $referenceProfile = "$profileRoot/4.7.1-api";
......@@ -30,7 +19,7 @@ my $referenceProfile = "$profileRoot/4.7.1-api";
print ">>> Modifying the unityjit profile to match the .NET 4.7.1 API\n";
$result = system("mono",
"$extraBuildTools/build/ProfileStubber.exe",
"$extraBuildTools/ProfileStubber.exe",
"--reference-profile=$referenceProfile",
"--stub-profile=$profileRoot/unityjit");
......@@ -42,11 +31,11 @@ if ($result ne 0)
print ">>> Modifying the unityaot profile to match the .NET 4.7.1 API\n";
$result = system("mono",
"$extraBuildTools/build/ProfileStubber.exe",
"$extraBuildTools/ProfileStubber.exe",
"--reference-profile=$referenceProfile",
"--stub-profile=$profileRoot/unityaot");
if ($result ne 0)
{
die("Failed to stub the unityaot profile\n");
}
}
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册