summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2015-03-02 13:12:47 -0330
committerDwayne Boone <dwayne@zeroc.com>2015-03-02 13:12:47 -0330
commita09e629f327b0828f409eefec561a9f85c28a26e (patch)
tree6e72dbbe0c3c3f58412153af1c6a8401adbc971a
parentICE-6314 Upgrade to gradle 2.3 (diff)
downloadice-a09e629f327b0828f409eefec561a9f85c28a26e.tar.bz2
ice-a09e629f327b0828f409eefec561a9f85c28a26e.tar.xz
ice-a09e629f327b0828f409eefec561a9f85c28a26e.zip
ICE-6287 better error message if JavaFx jars cannnot be found
-rw-r--r--java/src/IceGridGUI/javafx.gradle8
1 files changed, 8 insertions, 0 deletions
diff --git a/java/src/IceGridGUI/javafx.gradle b/java/src/IceGridGUI/javafx.gradle
index 72677ff5716..2ebfe11ad6a 100644
--- a/java/src/IceGridGUI/javafx.gradle
+++ b/java/src/IceGridGUI/javafx.gradle
@@ -12,6 +12,14 @@ def javafxJar = searchFile([{System.env['JFXRT_HOME']}, {System.env['JAVA_HOME']
def antJavafxJar = searchFile([{System.env['JFXRT_HOME']}, {System.env['JAVA_HOME']}, {System.properties['java.home']}],
['ant-javafx.jar', 'lib/ant-javafx.jar', '../lib/ant-javafx.jar'])
+if (!javafxJar) {
+ throw new GradleException("Unable to locate JavaFX jar (jfxrt.jar), JAVA_HOME may need to be set.")
+}
+
+if (!antJavafxJar) {
+ throw new GradleException("Unable to locate JavaFX Ant jar (ant-javafx.jar), JAVA_HOME may need to be set.")
+}
+
configurations {
jfxrt
jfxant