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:
d71b2c7
)
JAL-3348 jvmmempc in jvl file now works in linux
author
Ben Soares
<bsoares@dundee.ac.uk>
Wed, 3 Jul 2019 22:42:35 +0000
(23:42 +0100)
committer
Ben Soares
<bsoares@dundee.ac.uk>
Wed, 3 Jul 2019 22:42:35 +0000
(23:42 +0100)
getdown/lib/getdown-core.jar
patch
|
blob
|
history
getdown/lib/getdown-launcher.jar
patch
|
blob
|
history
getdown/src/getdown/ant/pom.xml
patch
|
blob
|
history
getdown/src/getdown/core/pom.xml
patch
|
blob
|
history
getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
patch
|
blob
|
history
getdown/src/getdown/launcher/pom.xml
patch
|
blob
|
history
getdown/src/getdown/pom.xml
patch
|
blob
|
history
j11lib/getdown-core.jar
patch
|
blob
|
history
j8lib/getdown-core.jar
patch
|
blob
|
history
diff --git
a/getdown/lib/getdown-core.jar
b/getdown/lib/getdown-core.jar
index
7324541
..
34723c1
100644
(file)
Binary files a/getdown/lib/getdown-core.jar and b/getdown/lib/getdown-core.jar differ
diff --git
a/getdown/lib/getdown-launcher.jar
b/getdown/lib/getdown-launcher.jar
index
32a0bc4
..
edeadaa
100644
(file)
Binary files a/getdown/lib/getdown-launcher.jar and b/getdown/lib/getdown-launcher.jar differ
diff --git
a/getdown/src/getdown/ant/pom.xml
b/getdown/src/getdown/ant/pom.xml
index
f9f0d08
..
0064425
100644
(file)
--- a/
getdown/src/getdown/ant/pom.xml
+++ b/
getdown/src/getdown/ant/pom.xml
@@
-4,7
+4,7
@@
<parent>
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
<parent>
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
- <version>1.8.3_1.1.6_JVL</version>
+ <version>1.8.3_1.1.7_JVL</version>
</parent>
<artifactId>getdown-ant</artifactId>
</parent>
<artifactId>getdown-ant</artifactId>
diff --git
a/getdown/src/getdown/core/pom.xml
b/getdown/src/getdown/core/pom.xml
index
b21b1f9
..
80d0c38
100644
(file)
--- a/
getdown/src/getdown/core/pom.xml
+++ b/
getdown/src/getdown/core/pom.xml
@@
-4,7
+4,7
@@
<parent>
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
<parent>
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
- <version>1.8.3_1.1.6_JVL</version>
+ <version>1.8.3_1.1.7_JVL</version>
</parent>
<artifactId>getdown-core</artifactId>
</parent>
<artifactId>getdown-core</artifactId>
diff --git
a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
index
799b5bb
..
7c2a427
100644
(file)
--- a/
getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
+++ b/
getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
@@
-819,14
+819,16
@@
public class Application
ARG: for (int i = 0; i < _jvmargs.size(); i++) {
if (_jvmargs.get(i) instanceof java.lang.String && _jvmargs.get(i).startsWith("-Xmx")) {
_jvmargs.remove(i);
ARG: for (int i = 0; i < _jvmargs.size(); i++) {
if (_jvmargs.get(i) instanceof java.lang.String && _jvmargs.get(i).startsWith("-Xmx")) {
_jvmargs.remove(i);
+ break ARG;
}
}
addAll(maxMemHeapArg, _jvmargs);
}
}
addAll(maxMemHeapArg, _jvmargs);
+ log.info("Max memory set", "maxMemHeapArg", maxMemHeapArg[0]);
}
} else if (jvmmempc != -1) {
}
} else if (jvmmempc != -1) {
- System.out.println("'jvmmempc' value must be in range 0 to 100 (read as '"+Integer.toString(jvmmempc)+"')");
+ log.warning("'jvmmempc' value must be in range 0 to 100 (read as '"+Integer.toString(jvmmempc)+"')");
}
// get the set of optimum JVM arguments
}
// get the set of optimum JVM arguments
diff --git
a/getdown/src/getdown/launcher/pom.xml
b/getdown/src/getdown/launcher/pom.xml
index
00686cb
..
4755cc6
100644
(file)
--- a/
getdown/src/getdown/launcher/pom.xml
+++ b/
getdown/src/getdown/launcher/pom.xml
@@
-4,7
+4,7
@@
<parent>
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
<parent>
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
- <version>1.8.3_1.1.6_JVL</version>
+ <version>1.8.3_1.1.7_JVL</version>
</parent>
<artifactId>getdown-launcher</artifactId>
</parent>
<artifactId>getdown-launcher</artifactId>
diff --git
a/getdown/src/getdown/pom.xml
b/getdown/src/getdown/pom.xml
index
cdee51c
..
2807be5
100644
(file)
--- a/
getdown/src/getdown/pom.xml
+++ b/
getdown/src/getdown/pom.xml
@@
-10,7
+10,7
@@
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
<packaging>pom</packaging>
<groupId>com.threerings.getdown</groupId>
<artifactId>getdown</artifactId>
<packaging>pom</packaging>
- <version>1.8.3_1.1.6_JVL</version>
+ <version>1.8.3_1.1.7_JVL</version>
<name>getdown</name>
<description>An application installer and updater.</description>
<name>getdown</name>
<description>An application installer and updater.</description>
diff --git
a/j11lib/getdown-core.jar
b/j11lib/getdown-core.jar
index
7324541
..
34723c1
100644
(file)
Binary files a/j11lib/getdown-core.jar and b/j11lib/getdown-core.jar differ
diff --git
a/j8lib/getdown-core.jar
b/j8lib/getdown-core.jar
index
7324541
..
34723c1
100644
(file)
Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ