JAL-3210 small fix for jalviewjsBuildDir

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 5d0674b..9b7b171 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',
@@ -1266,11 +1266,11 @@ def jalviewjsBuildDir
 def jalviewjsSiteDir
 def jalviewjsTransferSiteDir
 task jalviewjsSitePath {
+  def relativeBuildDir = file(jalviewDirAbsolutePath).toPath().relativize(buildDir.toPath())
+  jalviewjsBuildDir = "${relativeBuildDir}/jalviewjs"
   if (jalviewjs_site_dir.startsWith("/")) {
     jalviewjsSiteDir = jalviewjs_site_dir
   } else {
-    def relativeBuildDir = file(jalviewDirAbsolutePath).toPath().relativize(buildDir.toPath())
-    jalviewjsBuildDir = "${relativeBuildDir}/jalviewjs"
     jalviewjsSiteDir = jalviewjsBuildDir + "/" + jalviewjs_site_dir
   }
   jalviewjsTransferSiteDir = jalviewjsBuildDir + "/tmp/site"
@@ -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"
@@ -1496,7 +1502,7 @@ task jalviewjsTranspile(type: Exec) {
     stdout = new ByteArrayOutputStream()
     stderr = new ByteArrayOutputStream()
 
-    def logOutFileName = "${jalviewjsBuildDir}/${jalviewjs_j2s_stdout}"
+    def logOutFileName = "${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_j2s_stdout}"
     def logOutFile = file(logOutFileName)
     logOutFile.createNewFile()
     def logOutFOS = new FileOutputStream(logOutFile, false)
@@ -1529,7 +1535,7 @@ task jalviewjsTranspile(type: Exec) {
   doLast {
     if (stdout.toString().contains("Error processing ")) {
       // j2s did not complete transpile
-      throw new GradleException("Error during transpilation:\n${stderr}\nSee eclipse transpile log files '${jalviewjsBuildDir}/${jalviewjs_j2s_stdout}' and '${jalviewjsBuildDir}/${jalviewjs_j2s_stderr}'\n")
+      throw new GradleException("Error during transpilation:\n${stderr}\nSee eclipse transpile log file '${jalviewjsBuildDir}/${jalviewjs_j2s_stdout}'")
     }
   }