From: Ben Soares Date: Fri, 18 Mar 2022 16:55:46 +0000 (+0000) Subject: JAL-3978 Getdown add getdownappbase property to launched Jalview X-Git-Tag: Release_2_11_2_6~64^2~27 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a9bc8da0124b22fde5d9e98b428e02f3338821b4;p=jalview.git JAL-3978 Getdown add getdownappbase property to launched Jalview --- diff --git a/getdown/lib/FJVL_VERSION b/getdown/lib/FJVL_VERSION index 4a5376d..1a5992a 100644 --- a/getdown/lib/FJVL_VERSION +++ b/getdown/lib/FJVL_VERSION @@ -1 +1 @@ -1.8.3-1.2.12_FJVL +1.8.3-1.2.13_FJVL diff --git a/getdown/lib/JVL_VERSION b/getdown/lib/JVL_VERSION index ed249ad..60daf6c 100644 --- a/getdown/lib/JVL_VERSION +++ b/getdown/lib/JVL_VERSION @@ -1 +1 @@ -1.8.3-1.2.12_JVL +1.8.3-1.2.13_JVL diff --git a/getdown/lib/getdown-core.jar b/getdown/lib/getdown-core.jar index 2e695eb..6a5badf 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 fd89e15..b7af0b6 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 38c3a19..02d31cc 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 881c952..ed0f34a 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.12_FJVL + 1.8.3-1.2.13_FJVL getdown-ant diff --git a/getdown/src/getdown/core/pom.xml b/getdown/src/getdown/core/pom.xml index 3e52eca..a7dfa07 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.12_FJVL + 1.8.3-1.2.13_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 8048728..36a8119 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 @@ -1085,6 +1085,9 @@ public class Application log.info("Not setting proxy"); } + // add the getdownappbase property. getdownappdir is added by getdown.txt + args.add("-Dgetdownappbase=" + getAppbase().toString()); + // add the marker indicating the app is running in getdown args.add("-D" + Properties.GETDOWN + "=true"); args.add("-Dsys.install4jVersion=" + Application.i4jVersion); diff --git a/getdown/src/getdown/launcher/pom.xml b/getdown/src/getdown/launcher/pom.xml index df0ebbe..6cf40a8 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.12_FJVL + 1.8.3-1.2.13_FJVL getdown-launcher diff --git a/getdown/src/getdown/mvn_cmd b/getdown/src/getdown/mvn_cmd index 4a9d2ea..36bc298 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.12_JVL + export VERSION=1.8.3-1.2.13_JVL fi if [ x${VERSION%_JVL} = x$VERSION ]; then diff --git a/getdown/src/getdown/pom.xml b/getdown/src/getdown/pom.xml index 87b361e..dc12610 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.12_FJVL + 1.8.3-1.2.13_FJVL getdown An application installer and updater. diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar index 2e695eb..6a5badf 100644 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 2e695eb..6a5badf 100644 Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ