JAL-3449 install4j version, install4j template version, getdown version now all being...

diff --git a/build.gradle b/build.gradle
index 3ebb7ec..336bc42 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -1432,3 +1432,5 @@ task helppages  {
 }
 
 // LARGE AMOUNT OF JALVIEWJS STUFF DELETED HERE
+task eclipseAutoBuildTask {}
+task eclipseSynchronizationTask {}

diff --git a/getdown/lib/getdown-core.jar b/getdown/lib/getdown-core.jar
index 703b4ec..2c1e03a 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-local.jar b/getdown/lib/getdown-launcher-local.jar
index fadb3df..b2275c6 100644 (file)
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 400dedd..8ece2b6 100644 (file)
Binary files a/getdown/lib/getdown-launcher.jar and b/getdown/lib/getdown-launcher.jar differ

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 7cc3e09..944fbde 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
@@ -25,6 +25,7 @@ import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
 
 import jalview.bin.MemorySetting;
+import com.install4j.api.launcher.Variables;
 
 import com.threerings.getdown.util.*;
 // avoid ambiguity with java.util.Base64 which we can't use as it's 1.8+
@@ -1062,6 +1063,9 @@ public class Application
 
         // add the marker indicating the app is running in getdown
         args.add("-D" + Properties.GETDOWN + "=true");
+        args.add("-Dsys.install4jVersion=" + Variables.getCompilerVariable("sys.install4jVersion"));
+        args.add("-Dinstaller_template_version=" + System.getProperty("installer_template_version"));
+        args.add("-Dlauncher_version=" + Build.version());
 
         // set the native library path if we have native resources
         // @TODO optional getdown.txt parameter to set addCurrentLibraryPath to true or false?

diff --git a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java
index 7c54f80..4a44f9b 100644 (file)
--- a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java
+++ b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java
@@ -35,6 +35,7 @@ import com.threerings.getdown.util.LaunchUtil;
 import com.threerings.getdown.util.StringUtil;
 import static com.threerings.getdown.Log.log;
 import jalview.bin.StartupNotificationListener;
+import com.install4j.api.launcher.Variables;
 
 /**
  * The main application entry point for Getdown.
@@ -114,10 +115,12 @@ public class GetdownApp
     log.info("-- OS Vers: " + System.getProperty("os.version"));
     log.info("-- Java Vers: " + System.getProperty("java.version"));
     log.info("-- Java Home: " + System.getProperty("java.home"));
+    log.info("-- Install4j Vers: " + Variables.getCompilerVariable("sys.install4jVersion"));
+    log.info("-- Install4j Template Vers: " + System.getProperty("installer_template_version"));
     log.info("-- User Name: " + System.getProperty("user.name"));
     log.info("-- User Home: " + System.getProperty("user.home"));
     log.info("-- Cur dir: " + System.getProperty("user.dir"));
-       log.info("-- launcher version: "+Build.version());
+    log.info("-- Launcher version: "+Build.version());
     log.info("-- startupFilesParameterString: " + startupFilesParameterString);
     log.info("---------------------------------------------");
 

diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar
index 703b4ec..2c1e03a 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 703b4ec..2c1e03a 100644 (file)
Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ

diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index 8418d68..4e4a021 100755 (executable)
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -1080,26 +1080,32 @@ public class Cache
    */
   public static String getVersionDetailsForConsole()
   {
-    return "Jalview Version: "
-            + jalview.bin.Cache.getDefault("VERSION", "TEST")
-            + "\n" + "Jalview Installation: "
-            + jalview.bin.Cache.getDefault("INSTALLATION",
-                    "unknown")
-            + "\n" + "Build Date: "
-            + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown")
-            + "\n" + "Java version: "
-            + System.getProperty("java.version") + "\n"
-            + System.getProperty("os.arch") + " "
-            + System.getProperty("os.name") + " "
-            + System.getProperty("os.version")
-            + (jalview.bin.Cache.getDefault("VERSION", "TEST")
-                    .equals("DEVELOPMENT")
-                                                               ? "\nGetdown appdir: " + System.getProperty("getdownappdir") + "\nJava path: "
-                                    + System.getProperty(
-                                            "java.home")
-                                    + File.separator + "bin"
-                                    + File.separator + "java"
-                                                               : "");
+    StringBuilder sb = new StringBuilder();
+    sb.append("Jalview Version: " + jalview.bin.Cache.getDefault("VERSION", "TEST"));
+    sb.append("\n");
+    sb.append("Jalview Installation: "
+            + jalview.bin.Cache.getDefault("INSTALLATION", "unknown"));
+    sb.append("\n");
+    sb.append("Build Date: " + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown"));
+    sb.append("\n");
+    sb.append("Java version: " + System.getProperty("java.version"));
+    sb.append("\n");
+    sb.append(System.getProperty("os.arch") + " " + System.getProperty("os.name") + " " + System.getProperty("os.version"));
+    sb.append("\n");
+    System.out.println("Install4j version: "
+            + System.getProperty("sys.install4jVersion"));
+    System.out.println("Install4j template version: "
+            + System.getProperty("installer_template_version"));
+    System.out.println(
+            "Launcher version: " + System.getProperty("launcher_version"));
+
+    if (jalview.bin.Cache.getDefault("VERSION", "TEST").equals("DEVELOPMENT")) {
+      sb.append("Getdown appdir: " + System.getProperty("getdownappdir"));
+      sb.append("\n");
+      sb.append("Java home: " + System.getProperty("java.home"));
+      sb.append("\n");
+    }
+    return sb.toString();
   }
 
   /**

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index ca2a584..a5cf48f 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -199,9 +199,17 @@ public class Jalview
     System.setSecurityManager(null);
     System.out
             .println("Java version: " + System.getProperty("java.version"));
+    System.out.println("Java Home: " + System.getProperty("java.home"));
     System.out.println(System.getProperty("os.arch") + " "
             + System.getProperty("os.name") + " "
             + System.getProperty("os.version"));
+    System.out.println("Install4j version: "
+            + System.getProperty("sys.install4jVersion"));
+    System.out.println("Install4j template version: "
+            + System.getProperty("installer_template_version"));
+    System.out.println(
+            "Launcher version: " + System.getProperty("launcher_version"));
+
     // report Jalview version
     Cache.loadBuildProperties(true);
 

diff --git a/utils/dev_macos_install.sh b/utils/dev_macos_install.sh
index 5eadf0d..d75bf58 100755 (executable)
--- a/utils/dev_macos_install.sh
+++ b/utils/dev_macos_install.sh
@@ -4,11 +4,11 @@
 INSTALLERVOL="Jalview Installer"
 APP=Jalview.app
 
-APPLICATIONS=/Applications
+APPLICATIONS=$HOME/Applications
 CHANNEL=NOCHANNEL
-DMG=build/install4j/1.8/Jalview-OFFLINE_macos-app_DEVELOPMENT-j8.dmg
+DMG=build/install4j/11/Jalview-OFFLINE_macos-app_DEVELOPMENT-j11.dmg
 
-if [ $1 != "nogradle" ]; then
+if [ x$1 != "xnogradle" ]; then
   gradle installers -Pgetdown_channel_name=NOCHANNEL -Pinstall4jMediaTypes=macosArchive -Pgetdown_local=true -Pdev=true
 else
   echo "Not running gradle installers"