From 22492f03dc78ca268f757160d89e84a8cbb70e20 Mon Sep 17 00:00:00 2001 From: Dmitry Batrak Date: Fri, 13 May 2016 15:02:52 +0300 Subject: [PATCH] update bundled runtime from update script - correct path to java binary on OS X --- build/scripts/download_jre.gant | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/scripts/download_jre.gant b/build/scripts/download_jre.gant index 66bdf409e9a0..3e350848398b 100644 --- a/build/scripts/download_jre.gant +++ b/build/scripts/download_jre.gant @@ -19,7 +19,8 @@ import java.util.regex.Pattern target('default': 'Downloads custom JRE build from Teamcity server') { def buildId = new URL("$jreTeamcityUrl/buildTypes/id:$jreBuildTypeId/builds/tags:$jreBuildTag/id").text def buildNumber = new URL("$jreTeamcityUrl/builds/id:$buildId/number").text - java(jvm: "$workIdeaHome/jre/jre/bin/java", fork: "true", classname: "dummy", outputproperty: "jvmVersionOutput") { + java(jvm: jreArtifactPlatform == "mac" ? "$workIdeaHome/jre/jdk/Contents/Home/jre/bin/java" : "$workIdeaHome/jre/jre/bin/java", + fork: "true", classname: "dummy", outputproperty: "jvmVersionOutput") { jvmarg(value: "-version") } try {