git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2859 failing test demonstrating sequences with pdb without a local file map all...
[jalview.git]
/
build.xml
diff --git
a/build.xml
b/build.xml
index
c965bc9
..
4931cfb
100755
(executable)
--- a/
build.xml
+++ b/
build.xml
@@
-425,8
+425,7
@@
<offline_allowed />
</information>
<resources>
<offline_allowed />
</information>
<resources>
- <j2se version="${j2sev}" initial_heap_size="${inih}" max_heap_size="${maxh}" />
- <j2se version="9+" initial_heap_size="${inih}" max_heap_size="${maxh}" java-vm-args="--add-modules java.rmi,java.xml,java.xml.bind,java.xml.ws"/>
+ <j2se version="1.7+" />
<jar main="true" href="jalview.jar"/>
<fileset dir="${packageDir}">
<exclude name="jalview.jar" />
<jar main="true" href="jalview.jar"/>
<fileset dir="${packageDir}">
<exclude name="jalview.jar" />
@@
-451,7
+450,11
@@
</presetdef>
<jnlpf toFile="${jnlpFile}" />
</presetdef>
<jnlpf toFile="${jnlpFile}" />
-
+ <!-- add the add-modules j2se attribute for java 9 -->
+ <replace file="${jnlpFile}" value="j2se version="1.7+" initial-heap-size="${inih}" max-heap-size="${maxh}" java-vm-args="--add-modules=java.se.ee --illegal-access=warn"">
+ <replacetoken>j2se version="1.7+"</replacetoken>
+
+ </replace>
</target>
<target name="-dofakejnlpfileassoc" depends="-generatejnlpf" if="nojnlpfileassocs">
</target>
<target name="-dofakejnlpfileassoc" depends="-generatejnlpf" if="nojnlpfileassocs">