diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-03-19 11:57:54 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-03-19 11:57:54 -0230 |
| commit | cc94d6b0d68bb45bb4c22a24f7e166918023da9c (patch) | |
| tree | 53b23b855bf52441d0a14cb000fd5a92de57ae0e /java | |
| parent | Removed protobuf demos (diff) | |
| download | ice-cc94d6b0d68bb45bb4c22a24f7e166918023da9c.tar.bz2 ice-cc94d6b0d68bb45bb4c22a24f7e166918023da9c.tar.xz ice-cc94d6b0d68bb45bb4c22a24f7e166918023da9c.zip | |
ICE-6374 Ensure source build works if ICE_HOME is set
Diffstat (limited to 'java')
| -rw-r--r-- | java/gradle/ice.gradle | 11 |
1 files changed, 9 insertions, 2 deletions
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 } } |