From c5e67e766f54ecdaecd27052bbd252477770a896 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Tue, 1 Sep 2020 17:45:21 +0100 Subject: [PATCH] JAL-3280 fixes after CR-JAL-241. Now only checking release build_properties. --- build.gradle | 6 ++++-- src/jalview/bin/Cache.java | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index acf5737..c796b3b 100644 --- a/build.gradle +++ b/build.gradle @@ -1600,8 +1600,10 @@ task getdownWebsite() { //getdownTextString += "class = " + file(getdownLauncher).getName() + "\n" getdownTextString += "resource = ${getdown_launcher_new}\n" getdownTextString += "class = ${main_class}\n" - getdownTextString += "jvmarg = -Dgetdowndistdir=${getdownAppDistDir}\n" - getdownTextString += "jvmarg = -Dgetdownappbase=${getdownAppBase}\n" + /* NOT setting these properties so that getdownappbase and getdowndistdir will default to release version + * getdownTextString += "jvmarg = -Dgetdowndistdir=${getdownAppDistDir}\n" + * getdownTextString += "jvmarg = -Dgetdownappbase=${getdownAppBase}\n" + */ def getdown_txt = file("${getdownWebsiteDir}/getdown.txt") getdown_txt.write(getdownTextString) diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java index 806d263..ef42589 100755 --- a/src/jalview/bin/Cache.java +++ b/src/jalview/bin/Cache.java @@ -554,7 +554,6 @@ public class Cache Properties remoteBuildProperties = new Properties(); remoteBuildProperties.load(in); remoteVersion = remoteBuildProperties.getProperty("VERSION"); - remoteBuildProperties.load(in); } catch (Exception ex) { System.out @@ -567,7 +566,6 @@ public class Cache orgtimeout); setProperty("LATEST_VERSION", remoteVersion); - System.out.println("LATEST_VERSION=" + remoteVersion); } } -- 1.7.10.2