From: Jim Procter Date: Thu, 3 Sep 2020 08:07:42 +0000 (+0100) Subject: Merge branch 'bug/JAL-3718_Getdown_does_not_autoupdate_correctly' into releases/Relea... X-Git-Tag: Release_2_11_1_1~13 X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=5f27e813b3cec6a6156f21b8a8885992fcc9962a;hp=a616a6b44a205303dcffc4200fb84d27b310ba7d Merge branch 'bug/JAL-3718_Getdown_does_not_autoupdate_correctly' into releases/Release_2_11_1_Branch --- diff --git a/build.gradle b/build.gradle index 682b5c2..5281bb1 100644 --- a/build.gradle +++ b/build.gradle @@ -344,6 +344,7 @@ ext { //libDir = j8libDir libDir = j11libDir libDistDir = j8libDir + digestonlyDir = j8digestonlyDir compile_source_compatibility = 1.8 compile_target_compatibility = 1.8 // these are getdown.txt properties defined dependent on the JAVA_VERSION @@ -357,6 +358,7 @@ ext { JAVA_INTEGER_VERSION = string("11") libDir = j11libDir libDistDir = j11libDir + digestonlyDir = j11digestonlyDir compile_source_compatibility = 11 compile_target_compatibility = 11 getdownAltJavaMinVersion = string(findProperty("getdown_alt_java11_min_version")) @@ -1345,6 +1347,16 @@ task getdownWebsite() { } } + fileTree(dir: digestonlyDir, include: ["*"]).getFiles().sort().each{f -> + def name = f.getName() + def line = "digestonly = ${getdownAppDistDir}/${name}\n" + getdownTextString += line + copy { + from f.getPath() + into getdownAppDir + } + } + // NOT USING MODULES YET, EVERYTHING SHOULD BE IN dist /* if (JAVA_VERSION.equals("11")) { diff --git a/getdown/lib/FJVL_VERSION b/getdown/lib/FJVL_VERSION index fdf3dcc..042c805 100644 --- a/getdown/lib/FJVL_VERSION +++ b/getdown/lib/FJVL_VERSION @@ -1 +1 @@ -1.8.3-1.2.6_FJVL +1.8.3-1.2.7_FJVL diff --git a/getdown/lib/JVL_VERSION b/getdown/lib/JVL_VERSION index 4492183..0cd0530 100644 --- a/getdown/lib/JVL_VERSION +++ b/getdown/lib/JVL_VERSION @@ -1 +1 @@ -1.8.3-1.2.6_JVL +1.8.3-1.2.7_JVL diff --git a/getdown/lib/getdown-core.jar b/getdown/lib/getdown-core.jar index 6748a25..368ce50 100644 Binary files a/getdown/lib/getdown-core.jar and b/getdown/lib/getdown-core.jar differ diff --git a/getdown/lib/getdown-launcher-local.jar b/getdown/lib/getdown-launcher-local.jar index 9a27f55..b7fc765 100644 Binary files a/getdown/lib/getdown-launcher-local.jar and b/getdown/lib/getdown-launcher-local.jar differ diff --git a/getdown/lib/getdown-launcher.jar b/getdown/lib/getdown-launcher.jar index e441bc6..3e3352c 100644 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 65686d2..cb427ba 100644 --- a/getdown/src/getdown/ant/pom.xml +++ b/getdown/src/getdown/ant/pom.xml @@ -4,7 +4,7 @@ com.threerings.getdown getdown - 1.8.3-1.2.6_FJVL + 1.8.3-1.2.7_FJVL getdown-ant diff --git a/getdown/src/getdown/core/pom.xml b/getdown/src/getdown/core/pom.xml index 6a9e169..1f4b310 100644 --- a/getdown/src/getdown/core/pom.xml +++ b/getdown/src/getdown/core/pom.xml @@ -4,7 +4,7 @@ com.threerings.getdown getdown - 1.8.3-1.2.6_FJVL + 1.8.3-1.2.7_FJVL getdown-core 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 b11a380..cffe7c1 100644 --- 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 @@ -354,6 +354,11 @@ public class Application return _resources; } + public List getDigestOnly () + { + return _digestonly; + } + /** * Returns the digest of the given {@code resource}. */ @@ -772,6 +777,7 @@ public class Application // clear our arrays as we may be reinitializing _codes.clear(); _resources.clear(); + _digestonly.clear(); _auxgroups.clear(); _jvmargs.clear(); _appargs.clear(); @@ -792,6 +798,8 @@ public class Application parseResources(config, "presource", Resource.PRELOAD, _resources); parseResources(config, "nresource", Resource.NATIVE, _resources); + parseResources(config, "digestonly", Resource.NORMAL, _digestonly); + // parse our auxiliary resource groups for (String auxgroup : config.getList("auxgroups")) { ArrayList codes = new ArrayList<>(); @@ -2074,6 +2082,7 @@ public class Application protected List _codes = new ArrayList<>(); protected List _resources = new ArrayList<>(); + protected List _digestonly = new ArrayList<>(); protected boolean _useCodeCache; protected int _codeCacheRetentionDays; diff --git a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/tools/Digester.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/tools/Digester.java index b04a653..8d96024 100644 --- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/tools/Digester.java +++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/tools/Digester.java @@ -81,6 +81,7 @@ public class Digester rsrcs.add(app.getConfigResource()); rsrcs.addAll(app.getCodeResources()); rsrcs.addAll(app.getResources()); + rsrcs.addAll(app.getDigestOnly()); for (Application.AuxGroup ag : app.getAuxGroups()) { rsrcs.addAll(ag.codes); rsrcs.addAll(ag.rsrcs); diff --git a/getdown/src/getdown/launcher/pom.xml b/getdown/src/getdown/launcher/pom.xml index 0410815..dac34c0 100644 --- a/getdown/src/getdown/launcher/pom.xml +++ b/getdown/src/getdown/launcher/pom.xml @@ -4,7 +4,7 @@ com.threerings.getdown getdown - 1.8.3-1.2.6_FJVL + 1.8.3-1.2.7_FJVL getdown-launcher diff --git a/getdown/src/getdown/mvn_cmd b/getdown/src/getdown/mvn_cmd index 25faf6f..ff85c2d 100755 --- a/getdown/src/getdown/mvn_cmd +++ b/getdown/src/getdown/mvn_cmd @@ -3,7 +3,7 @@ if [ x$JVLVERSION != x ]; then export VERSION=$JVLVERSION else - export VERSION=1.8.3-1.2.6_JVL + export VERSION=1.8.3-1.2.7_JVL fi if [ x${VERSION%_JVL} = x$VERSION ]; then diff --git a/getdown/src/getdown/pom.xml b/getdown/src/getdown/pom.xml index 0011325..c3f51d2 100644 --- a/getdown/src/getdown/pom.xml +++ b/getdown/src/getdown/pom.xml @@ -10,7 +10,7 @@ com.threerings.getdown getdown pom - 1.8.3-1.2.6_FJVL + 1.8.3-1.2.7_FJVL getdown An application installer and updater. diff --git a/gradle.properties b/gradle.properties index dbf124b..453572a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -106,9 +106,12 @@ getdown_alt_java11_max_version = jre_installs_dir = ~/buildtools/jre j8libDir = j8lib +j8digestonlyDir = j8digestonly j11libDir = j11lib j11modDir = j11mod j11modules = com.sun.istack.runtime,com.sun.xml.bind,com.sun.xml.fastinfoset,com.sun.xml.streambuffer,com.sun.xml.txw2,com.sun.xml.ws.policy,java.activation,java.annotation,java.base,java.compiler,java.datatransfer,java.desktop,java.logging,java.management,java.management.rmi,java.naming,java.prefs,java.rmi,java.scripting,java.security.sasl,java.sql,java.xml,java.xml.bind,java.xml.soap,java.xml.ws,javax.jws,jdk.httpserver,jdk.jsobject,jdk.unsupported,jdk.xml.dom,org.jvnet.mimepull,org.jvnet.staxex,javax.servlet.api,java.ws.rs +j11digestonlyDir = j11digestonly + install4j_home_dir = ~/buildtools/install4j8 install4j_copyright_message = ... diff --git a/j11digestonly/htsjdk-2.12.0.jar b/j11digestonly/htsjdk-2.12.0.jar new file mode 100644 index 0000000..bcf201f Binary files /dev/null and b/j11digestonly/htsjdk-2.12.0.jar differ diff --git a/j11digestonly/intervalstore-v1.0.jar b/j11digestonly/intervalstore-v1.0.jar new file mode 100644 index 0000000..668b543 Binary files /dev/null and b/j11digestonly/intervalstore-v1.0.jar differ diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar index 6748a25..368ce50 100644 Binary files a/j11lib/getdown-core.jar and b/j11lib/getdown-core.jar differ diff --git a/j8digestonly/htsjdk-2.12.0.jar b/j8digestonly/htsjdk-2.12.0.jar new file mode 100644 index 0000000..bcf201f Binary files /dev/null and b/j8digestonly/htsjdk-2.12.0.jar differ diff --git a/j8digestonly/intervalstore-v1.0.jar b/j8digestonly/intervalstore-v1.0.jar new file mode 100644 index 0000000..668b543 Binary files /dev/null and b/j8digestonly/intervalstore-v1.0.jar differ diff --git a/j8lib/getdown-core.jar b/j8lib/getdown-core.jar index 6748a25..368ce50 100644 Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ