Skip to content

[build] Support building with JetBrains OpenJDK 11 #629

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
Apr 16, 2020
Merged

[build] Support building with JetBrains OpenJDK 11 #629

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
8 changes: 4 additions & 4 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
<XamarinAndroidToolsDirectory Condition=" '$(XamarinAndroidToolsDirectory)' == '' ">$(MSBuildThisFileDirectory)external\xamarin-android-tools</XamarinAndroidToolsDirectory>
</PropertyGroup>
<PropertyGroup>
<JavacSourceVersion Condition=" '$(JavacSourceVersion)' == '' ">1.6</JavacSourceVersion>
<JavacTargetVersion Condition=" '$(JavacTargetVersion)' == '' ">1.6</JavacTargetVersion>
<JreRtJarPath Condition=" '$(JreRtJarPath)' == '' And '$(JavaCPath)' != '' ">$([System.IO.Path]::GetDirectoryName('$(JavaCPath)'))\..\jre\lib\rt.jar</JreRtJarPath>
<_JavacSourceOptions>-source $(JavacSourceVersion) -target $(JavacTargetVersion) -bootclasspath "$(JreRtJarPath)"</_JavacSourceOptions>
<JavacSourceVersion Condition=" '$(JavacSourceVersion)' == '' ">1.8</JavacSourceVersion>
<JavacTargetVersion Condition=" '$(JavacTargetVersion)' == '' ">1.8</JavacTargetVersion>
<_BootClassPath Condition=" '$(JreRtJarPath)' != '' ">-bootclasspath "$(JreRtJarPath)"</_BootClassPath>
<_JavacSourceOptions>-source $(JavacSourceVersion) -target $(JavacTargetVersion) $(_BootClassPath)</_JavacSourceOptions>
</PropertyGroup>
<PropertyGroup>
<_XamarinAndroidCecilPath Condition=" '$(CecilSourceDirectory)' != '' And Exists('$(UtilityOutputFullPath)Xamarin.Android.Cecil.dll') ">$(UtilityOutputFullPath)Xamarin.Android.Cecil.dll</_XamarinAndroidCecilPath>
Expand Down
30 changes: 21 additions & 9 deletions build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks/JdkInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ namespace Java.Interop.BootstrapTasks
{
public class JdkInfo : Task
{
const string JARSIGNER = "jarsigner.exe";
const string MDREG_KEY = @"SOFTWARE\Novell\Mono for Android";
const string MDREG_JAVA_SDK = "JavaSdkDirectory";

public string JdksRoot { get; set; }

public string MaximumJdkVersion { get; set; }
Expand Down Expand Up @@ -50,13 +46,18 @@ public override bool Execute ()
return false;
}

var rtJarPaths = new[]{
Path.Combine (Path.GetDirectoryName (jdk.JavacPath), "..", "jre", "lib", "rt.jar"),
};
var rtJarPath = rtJarPaths.FirstOrDefault (p => File.Exists (p));

JavaHomePath = jdk.HomePath;

Directory.CreateDirectory (Path.GetDirectoryName (PropertyFile.ItemSpec));
Directory.CreateDirectory (Path.GetDirectoryName (MakeFragmentFile.ItemSpec));

WritePropertyFile (jdk.JarPath, jdk.JavacPath, jdk.JdkJvmPath, jdk.IncludePath);
WriteMakeFragmentFile (jdk.JarPath, jdk.JavacPath, jdk.JdkJvmPath, jdk.IncludePath);
WritePropertyFile (jdk.JarPath, jdk.JavacPath, jdk.JdkJvmPath, rtJarPath, jdk.IncludePath);
WriteMakeFragmentFile (jdk.JarPath, jdk.JavacPath, jdk.JdkJvmPath, rtJarPath, jdk.IncludePath);

return !Log.HasLoggedErrors;
}
Expand Down Expand Up @@ -92,7 +93,7 @@ Action<TraceLevel, string> CreateLogger ()
return logger;
}

void WritePropertyFile (string jarPath, string javacPath, string jdkJvmPath, IEnumerable<string> includes)
void WritePropertyFile (string jarPath, string javacPath, string jdkJvmPath, string rtJarPath, IEnumerable<string> includes)
{
var msbuild = XNamespace.Get ("http://schemas.microsoft.com/developer/msbuild/2003");
var project = new XElement (msbuild + "Project",
Expand All @@ -106,17 +107,28 @@ void WritePropertyFile (string jarPath, string javacPath, string jdkJvmPath, IEn
new XElement (msbuild + "JavaCPath", new XAttribute ("Condition", " '$(JavaCPath)' == '' "),
javacPath),
new XElement (msbuild + "JarPath", new XAttribute ("Condition", " '$(JarPath)' == '' "),
jarPath)));
jarPath),
CreateJreRtJarPath (msbuild, rtJarPath)));
project.Save (PropertyFile.ItemSpec);
}

void WriteMakeFragmentFile (string jarPath, string javacPath, string jdkJvmPath, IEnumerable<string> includes)
static XElement CreateJreRtJarPath (XNamespace msbuild, string rtJarPath)
{
if (rtJarPath == null)
return null;
return new XElement (msbuild + "JreRtJarPath",
new XAttribute ("Condition", " '$(JreRtJarPath)' == '' "),
rtJarPath);
}

void WriteMakeFragmentFile (string jarPath, string javacPath, string jdkJvmPath, string rtJarPath, IEnumerable<string> includes)
{
using (var o = new StreamWriter (MakeFragmentFile.ItemSpec)) {
o.WriteLine ($"export JI_JAR_PATH := {jarPath}");
o.WriteLine ($"export JI_JAVAC_PATH := {javacPath}");
o.WriteLine ($"export JI_JDK_INCLUDE_PATHS := {string.Join (" ", includes)}");
o.WriteLine ($"export JI_JVM_PATH := {jdkJvmPath}");
o.WriteLine ($"export JI_RT_JAR_PATH := {rtJarPath}");
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion external/xamarin-android-tools
Open in desktop
Submodule xamarin-android-tools updated from bfb66f to 36d7fe
2 changes: 1 addition & 1 deletion tests/Xamarin.Android.Tools.Bytecode-Tests/IJavaInterfaceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public void ClassFile_WithIJavaInterface_class ()
{
var c = LoadClassFile (JavaType + ".class");
new ExpectedTypeDeclaration {
MajorVersion = 0x32,
MajorVersion = 0x34,
MinorVersion = 0,
ConstantPoolCount = 23,
AccessFlags = ClassAccessFlags.Interface | ClassAccessFlags.Abstract,
Expand Down
2 changes: 1 addition & 1 deletion tests/Xamarin.Android.Tools.Bytecode-Tests/JavaAnnotationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public void ClassFile_WithJavaAnnotation_class ()
{
var c = LoadClassFile (JavaType + ".class");
new ExpectedTypeDeclaration {
MajorVersion = 0x32,
MajorVersion = 0x34,
MinorVersion = 0,
ConstantPoolCount = 23,
AccessFlags = ClassAccessFlags.Public | ClassAccessFlags.Interface | ClassAccessFlags.Abstract | ClassAccessFlags.Annotation,
Expand Down
2 changes: 1 addition & 1 deletion tests/Xamarin.Android.Tools.Bytecode-Tests/JavaEnumTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public void ClassFileDescription ()
{
var c = LoadClassFile (JavaType + ".class");
new ExpectedTypeDeclaration {
MajorVersion = 0x32,
MajorVersion = 0x34,
MinorVersion = 0,
ConstantPoolCount = 53,
AccessFlags = ClassAccessFlags.Final | ClassAccessFlags.Super | ClassAccessFlags.Enum,
Expand Down
2 changes: 1 addition & 1 deletion tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.1Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public void ClassFileDescription ()
{
var c = LoadClassFile (JavaType + ".class");
new ExpectedTypeDeclaration {
MajorVersion = 0x32,
MajorVersion = 0x34,
MinorVersion = 0,
ConstantPoolCount = 47,
AccessFlags = ClassAccessFlags.Super,
Expand Down
2 changes: 1 addition & 1 deletion tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.ASCTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public void ClassFileDescription ()
{
var c = LoadClassFile (JavaType + ".class");
new ExpectedTypeDeclaration {
MajorVersion = 0x32,
MajorVersion = 0x34,
MinorVersion = 0,
ConstantPoolCount = 23,
Deprecated = true,
Expand Down
2 changes: 1 addition & 1 deletion tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.PSCTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public void ClassFileDescription ()
{
var c = LoadClassFile (JavaType + ".class");
new ExpectedTypeDeclaration {
MajorVersion = 0x32,
MajorVersion = 0x34,
MinorVersion = 0,
ConstantPoolCount = 20,
AccessFlags = ClassAccessFlags.Public | ClassAccessFlags.Super | ClassAccessFlags.Abstract,
Expand Down
2 changes: 1 addition & 1 deletion tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.RNC.RPNCTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public void ClassFileDescription ()
{
var c = LoadClassFile (JavaType + ".class");
new ExpectedTypeDeclaration {
MajorVersion = 0x32,
MajorVersion = 0x34,
MinorVersion = 0,
ConstantPoolCount = 46,
AccessFlags = ClassAccessFlags.Public | ClassAccessFlags.Super | ClassAccessFlags.Abstract,
Expand Down
2 changes: 1 addition & 1 deletion tests/Xamarin.Android.Tools.Bytecode-Tests/JavaType.RNCTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public void ClassFileDescription ()
{
var c = LoadClassFile (JavaType + ".class");
new ExpectedTypeDeclaration {
MajorVersion = 0x32,
MajorVersion = 0x34,
MinorVersion = 0,
ConstantPoolCount = 44,
AccessFlags = ClassAccessFlags.Public | ClassAccessFlags.Super | ClassAccessFlags.Abstract,
Expand Down
2 changes: 1 addition & 1 deletion tests/Xamarin.Android.Tools.Bytecode-Tests/JavaTypeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public void ClassFile_WithJavaType_class ()
{
var c = LoadClassFile ("JavaType.class");
new ExpectedTypeDeclaration {
MajorVersion = 0x32,
MajorVersion = 0x34,
MinorVersion = 0,
ConstantPoolCount = 195,
AccessFlags = ClassAccessFlags.Public | ClassAccessFlags.Super,
Expand Down
2 changes: 1 addition & 1 deletion tests/Xamarin.Android.Tools.Bytecode-Tests/NonGenericGlobalTypeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public void ClassFile_WithNonGenericGlobalType_class ()
{
var c = LoadClassFile (JavaType + ".class");
new ExpectedTypeDeclaration {
MajorVersion = 0x32,
MajorVersion = 0x34,
MinorVersion = 0,
ConstantPoolCount = 16,
AccessFlags = ClassAccessFlags.Super,
Expand Down