JAL-1988 JAVA 11 enabled version with Quit, Preferences and About handlers enabled...

[jalview.git] / build.xml

diff --git a/build.xml b/build.xml
index 5ca105a..ab9e3e0 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -106,6 +106,18 @@
     <condition property="java9">
       <equals arg1="${ant.java.version}" arg2="9"/>
     </condition>
+    <!-- Java 10 JVM args -->
+    <condition property="java10">
+      <equals arg1="${ant.java.version}" arg2="10"/>
+    </condition>
+    <!-- Java 11 JVM args -->
+    <condition property="java11">
+      <equals arg1="${ant.java.version}" arg2="11"/>
+    </condition>
+    <echo message="java version is ${ant.java.version}"/>
+    <echo message="java9 is ${java9}"/>
+    <echo message="java10 is ${java10}"/>
+    <echo message="java11 is ${java11}"/>
 
     <!-- Don't change anything below here unless you know what you are doing! -->
     <!-- Url path for WebStart in JNLP file -->
@@ -129,6 +141,7 @@
 
     <!-- build directory configuration -->
     <property name="libDir" value="lib" />
+    <property name="j11libDir" value="j11lib" />
     <property name="resourceDir" value="resources" />
     <property name="helpDir" value="help" />
     <property name="docDir" value="doc" />
@@ -167,6 +180,10 @@
         <include name="*.jar" />
         <include name="**/*.jar" />
       </fileset>
+      <fileset dir="${j11libDir}">
+        <include name="*.jar" />
+        <include name="**/*.jar" />
+      </fileset>
       <fileset dir="${libDir}">
         <include name="*.jar" />
         <include name="**/*.jar" />