JAL-3130 tweaked build.xml to do java 11 bytecode compiling[git branchgit branch...

[jalview.git] / build.xml

diff --git a/build.xml b/build.xml
index 8eeaf7f..ba88f9a 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -114,7 +114,7 @@
     <condition property="java11">
       <equals arg1="${ant.java.version}" arg2="11"/>
     </condition>
-    <echo message="java version is ${ant.java.version}"/>
+    <echo message="ant.java.version is ${ant.java.version}"/>
 
     <!-- Don't change anything below here unless you know what you are doing! -->
     <!-- Url path for WebStart in JNLP file -->
@@ -125,8 +125,12 @@
     <!-- Anne's version needs 1.7 - should rebuild VARNA to java 1.6 for release -->
     <property name="j2sev" value="1.7+" />
     <!-- Java Compilation settings - source and target javac version -->
-    <property name="javac.source" value="1.8" />
-    <property name="javac.target" value="1.8" />
+    <property name="javac.source" value="11" if:set="java11" />
+    <property name="javac.target" value="11" if:set="java11" />
+    <property name="javac.source" value="1.8" unless:set="java11" />
+    <property name="javac.target" value="1.8" unless:set="java11" />
+    <echo message="javac.source is ${javac.source}"/>
+    <echo message="javac.target is ${javac.target}"/>
 
     <!-- Permissions for running Java applets and applications. -->
     <!-- Defaults are those suitable for deploying jalview webstart www.jalview.org -->