huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Build: fixed JDK detection via registry to support finding JDK 8 (#10369)

This commit is contained in:
Alessio Franceschelli 2019-05-21 19:35:29 +01:00 committed by Nate McMaster
parent 66fd4be4d7
commit 7ab01a3f79
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
build.ps1
View File

@ -329,12 +329,19 @@ if ($RunBuild -and ($All -or $BuildJava) -and -not $NoBuildJava) {
} }
else { else {
try { try {
$jdkVersion = (Get-Item HKLM:\SOFTWARE\JavaSoft\JDK | Get-ItemProperty -name CurrentVersion).CurrentVersion $jdkRegistryKeys = @(
$javaHome = (Get-Item HKLM:\SOFTWARE\JavaSoft\JDK\$jdkVersion | Get-ItemProperty -Name JavaHome).JavaHome "HKLM:\SOFTWARE\JavaSoft\JDK", # for JDK 10+
if (Test-Path "$javaHome\bin\javac.exe") { "HKLM:\SOFTWARE\JavaSoft\Java Development Kit" # fallback for JDK 8
$env:JAVA_HOME = $javaHome )
Write-Host -f Magenta "Detected JDK $jdkVersion in $env:JAVA_HOME (via registry)" $jdkRegistryKey = $jdkRegistryKeys | Where-Object { Test-Path $_ } | Select-Object -First 1
$foundJdk = $true if ($jdkRegistryKey) {
$jdkVersion = (Get-Item $jdkRegistryKey | Get-ItemProperty -name CurrentVersion).CurrentVersion
$javaHome = (Get-Item $jdkRegistryKey\$jdkVersion | Get-ItemProperty -Name JavaHome).JavaHome
if (Test-Path "${javaHome}\bin\javac.exe") {
$env:JAVA_HOME = $javaHome
Write-Host -f Magenta "Detected JDK $jdkVersion in $env:JAVA_HOME (via registry)"
$foundJdk = $true
}
} }
} }
catch { catch {