unpack JDKs: use 32-bit JVM on 32-bit Windows

This commit is contained in:
nik
2015-05-19 10:32:08 +03:00
parent c7eb1e1bc1
commit 615cc49b35
+1 -1
View File
@@ -49,7 +49,7 @@ def unpackJdks() {
private void unpackJdk(File osDir, File jdkDir, String majorVersion) {
def jdkFiles = osDir.listFiles().findAll { it.name.startsWith("jdk$majorVersion") }
if (SystemInfo.isWindows) {
def arch = "x64"
def arch = System.getenv("ProgramFiles(x86)") != null ? "x64" : "x32"
jdkFiles = jdkFiles.findAll { it.name.endsWith("_${arch}.zip") }
}
if (jdkFiles.empty) {