summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-11-16 19:57:25 +0100
committerJose <jose@zeroc.com>2012-11-16 19:57:25 +0100
commitafb49c796b2a63ffbc2decd77e8fb0431f54593b (patch)
treee62d416f1395530b665167700641e42ef77cd382
parentFixed make install to install correct upgradeicegrid??.py scripts (diff)
downloadice-afb49c796b2a63ffbc2decd77e8fb0431f54593b.tar.bz2
ice-afb49c796b2a63ffbc2decd77e8fb0431f54593b.tar.xz
ice-afb49c796b2a63ffbc2decd77e8fb0431f54593b.zip
Fixed (ICE-4943) Warning when building Ice for Java
-rw-r--r--java/build.xml2
-rw-r--r--java/config/common.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/java/build.xml b/java/build.xml
index feb8ae78a91..57c264c6895 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -622,7 +622,7 @@
</jar>
</target>
- <target name="icegridadmin-compile" depends="icestorm-compile, icegrid-compile, icebox-compile"
+ <target name="icegridadmin-compile" depends="icestorm-compile, icegrid-compile, icebox-compile, config-init-javafx"
if="build-icegridadmin" unless="ice.bin.dist">
<javac srcdir="${src.dir}" destdir="${lib.dir}"
source="1.7" target="1.7" debug="${debug}"
diff --git a/java/config/common.xml b/java/config/common.xml
index fdd7b24c8da..867533b9147 100644
--- a/java/config/common.xml
+++ b/java/config/common.xml
@@ -399,7 +399,7 @@
classpath="${ant-javafx.jar}"/>
</target>
- <target name="config-init" depends="config-init-warn, config-init-javafx">
+ <target name="config-init" depends="config-init-warn">
<!-- Set slice.dir to the directory containing the Slice files. -->
<condition property="slice.dir" value="/usr/share/Ice-${ice.version}/slice" else="${ice.dir}/slice">