Skip to content

Commit d574108

Browse files
jechterjechter
committed
Merge branch 'unity-master' into incremental-boehm-support
# Conflicts: # external/bdwgc
2 parents 4cf267b + 855f47c commit d574108

File tree

32 files changed

+1121
-99
lines changed

32 files changed

+1121
-99
lines changed

‎data/config.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>
1111
<dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
1212
<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
13-
<dllmap dll="MonoPosixHelper" target="$mono_libdir/libMonoPosixHelper@libsuffix@" os="!windows" />
14-
<dllmap dll="libmono-btls-shared" target="$mono_libdir/libmono-btls-shared@libsuffix@" os="!windows" />
13+
<dllmap dll="MonoPosixHelper" target="libMonoPosixHelper@libsuffix@" os="!windows" />
14+
<dllmap dll="libmono-btls-shared" target="libmono-btls-shared@libsuffix@" os="!windows" />
1515
<dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
1616
<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
1717
<dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>

‎external/buildscripts/build.pl

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,8 @@
180180
# abs_path ends up returning an empty string
181181
$externalBuildDeps = abs_path($externalBuildDeps) if (-d $externalBuildDeps);
182182

183+
my $extraBuildTools = "$monoroot/../../mono-build-tools-extra/build";
184+
183185
my $existingExternalMonoRoot = "$externalBuildDeps/MonoBleedingEdge";
184186
my $existingExternalMono = "";
185187
my $existingExternalMonoBinDir = "";
@@ -269,6 +271,23 @@
269271
push @configureparams, "--with-monotouch=no";
270272
}
271273

274+
if (!(-d "$extraBuildTools"))
275+
{
276+
# Check out on the fly
277+
print(">>> Checking out mono build tools extra to : $extraBuildTools\n");
278+
my $repo = '[email protected]:vm/mono-build-tools-extra.git';
279+
print(">>> Cloning $repo at $extraBuildTools\n");
280+
my $checkoutResult = system("git", "clone", "--recurse-submodules", $repo, "$extraBuildTools");
281+
282+
if ($checkoutResult ne 0)
283+
{
284+
die("Failed to checkout mono build tools extra\n");
285+
}
286+
287+
# Only clean up if the dir exists. Otherwise abs_path will return empty string
288+
$extraBuildTools = abs_path($extraBuildTools) if (-d $extraBuildTools);
289+
}
290+
272291
if ($existingMonoRootPath eq "")
273292
{
274293
print(">>> No existing mono supplied. Checking for external...\n");
@@ -1415,6 +1434,13 @@
14151434
}
14161435

14171436
chdir("$monoroot");
1437+
1438+
my $stubResult = system("perl", "$buildscriptsdir/stub_classlibs.pl");
1439+
1440+
if ($stubResult ne 0)
1441+
{
1442+
die("Failed to run the profile stubber\n");
1443+
}
14181444
}
14191445
}
14201446
else

‎external/buildscripts/stub_classlibs.pl

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
use Cwd;
2+
use Cwd 'abs_path';
3+
use File::Basename;
4+
use File::Path;
5+
6+
if($^O ne "darwin")
7+
{
8+
print ">>> The ProfileStubber is only built and run in the class library build on macOS\n";
9+
exit
10+
}
11+
12+
my $monoroot = File::Spec->rel2abs(dirname(__FILE__) . "/../..");
13+
my $monoroot = abs_path($monoroot);
14+
my $extraBuildTools = "$monoroot/../../mono-build-tools-extra/build";
15+
16+
print ">>> Building the ProfileStubber utility\n";
17+
18+
my $result = system("xbuild",
19+
"$extraBuildTools/mono-build-tools-extra.sln",
20+
"/p:Configuration=Release");
21+
22+
if ($result ne 0)
23+
{
24+
die("Failed to build ProfileStubber utility\n");
25+
}
26+
27+
my $profileRoot = "tmp/lib/mono";
28+
my $referenceProfile = "$profileRoot/4.7.1-api";
29+
30+
print ">>> Modifying the unityjit profile to match the .NET 4.7.1 API\n";
31+
32+
$result = system("mono",
33+
"$extraBuildTools/build/ProfileStubber.exe",
34+
"--reference-profile=$referenceProfile",
35+
"--stub-profile=$profileRoot/unityjit");
36+
37+
if ($result ne 0)
38+
{
39+
die("Failed to stub the unityjit profile\n");
40+
}
41+
42+
print ">>> Modifying the unityaot profile to match the .NET 4.7.1 API\n";
43+
44+
$result = system("mono",
45+
"$extraBuildTools/build/ProfileStubber.exe",
46+
"--reference-profile=$referenceProfile",
47+
"--stub-profile=$profileRoot/unityaot");
48+
49+
if ($result ne 0)
50+
{
51+
die("Failed to stub the unityaot profile\n");
52+
}

‎mcs/class/Facades/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives.dll.sources

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
TypeForwarders.cs
22
AssemblyInfo.cs
3-
4-
../../../../external/corefx/src/System.Runtime.Serialization.Primitives/src/System/Runtime/Serialization/ISerializationSurrogateProvider.cs

‎mcs/class/Facades/System.Runtime.Serialization.Primitives/TypeForwarders.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.IExtensibleDataObject))]
3131
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.IgnoreDataMemberAttribute))]
3232
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.InvalidDataContractException))]
33+
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.ISerializationSurrogateProvider))]
3334
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.KnownTypeAttribute))]
3435
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.OnDeserializedAttribute))]
3536
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.Serialization.OnDeserializingAttribute))]

‎mcs/class/Facades/System.Security.Cryptography.Algorithms/System.Security.Cryptography.Algorithms.dll.sources

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
TypeForwarders.cs
22
AssemblyInfo.cs
33
SR.cs
4-
../../../../external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/IncrementalHash.net46.cs

‎mcs/class/Facades/System.Security.Cryptography.Algorithms/TypeForwarders.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.HMACSHA256))]
4444
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.HMACSHA384))]
4545
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.HMACSHA512))]
46+
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.IncrementalHash))]
4647
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.MaskGenerationMethod))]
4748
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.MD5))]
4849
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.Cryptography.PKCS1MaskGenerationMethod))]

‎mcs/class/Facades/System.Security.SecureString/System.Security.SecureString.dll.sources

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
TypeForwarders.cs
22
AssemblyInfo.cs
3-
../../../../external/corefx/src/System.Runtime.InteropServices/src/System/Security/SecureStringMarshal.cs

‎mcs/class/Facades/System.Security.SecureString/TypeForwarders.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@
2121
//
2222

2323
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.SecureString))]
24+
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Security.SecureStringMarshal))]

‎mcs/class/System.Core/common_System.Core.dll.sources

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,3 +289,5 @@ System.Security.Cryptography/SHA512CryptoServiceProvider.cs
289289

290290
../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/DelegateHelpers.cs
291291
../../../external/corefx/src/System.Linq.Expressions/src/System/Linq/Expressions/Compiler/DelegateHelpers.Generated.cs
292+
293+
../../../external/corefx/src/System.Security.Cryptography.Algorithms/src/System/Security/Cryptography/IncrementalHash.net46.cs

0 commit comments

Comments
 (0)