Skip to content

[Windows] check %JAVA_HOME% for locating Jdk #74

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
jonathanpeppers merged 3 commits into from
Jul 2, 2019
Merged

[Windows] check %JAVA_HOME% for locating Jdk #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af98a44
[Windows] check %JAVA_HOME% for locating Jdk
jonathanpeppers Jul 1, 2019
06f7b50
Use JdkInfoTests.CreateFauxJdk
jonathanpeppers Jul 1, 2019
8ce17b0
Ignore test
jonathanpeppers Jul 1, 2019
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
14 changes: 13 additions & 1 deletion src/Xamarin.Android.Tools.AndroidSdk/Sdks/AndroidSdkWindows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,19 @@ IEnumerable<JdkInfo> ToJdkInfos (IEnumerable<string> paths, string locator)
return ToJdkInfos (GetPreferredJdkPaths (), "Preferred Registry")
.Concat (ToJdkInfos (GetOpenJdkPaths (), "OpenJDK"))
.Concat (ToJdkInfos (GetKnownOpenJdkPaths (), "Well-known OpenJDK paths"))
.Concat (ToJdkInfos (GetOracleJdkPaths (), "Oracle JDK"));
.Concat (ToJdkInfos (GetOracleJdkPaths (), "Oracle JDK"))
.Concat (ToJdkInfos (GetEnvironmentJdkPaths (), "Environment Variables"));
}

private static IEnumerable<string> GetEnvironmentJdkPaths ()
{
var environment = new [] { "JAVA_HOME" };
foreach (var key in environment) {
var value = Environment.GetEnvironmentVariable (key);
if (!string.IsNullOrEmpty (value)) {
yield return value;
}
}
}

private static IEnumerable<string> GetPreferredJdkPaths ()
Expand Down
29 changes: 29 additions & 0 deletions src/Xamarin.Android.Tools.AndroidSdk/Tests/AndroidSdkInfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,35 @@ public void Constructor_SetValuesFromPath ()
}
}

[Test]
[Ignore ("This test will only work locally if you rename/remove your Open JDK directory.")]
public void JdkDirectory_JavaHome ()
{
CreateSdks (out string root, out string jdk, out string ndk, out string sdk);
JdkInfoTests.CreateFauxJdk (jdk, releaseVersion: "1.8.999", releaseBuildNumber: "9", javaVersion: "1.8.999-9");

var logs = new StringWriter ();
Action<TraceLevel, string> logger = (level, message) => {
logs.WriteLine ($"[{level}] {message}");
};

string java_home = null;
try {
// We only set via JAVA_HOME
java_home = Environment.GetEnvironmentVariable ("JAVA_HOME", EnvironmentVariableTarget.Process);
Environment.SetEnvironmentVariable ("JAVA_HOME", jdk);
var info = new AndroidSdkInfo (logger, androidSdkPath: sdk, androidNdkPath: ndk, javaSdkPath: "");

Assert.AreEqual (ndk, info.AndroidNdkPath, "AndroidNdkPath not preserved!");
Assert.AreEqual (sdk, info.AndroidSdkPath, "AndroidSdkPath not preserved!");
Assert.AreEqual (jdk, info.JavaSdkPath, "JavaSdkPath not preserved!");
} finally {
if (java_home != null)
Environment.SetEnvironmentVariable ("JAVA_HOME", java_home, EnvironmentVariableTarget.Process);
Directory.Delete (root, recursive: true);
}
}

static bool IsWindows => OS.IsWindows;

static void CreateSdks (out string root, out string jdk, out string ndk, out string sdk)
Expand Down