From: Ben Soares <bsoares@dundee.ac.uk>
Date: Thu, 7 Nov 2019 16:52:40 +0000 (+0000)
Subject: JAL-3210 small tidies
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~74
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=ed512fe4ab6c8a61bbf2e3b9d2b09ea9746af78d

JAL-3210 small tidies
---

diff --git a/build.gradle b/build.gradle
index 52c0385..b03c883 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1354,7 +1354,7 @@ task jalviewjsEclipsePaths {
     eclipseProduct = "${eclipseRoot}/Contents/Eclipse/.eclipseproduct"
   } else if (OperatingSystem.current().isWindows()) { // check these paths!!
     if (file("${eclipseRoot}/eclipse").isDirectory() && file("${eclipseRoot}/eclipse/.eclipseproduct").exists()) {
-      eclipseRoot += "/eclipse"
+      eclipseRoot += "/eclipse.exe"
     }
     eclipseBinary = "${eclipseRoot}/eclipse"
     eclipseProduct = "${eclipseRoot}/.eclipseproduct"
@@ -1366,7 +1366,7 @@ task jalviewjsEclipsePaths {
     eclipseProduct = "${eclipseRoot}/.eclipseproduct"
   }
 
-  eclipseVersion = "4.12" // default
+  eclipseVersion = "4.13" // default
   def assumedVersion = true
   if (file(eclipseProduct).exists()) {
     def fis = new FileInputStream(eclipseProduct)
@@ -1376,17 +1376,6 @@ task jalviewjsEclipsePaths {
     fis.close()
     assumedVersion = false
   }
-  /*
-  String[] v = eclipseVersion.split("\\.")
-  def v0 = Integer.valueOf(v[0])
-  def v1 = Integer.valueOf(v[1])
-  if (v0 < 4 || ( v0 == 4 && v1 < 13 )) {
-    eclipseVersionSuffix = "_4.12"
-  } else {
-    eclipseVersionSuffix = "_4.13"
-  }
-  */
-
   
   def propKey = "eclipse_debug"
   eclipseDebug = (project.hasProperty(propKey) && project.getProperty(propKey).equals("true"))
@@ -1404,30 +1393,6 @@ task eclipseSetup {
   dependsOn eclipseJdt
 }
 
-/* using the Copy task below
-task OLDjalviewjsEclipseCopyDropins {
-  dependsOn jalviewjsEclipsePaths
-  dependsOn jalviewjsCleanEclipse
-  def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_eclipse_dropins_dir}", include: "*.jar")
-  inputFiles += file(jalviewjs_j2s_plugin)
-  def outputDir = "${buildDir}/jalviewjs
-
-  inputs.files inputFiles
-  inputFiles.each { file ->
-    outputs.file("${outputDir}/${file.name}")
-  }
-
-  doLast {
-    inputFiles.each { file ->
-      copy {
-        from file
-        into outputDir
-      }
-    }
-  }
-}
-*/
-
 // this version (type: Copy) will delete anything in the eclipse dropins folder that isn't in fromDropinsDir
 task jalviewjsEclipseCopyDropins(type: Copy) {
   dependsOn jalviewjsEclipsePaths