[Java.Interop.BootstrapTasks] Use JdkInfo (#349)

Context: dotnet/android-tools#29 (comment)

Bumps to xamarin/xamarin-android-tools:master@75530565

The `<JdkInfo/>` task within `Java.Interop.BootstrapTasks.dll` isn't
the *only* thing that needs to determine the path of an installed JDK.
The IDEs could also use such functionality, as could xamarin-android.

Add a submodule reference to xamarin-android-tools, and use
`Xamarin.Android.Tools.JdkInfo` to find the preferred JDK, instead of
having lots of custom probing with the `<JdkInfo/>` task.

Finally, for consistency, move `src/Java.Interop.BootstrapTasks` to
`build-tools/Java.Interop.BootstrapTasks`, as the
`Java.Interop.BootstrapTasks.dll` assembly is only intended for in
building Java.Interop *itself*, and not for "downlevel" distribution.

Author: jonpryor

.gitmodules

@@ -6,3 +6,7 @@
 	path = external/cecil
 	url = https://github.com/mono/cecil.git
 	branch = master
+[submodule "external/xamarin-android-tools"]
+	path = external/xamarin-android-tools
+	url = https://github.com/xamarin/xamarin-android-tools.git
+	branch = master

Configuration.props

@@ -16,8 +16,10 @@
   <PropertyGroup>
     <CecilSourceDirectory   Condition=" '$(CecilSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\cecil</CecilSourceDirectory>
     <UtilityOutputFullPath  Condition=" '$(UtilityOutputFullPath)' == '' ">$(MSBuildThisFileDirectory)bin\$(Configuration)\</UtilityOutputFullPath>
+    <XamarinAndroidToolsDirectory   Condition=" '$(XamarinAndroidToolsDirectory)' == '' ">$(MSBuildThisFileDirectory)external\xamarin-android-tools</XamarinAndroidToolsDirectory>
   </PropertyGroup>
   <PropertyGroup>
     <CecilFullPath>$([System.IO.Path]::GetFullPath ('$(CecilSourceDirectory)'))</CecilFullPath>
+    <XamarinAndroidToolsFullPath>$([System.IO.Path]::GetFullPath ('$(XamarinAndroidToolsDirectory)'))</XamarinAndroidToolsFullPath>
   </PropertyGroup>
 </Project>

Java.Interop.sln

@@ -17,7 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{4C173212-3
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop", "src\Java.Interop\Java.Interop.csproj", "{94BD81F7-B06F-4295-9636-F8A3B6BDC762}"
 EndProject
-Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "java-interop", "src\java-interop\java-interop.csproj", "{BB0AB9F7-0979-41A7-B7A9-877260655F94}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "java-interop", "src\java-interop\java-interop.csproj", "{BB0AB9F7-0979-41A7-B7A9-877260655F94}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Dynamic", "src\Java.Interop.Dynamic\Java.Interop.Dynamic.csproj", "{AD4468F8-8883-434B-9D4C-E1801BB3B52A}"
 EndProject
@@ -97,7 +97,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Cecil.Mdb",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.GenericMarshaler", "src\Java.Interop.GenericMarshaler\Java.Interop.GenericMarshaler.csproj", "{D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.BootstrapTasks", "src\Java.Interop.BootstrapTasks\Java.Interop.BootstrapTasks.csproj", "{3E8E5C8C-59A6-4A9A-B55D-46AB14431B2A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.BootstrapTasks", "build-tools\Java.Interop.BootstrapTasks\Java.Interop.BootstrapTasks.csproj", "{3E8E5C8C-59A6-4A9A-B55D-46AB14431B2A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.AndroidSdk", "external\xamarin-android-tools\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj", "{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -349,6 +351,14 @@ Global
 		{3E8E5C8C-59A6-4A9A-B55D-46AB14431B2A}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
 		{3E8E5C8C-59A6-4A9A-B55D-46AB14431B2A}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU
 		{3E8E5C8C-59A6-4A9A-B55D-46AB14431B2A}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU
+		{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.XAIntegrationDebug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.XAIntegrationDebug|Any CPU.Build.0 = Debug|Any CPU
+		{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.XAIntegrationRelease|Any CPU.ActiveCfg = Release|Any CPU
+		{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.XAIntegrationRelease|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{0C001D50-4176-45AE-BDC8-BA626508B0CC} = {C8F58966-94BF-407F-914A-8654F8B8AE3B}
@@ -392,5 +402,6 @@ Global
 		{C0487169-8F81-497F-919E-EB42B1D0243F} = {C8F58966-94BF-407F-914A-8654F8B8AE3B}
 		{D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF} = {4C173212-371D-45D8-BA83-9226194F48DC}
 		{3E8E5C8C-59A6-4A9A-B55D-46AB14431B2A} = {172B608B-E6F3-41CC-9949-203A76BA247C}
+		{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157} = {172B608B-E6F3-41CC-9949-203A76BA247C}
 	EndGlobalSection
 EndGlobal

Makefile

@@ -20,6 +20,9 @@ PACKAGES = \
 	packages/NUnit.3.7.1/NUnit.3.7.1.nupkg \
 	packages/NUnit.Console.3.7.0/NUnit.Console.3.7.0.nupkg
 
+PREPARE_EXTERNAL_FILES  = \
+	external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj
+
 DEPENDENCIES = \
 	bin/Test$(CONFIGURATION)/libNativeTiming$(NATIVE_EXT)
 
@@ -55,16 +58,18 @@ run-all-tests: run-tests run-test-jnimarshal run-test-generator-core run-ptests
 
 include build-tools/scripts/msbuild.mk
 
-prepare:: prepare-bootstrap prepare-external
+prepare:: prepare-bootstrap
 
-prepare-bootstrap: bin/Build$(CONFIGURATION)/Java.Interop.BootstrapTasks.dll
+prepare-bootstrap: prepare-external bin/Build$(CONFIGURATION)/Java.Interop.BootstrapTasks.dll
 
-bin/Build$(CONFIGURATION)/Java.Interop.BootstrapTasks.dll: src/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj \
-		$(wildcard src/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks/*.cs)
-	$(MSBUILD) $(MSBUILD_FLAGS) src/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj
+bin/Build$(CONFIGURATION)/Java.Interop.BootstrapTasks.dll: build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj \
+		external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj \
+		$(wildcard build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks/*.cs)
+	$(MSBUILD) $(MSBUILD_FLAGS) "$<"
 
-prepare-external: $(PACKAGES) $(NUNIT_CONSOLE)
+prepare-external $(PREPARE_EXTERNAL_FILES): $(PACKAGES) $(NUNIT_CONSOLE)
 	git submodule update --init --recursive
+	(cd external/xamarin-android-tools && $(MAKE) prepare)
 
 clean:
 	-$(MSBUILD) $(MSBUILD_FLAGS) /t:Clean

src/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj renamed to build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj

@@ -41,9 +41,14 @@
     <Compile Include="Java.Interop.BootstrapTasks\DownloadUri.cs" />
     <Compile Include="Java.Interop.BootstrapTasks\JdkInfo.cs" />
     <Compile Include="Java.Interop.BootstrapTasks\OS.cs" />
-    <Compile Include="Java.Interop.BootstrapTasks\RegistryEx.cs" />
     <Compile Include="Java.Interop.BootstrapTasks\SetEnvironmentVariable.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(XamarinAndroidToolsFullPath)\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj">
+      <Project>{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}</Project>
+      <Name>Xamarin.Android.Tools.AndroidSdk</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>

src/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks/DownloadUri.cs renamed to build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks/DownloadUri.cs

@@ -0,0 +1,122 @@
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Xml.Linq;
+
+using Xamarin.Android.Tools;
+
+using XATInfo   = Xamarin.Android.Tools.JdkInfo;
+
+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; }
+
+		static  Regex   VersionExtractor  = new Regex (@"(?<version>[\d]+(\.\d+)+)", RegexOptions.Compiled);
+
+		[Required]
+		public  ITaskItem       PropertyFile        { get; set; }
+
+		[Required]
+		public  ITaskItem       MakeFragmentFile    { get; set; }
+
+		[Output]
+		public  string          JavaHomePath        { get; set; }
+
+		public override bool Execute ()
+		{
+			var maxVersion      = GetVersion (MaximumJdkVersion);
+
+			XATInfo jdk         = XATInfo.GetKnownSystemJdkInfos (CreateLogger ())
+				.Where (j => maxVersion != null ? j.Version <= maxVersion : true)
+				.FirstOrDefault ();
+
+			if (jdk == null) {
+				Log.LogError ("Could not determine JAVA_HOME location. Please set JdksRoot or export the JAVA_HOME environment variable.");
+				return false;
+			}
+
+			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);
+
+			return !Log.HasLoggedErrors;
+		}
+
+		Version GetVersion (string value)
+		{
+			if (string.IsNullOrEmpty (value))
+				return null;
+			if (!value.Contains (".")) {
+				value += ".0";
+			}
+			Version v;
+			if (Version.TryParse (value, out v))
+				return v;
+			return null;
+		}
+
+		Action<TraceLevel, string> CreateLogger ()
+		{
+			Action<TraceLevel, string> logger = (level, value) => {
+				switch (level) {
+					case TraceLevel.Error:
+						Log.LogError ("{0}", value);
+						break;
+					case TraceLevel.Warning:
+						Log.LogWarning ("{0}", value);
+						break;
+					default:
+						Log.LogMessage (MessageImportance.Low, "{0}", value);
+						break;
+				}
+			};
+			return logger;
+		}
+
+		void WritePropertyFile (string jarPath, string javacPath, string jdkJvmPath, IEnumerable<string> includes)
+		{
+			var msbuild = XNamespace.Get ("http://schemas.microsoft.com/developer/msbuild/2003");
+			var project = new XElement (msbuild + "Project",
+				new XElement (msbuild + "Choose",
+					new XElement (msbuild + "When", new XAttribute ("Condition", " '$(JdkJvmPath)' == '' "),
+						new XElement (msbuild + "PropertyGroup",
+							new XElement (msbuild + "JdkJvmPath", jdkJvmPath)),
+						new XElement (msbuild + "ItemGroup",
+							includes.Select (i => new XElement (msbuild + "JdkIncludePath", new XAttribute ("Include", i)))))),
+				new XElement (msbuild + "PropertyGroup",
+					new XElement (msbuild + "JavaCPath", new XAttribute ("Condition", " '$(JavaCPath)' == '' "),
+						javacPath),
+					new XElement (msbuild + "JarPath", new XAttribute ("Condition", " '$(JarPath)' == '' "),
+						jarPath)));
+			project.Save (PropertyFile.ItemSpec);
+		}
+
+		void WriteMakeFragmentFile (string jarPath, string javacPath, string jdkJvmPath, 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}");
+			}
+		}
+	}
+}

build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks/JdkInfo.cs

@@ -6,17 +6,5 @@ class OS {
 		public  static  readonly  bool    IsWindows   = Path.DirectorySeparatorChar == '\\';
 		public  static  readonly  bool    IsMacOS     = !IsWindows && Directory.Exists ("/Applications");
 		public  static  readonly  bool    IsLinux     = !IsWindows && !IsMacOS;
-
-		public  static  readonly  string  NativeLibraryFormat;
-
-		static OS ()
-		{
-			if (IsWindows)
-				NativeLibraryFormat = "{0}.dll";
-			if (IsMacOS)
-				NativeLibraryFormat = "lib{0}.dylib";
-			if (IsLinux)
-				NativeLibraryFormat = "lib{0}.so";
-		}
 	}
 }

src/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks/OS.cs renamed to build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks/OS.cs

@@ -12,7 +12,7 @@
   <UsingTask AssemblyFile="$(_TopDir)\bin\Build$(Configuration)\Java.Interop.BootstrapTasks.dll" TaskName="Java.Interop.BootstrapTasks.DownloadUri" />
   <Target Name="Prepare">
     <Exec Command="git submodule update --init --recursive" WorkingDirectory="$(_TopDir)" />
-    <MSBuild Projects="$(MSBuildThisFileDirectory)..\..\src\Java.Interop.BootstrapTasks\Java.Interop.BootstrapTasks.csproj" />
+    <MSBuild Projects="$(MSBuildThisFileDirectory)..\..\build-tools\Java.Interop.BootstrapTasks\Java.Interop.BootstrapTasks.csproj" />
     <MakeDir Directories="$(_NuGetPath)" />
     <DownloadUri
         SourceUris="$(_NuGetUri)"