From: Ben Soares Date: Thu, 25 Apr 2019 01:02:49 +0000 (+0100) Subject: JAL-3224 JAL-3225 Added lines to check for updates to getdown-launcher.jar into Jalvi... X-Git-Tag: Release_2_11_0~17^2~7^2~4 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=d57800eff575946b8d15cd90bc75d9a6c6f666a3;hp=07df1587079d0e87b9913464e453cd585cf4b0f1;p=jalview.git JAL-3224 JAL-3225 Added lines to check for updates to getdown-launcher.jar into Jalview. Put getdown-core into Jalview libs instead of getdown-launcher (enables update of getdown-launcher). Adjusted Eclipse to not error on use of com.sun.management.OperatingSystemMXBean. --- diff --git a/.classpath b/.classpath index ac6ed96..7a5cc53 100644 --- a/.classpath +++ b/.classpath @@ -1,30 +1,28 @@ - + + - + - + - + - - - - - + + @@ -36,7 +34,6 @@ - @@ -49,6 +46,7 @@ + @@ -182,5 +180,4 @@ - diff --git a/.settings/org.eclipse.jdt.core.jalview.prefs b/.settings/org.eclipse.jdt.core.jalview.prefs index 54b3d1a..4b7c545 100644 --- a/.settings/org.eclipse.jdt.core.jalview.prefs +++ b/.settings/org.eclipse.jdt.core.jalview.prefs @@ -294,4 +294,5 @@ org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -bentest=pomegranate +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index babbc21..e8b0ee7 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Wed Apr 24 15:04:24 BST 2019 +#Thu Apr 25 01:57:42 BST 2019 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert @@ -195,7 +195,6 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_pa org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -bentest=pomegranate org.eclipse.jdt.core.formatter.comment.format_html=true org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert @@ -241,6 +240,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not i org.eclipse.jdt.core.formatter.comment.format_block_comments=false org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 diff --git a/build.gradle b/build.gradle index 0716ae9..55d5709 100644 --- a/build.gradle +++ b/build.gradle @@ -715,8 +715,7 @@ task getdownWebsite() { } */ - //moved getdown_launcher into dist - //getdownTextString += "code = " + packageDir + '/' + file(getdownLauncher).getName() + "\n" + getdownTextString += "code = " + file(getdownLauncher).getName() + "\n" getdownTextString += "class = " + mainClass + "\n" def getdown_txt = file(project.ext.getdownWebsiteDir + "/getdown.txt") @@ -729,7 +728,12 @@ task getdownWebsite() { copy { from getdownLauncher - into project.ext.getdownFilesDir + '/' + packageDir + into project.ext.getdownFilesDir + } + + copy { + from getdownLauncher + into project.ext.getdownWebsiteDir } copy { diff --git a/gradle.properties b/gradle.properties index a82d781..7c794f5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -60,6 +60,7 @@ getdown_channel_base = http://www.jalview.org/getdown/jalview getdown_channel_name = TEST getdown_txt_allow_offline = true getdown_txt_jvmmempc = 95 +getdown_txt_multi_jvmarg = -Dgetdownappdir="%APPDIR%" getdown_txt_strict_comments = true getdown_txt_title = Jalview getdown_txt_ui.name = Jalview diff --git a/j11lib/getdown-core-1.8.3-SNAPSHOT.jar b/j11lib/getdown-core-1.8.3-SNAPSHOT.jar new file mode 100644 index 0000000..e9b8c4a Binary files /dev/null and b/j11lib/getdown-core-1.8.3-SNAPSHOT.jar differ diff --git a/j11lib/getdown-launcher.jar b/j11lib/getdown-launcher.jar deleted file mode 100644 index 187694e..0000000 Binary files a/j11lib/getdown-launcher.jar and /dev/null differ diff --git a/j8lib/getdown-core-1.8.3-SNAPSHOT.jar b/j8lib/getdown-core-1.8.3-SNAPSHOT.jar new file mode 100644 index 0000000..e9b8c4a Binary files /dev/null and b/j8lib/getdown-core-1.8.3-SNAPSHOT.jar differ diff --git a/j8lib/getdown-launcher.jar b/j8lib/getdown-launcher.jar deleted file mode 100644 index 187694e..0000000 Binary files a/j8lib/getdown-launcher.jar and /dev/null differ diff --git a/lib/getdown-core-1.8.3-SNAPSHOT.jar b/lib/getdown-core-1.8.3-SNAPSHOT.jar new file mode 100644 index 0000000..e9b8c4a Binary files /dev/null and b/lib/getdown-core-1.8.3-SNAPSHOT.jar differ diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java index ece610a..b5fa7fa 100755 --- a/src/jalview/bin/Jalview.java +++ b/src/jalview/bin/Jalview.java @@ -60,6 +60,7 @@ import javax.swing.LookAndFeel; import javax.swing.UIManager; import com.sun.xml.ws.policy.Policy; +import com.threerings.getdown.util.LaunchUtil; import groovy.lang.Binding; import groovy.util.GroovyScriptEngine; @@ -201,6 +202,23 @@ public class Jalview + System.getProperty("os.name") + " " + System.getProperty("os.version")); + String appdirString = System.getProperty("getdownappdir"); + if (appdirString != null && appdirString.length() > 0) + { + final File appdir = new File(appdirString); + new Thread() + { + @Override + public void run() + { + LaunchUtil.upgradeGetdown( + new File(appdir, "getdown-launcher-old.jar"), + new File(appdir, "getdown-launcher.jar"), + new File(appdir, "getdown-launcher-new.jar")); + } + }.start(); + + } ArgsParser aparser = new ArgsParser(args); boolean headless = false; diff --git a/utils/install4j/install4j_template.install4j b/utils/install4j/install4j_template.install4j index a006a23..9261cd7 100644 --- a/utils/install4j/install4j_template.install4j +++ b/utils/install4j/install4j_template.install4j @@ -91,7 +91,7 @@ - + @@ -125,7 +125,7 @@ - +