From cc94d6b0d68bb45bb4c22a24f7e166918023da9c Mon Sep 17 00:00:00 2001 From: Dwayne Boone Date: Thu, 19 Mar 2015 11:57:54 -0230 Subject: ICE-6374 Ensure source build works if ICE_HOME is set --- java/gradle/ice.gradle | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'java') diff --git a/java/gradle/ice.gradle b/java/gradle/ice.gradle index 58d25962d7e..be8c6f03bf2 100644 --- a/java/gradle/ice.gradle +++ b/java/gradle/ice.gradle @@ -68,8 +68,15 @@ def iceHome = env['ICE_HOME'] if (iceHome != null && iceHome.length() > 0) { def translator = new File("$iceHome/bin/$slice2java") if (!translator.exists()) { - throw new GradleException("Unable to find $slice2java in $iceHome, please verify ICE_HOME is " + - "properly configured and Ice is correctly installed.") + // + // Make sure ICE_HOME is not just pointing to the source distribution + // + translator = new File("$iceHome/cpp/bin/$slice2java") + if (!translator.exists()) { + throw new GradleException("Unable to find $slice2java in $iceHome, please verify ICE_HOME is " + + "properly configured and Ice is correctly installed.") + } + iceHome = null } } -- cgit v1.2.3