git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0f4ea2c
)
JAL-2418 JAL-2116 make sure java 8,7 vm args are also listed
author
Jim Procter
<jprocter@issues.jalview.org>
Thu, 17 Aug 2017 10:41:33 +0000
(11:41 +0100)
committer
Jim Procter
<jprocter@issues.jalview.org>
Thu, 17 Aug 2017 10:41:33 +0000
(11:41 +0100)
build.xml
patch
|
blob
|
history
diff --git
a/build.xml
b/build.xml
index
94f32fd
..
2ab4bec
100755
(executable)
--- a/
build.xml
+++ b/
build.xml
@@
-426,7
+426,6
@@
</information>
<resources>
<j2se version="9+" />
</information>
<resources>
<j2se version="9+" />
- <j2se version="7,8" initial_heap_size="${inih}" max_heap_size="${maxh}" />
<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" />
@@
-452,7
+451,7
@@
<jnlpf toFile="${jnlpFile}" />
<!-- add a j2se entry for java 9 -->
<jnlpf toFile="${jnlpFile}" />
<!-- add a j2se entry for java 9 -->
- <replace file="${jnlpFile}" value="j2se version="9+" initial-heap-size="${inih}" max-heap-size="${maxh}" java-vm-args="--add-modules=java.se.ee"">
+ <replace file="${jnlpFile}" value="j2se version="9+" initial-heap-size="${inih}" max-heap-size="${maxh}" java-vm-args="--add-modules=java.se.ee"/><j2se version="7,8" initial-heap-size="${inih}" max-heap-size="${maxh}"">
<replacetoken>j2se version="9+"</replacetoken>
</replace>
<replacetoken>j2se version="9+"</replacetoken>
</replace>