X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=901fcc8e7c3f3fae8ebd66892cfdb94f3f07e4b6;hb=8ccb3fbe64c5badd73c94f3c1ceb1e24759ff69d;hp=e6a9c34edab94d622727c04243dd02c706f4abfd;hpb=a3b8fa7024e7034866f6fe6c18c53177fa31c414;p=jalview.git

diff --git a/build.gradle b/build.gradle
index e6a9c34..901fcc8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -332,10 +332,19 @@ ext {
   jalviewjsJ2sSettingsFileName = string("${jalviewDir}/${jalviewjs_j2s_settings}")
   jalviewjsJ2sProps = null
 
+  eclipseJavaVersion = "55"
+  jalviewjsJ2sPlugin = jalviewjs_j2s_plugin
+  if (IN_ECLIPSE) {
+    //def eclipseJavaVersion = System.property["java.class.version"]
+    if (Float.parseFloat(eclipseJavaVersion) >= 55 && file(jalviewjs_j2s_plugin_j11).exists()) { // 55 is Java 11
+      jalviewjsJ2sPlugin = jalviewjs_j2s_plugin_j11
+    }
+  }
   eclipseWorkspace = null
   eclipseBinary = string("")
   eclipseVersion = string("")
   eclipseDebug = false
+  eclipseJavaVersion = string("")
   // ENDEXT
 }
 
@@ -1575,6 +1584,15 @@ task jalviewjsEclipsePaths {
 }
 
 
+task printProperties {
+  group "Debug"
+  description "Output to console all System.properties"
+  doFirst {
+    System.properties.each { key, val -> System.out.println("Property: ${key}=${val}") }
+  }
+}
+
+
 task eclipseSetup {
   dependsOn eclipseProject
   dependsOn eclipseClasspath
@@ -1587,7 +1605,7 @@ task jalviewjsEclipseCopyDropins(type: Copy) {
   dependsOn jalviewjsEclipsePaths
 
   def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_eclipse_dropins_dir}", include: "*.jar")
-  inputFiles += file("${jalviewDir}/${jalviewjs_j2s_plugin}")
+  inputFiles += file("${jalviewDir}/${jalviewjsJ2sPlugin}")
   def outputDir = "${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_eclipse_tmp_dropins_dir}"
 
   from inputFiles
@@ -2322,26 +2340,21 @@ task cleanJalviewjsAll {
 
 task jalviewjsIDE_checkJ2sPlugin {
   group "00 JalviewJS in Eclipse"
-  description "Compare the swingjs/net.sf.j2s.core.jar file with the Eclipse IDE's plugin version (found in the 'dropins' dir)"
+  description "Compare the swingjs/net.sf.j2s.core(-j11)?.jar file with the Eclipse IDE's plugin version (found in the 'dropins' dir)"
 
   doFirst {
-    def j2sPlugin = string("${jalviewDir}/${jalviewjs_j2s_plugin}")
+    def j2sPlugin = string("${jalviewDir}/${jalviewjsJ2sPlugin}")
     def j2sPluginFile = file(j2sPlugin)
-    def copyPlugin = jalviewjs_eclipseIDE_auto_copy_j2s_plugin == "true"
     def eclipseHome = System.properties["eclipse.home.location"]
-    def doCopy = false
     if (eclipseHome == null || ! IN_ECLIPSE) {
       throw new StopExecutionException("Cannot find running Eclipse home from System.properties['eclipse.home.location']. Skipping J2S Plugin Check.")
     }
     def eclipseJ2sPlugin = "${eclipseHome}/dropins/${j2sPluginFile.getName()}"
     def eclipseJ2sPluginFile = file(eclipseJ2sPlugin)
     if (!eclipseJ2sPluginFile.exists()) {
-      def msg = "Eclipse J2S Plugin is not installed (could not find '${eclipseJ2sPlugin}')"
+      def msg = "Eclipse J2S Plugin is not installed (could not find '${eclipseJ2sPlugin}')\nTry running task jalviewjsIDE_copyJ2sPlugin"
       System.err.println(msg)
-      if (! copyPlugin) {
-        throw new GradleException(msg)
-      }
-      doCopy = true
+      throw new StopExecutionException(msg)
     }
 
     def digest = MessageDigest.getInstance("MD5")
@@ -2355,20 +2368,7 @@ task jalviewjsIDE_checkJ2sPlugin {
     if (j2sPluginMd5 != eclipseJ2sPluginMd5) {
       def msg = "WARNING! Eclipse J2S Plugin '${eclipseJ2sPlugin}' is different to this commit's version '${j2sPlugin}'"
       System.err.println(msg)
-      if (! copyPlugin) {
-        throw new StopExecutionException(msg)
-      }
-      doCopy = true
-    }
-
-    if (doCopy) {
-      def msg = "WARNING! Auto-copying this commit's j2s plugin version '${j2sPlugin}' to Eclipse J2S Plugin '${eclipseJ2sPlugin}'\n         May require an Eclipse restart"
-      println(msg)
-      copy {
-        from j2sPlugin
-        eclipseJ2sPluginFile.getParentFile().mkdirs()
-        into eclipseJ2sPluginFile.getParent()
-      }
+      throw new StopExecutionException(msg)
     } else {
       def msg = "Eclipse J2S Plugin is the same as '${j2sPlugin}' (this is good)"
       println(msg)
@@ -2376,6 +2376,29 @@ task jalviewjsIDE_checkJ2sPlugin {
   }
 }
 
+task jalviewjsIDE_copyJ2sPlugin {
+  group "00 JalviewJS in Eclipse"
+  description "Copy the swingjs/net.sf.j2s.core(-j11)?.jar file into the Eclipse IDE's 'dropins' dir"
+
+  doFirst {
+    def j2sPlugin = string("${jalviewDir}/${jalviewjsJ2sPlugin}")
+    def j2sPluginFile = file(j2sPlugin)
+    def eclipseHome = System.properties["eclipse.home.location"]
+    if (eclipseHome == null || ! IN_ECLIPSE) {
+      throw new StopExecutionException("Cannot find running Eclipse home from System.properties['eclipse.home.location']. NOT copying J2S Plugin.")
+    }
+    def eclipseJ2sPlugin = "${eclipseHome}/dropins/${j2sPluginFile.getName()}"
+    def eclipseJ2sPluginFile = file(eclipseJ2sPlugin)
+    def msg = "WARNING! Copying this commit's j2s plugin '${j2sPlugin}' to Eclipse J2S Plugin '${eclipseJ2sPlugin}'\n* May require an Eclipse restart"
+    System.err.println(msg)
+    copy {
+      from j2sPlugin
+      eclipseJ2sPluginFile.getParentFile().mkdirs()
+      into eclipseJ2sPluginFile.getParent()
+    }
+  }
+}
+
 
 task jalviewjsIDE_j2sFile {
   group "00 JalviewJS in Eclipse"