JAL-3210 project name explicitly set. updated README_GRADLE_JALVIEWJS...md file....

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index fc47cb6..d575f18 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -305,7 +305,7 @@ configurations {
 
 eclipse {
   project {
-    name = "Jalview with gradle build"
+    name = eclipse_project_name
 
     natures 'org.eclipse.jdt.core.javanature',
     'org.eclipse.jdt.groovy.core.groovyNature',
@@ -1353,10 +1353,16 @@ task jalviewjsEclipsePaths {
     eclipseBinary = eclipseRoot+"/Contents/MacOS/eclipse"
     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"
+    }
     eclipseDropinsDir = eclipseRoot+"/dropins"
     eclipseBinary = eclipseRoot+"/eclipse"
     eclipseProduct = eclipseRoot+"/.eclipseproduct"
   } else { // linux or unix
+    if (file(eclipseRoot+"/eclipse").isDirectory() && file(eclipseRoot+"/eclipse/.eclipseproduct").exists()) {
+      eclipseRoot += "/eclipse"
+    }
     eclipseDropinsDir = eclipseRoot+"/dropins"
     eclipseBinary = eclipseRoot+"/eclipse"
     eclipseProduct = eclipseRoot+"/.eclipseproduct"