Skip to content

Obtain mono-build-tools-extra from Stevedore #1247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 13, 2020
Merged

Obtain mono-build-tools-extra from Stevedore #1247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion external/buildscripts/Build.bee.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ private static void RegisterOSXArtifacts()
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()
Expand Down Expand Up @@ -125,4 +130,4 @@ private static void RegisterCommonNonWindowsArtifacts()
"testing"));
}
}
}
}
21 changes: 1 addition & 20 deletions external/buildscripts/build.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,6 @@
# 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 = "";
Expand Down Expand Up @@ -281,23 +279,6 @@
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 = '[email protected]:unity/mono-build-tools-extra.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");
Expand Down Expand Up @@ -1826,4 +1807,4 @@
print(">>> Skipping unit tests\n");
}

chdir ($currentdir);
chdir ($currentdir);
19 changes: 4 additions & 15 deletions external/buildscripts/stub_classlibs.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,15 @@

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";

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");

Expand All @@ -42,11 +31,11 @@
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");
}
}