X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=e6a9c34edab94d622727c04243dd02c706f4abfd;hb=a3b8fa7024e7034866f6fe6c18c53177fa31c414;hp=0117ffc53e8137004503ddc51daf141af1738ccd;hpb=7b4179c8760e3c7e797ad2cecc3150cbd7608259;p=jalview.git

diff --git a/build.gradle b/build.gradle
index 0117ffc..e6a9c34 100644
--- a/build.gradle
+++ b/build.gradle
@@ -83,6 +83,12 @@ ext {
   } else {
     println("HEADLESS BUILD")
   }
+  
+  J2S_ENABLED = (project.hasProperty('j2s.compiler.status') && project['j2s.compiler.status'] != null && project['j2s.compiler.status'] == "enable")
+  if (J2S_ENABLED) {
+    println("J2S ENABLED")
+  }
+  
   /* *-/
   System.properties.sort { it.key }.each {
     key, val -> println("SYSTEM PROPERTY ${key}='${val}'")
@@ -117,7 +123,7 @@ ext {
   getdownDir = string("")
   reportRsyncCmd = false
   buildDist = true
-  buildProperties = build_properties_file
+  buildProperties = string("${resourceDir}/${build_properties_file}")
   getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher}")
   switch (CHANNEL) {
 
@@ -127,7 +133,7 @@ ext {
     getdown_channel_name = string("${bamboo_planKey}/${JAVA_VERSION}")
     getdown_app_base = string("${bamboo_channelbase}/${bamboo_planKey}${bamboo_getdown_channel_suffix}/${JAVA_VERSION}")
     getdown_app_dir = getdown_app_dir_alt
-    buildProperties = string("${classesDir}/${build_properties_file}")
+    buildProperties = string("${resourceDir}/${build_properties_file}")
     break
 
     case "RELEASE":
@@ -135,8 +141,13 @@ ext {
     getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}")
     getdown_app_base = string("${getdown_channel_base}/${getdownDir}")
     getdown_app_dir = getdown_app_dir_release
-    buildProperties = string("${classesDir}/${build_properties_file}")
+    buildProperties = string("${resourceDir}/${build_properties_file}")
     reportRsyncCommand = true
+    // Don't ignore transpile errors for release build
+    if (jalviewjs_ignore_transpile_errors.equals("true")) {
+      jalviewjs_ignore_transpile_errors = "false"
+      println("Setting jalviewjs_ignore_transpile_errors to 'false'")
+    }
     break
 
     case "ARCHIVE":
@@ -149,7 +160,7 @@ ext {
       exit
     } else {
       packageDir = string("${ARCHIVEDIR}/${packageDir}")
-      buildProperties = string("${ARCHIVEDIR}/${classes_dir}/${build_properties_file}")
+      buildProperties = string("${ARCHIVEDIR}/${resource_dir}/${build_properties_file}")
       buildDist = false
     }
     reportRsyncCommand = true
@@ -165,7 +176,7 @@ ext {
       exit
     } else {
       packageDir = string("${ARCHIVEDIR}/${packageDir}")
-      buildProperties = string("${ARCHIVEDIR}/${classes_dir}/${build_properties_file}")
+      buildProperties = string("${ARCHIVEDIR}/${resource_dir}/${build_properties_file}")
       buildDist = false
     }
     reportRsyncCommand = true
@@ -177,7 +188,7 @@ ext {
     getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}")
     getdown_app_base = string("${getdown_channel_base}/${getdownDir}")
     getdown_app_dir = getdown_app_dir_alt
-    buildProperties = string("${classesDir}/${build_properties_file}")
+    buildProperties = string("${resourceDir}/${build_properties_file}")
     reportRsyncCommand = true
     break
 
@@ -186,8 +197,13 @@ ext {
     getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}")
     getdown_app_base = string("${getdown_channel_base}/${getdownDir}")
     getdown_app_dir = getdown_app_dir_alt
-    buildProperties = string("${classesDir}/${build_properties_file}")
+    buildProperties = string("${resourceDir}/${build_properties_file}")
     reportRsyncCommand = true
+    // Don't ignore transpile errors for release build
+    if (jalviewjs_ignore_transpile_errors.equals("true")) {
+      jalviewjs_ignore_transpile_errors = "false"
+      println("Setting jalviewjs_ignore_transpile_errors to 'false'")
+    }
     break
 
     case ~/^SCRATCH(|-[-\w]*)$/:
@@ -195,14 +211,14 @@ ext {
     getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}")
     getdown_app_base = string("${getdown_channel_base}/${getdownDir}")
     getdown_app_dir = getdown_app_dir_alt
-    buildProperties = string("${classesDir}/${build_properties_file}")
+    buildProperties = string("${resourceDir}/${build_properties_file}")
     reportRsyncCommand = true
     break
 
     case "LOCAL":
     getdown_app_base = file(getdownWebsiteDir).toURI().toString()
     getdown_app_dir = getdown_app_dir_alt
-    buildProperties = string("${classesDir}/${build_properties_file}")
+    buildProperties = string("${resourceDir}/${build_properties_file}")
     getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}")
     break
 
@@ -445,7 +461,7 @@ eclipse {
         }
         cp.entries.removeAll(removeTheseToo)
 
-        //cp.entries += new Output("${eclipse_bin_dir}/main")
+        cp.entries += new Output("${eclipse_bin_dir}/main")
         if (file(helpSourceDir).isDirectory()) {
           cp.entries += new Library(fileReference(helpSourceDir))
         }
@@ -512,6 +528,7 @@ eclipse {
     javaRuntimeName = eclipse_java_runtime_name
 
     // add in jalview project specific properties/preferences into eclipse core preferences
+    // and also the codestyle XML file
     file {
       withProperties { props ->
         def jalview_prefs = new Properties()
@@ -523,6 +540,22 @@ eclipse {
             props.putAt(t, v)
           }
         }
+        // codestyle file -- overrides previous formatter prefs
+        def csFile = file("${jalviewDirAbsolutePath}/${eclipse_codestyle_file}")
+        if (csFile.exists()) {
+          XmlParser parser = new XmlParser()
+          def profiles = parser.parse(csFile)
+          def profile = profiles.'profile'.find { p -> (p.'@kind' == "CodeFormatterProfile" && p.'@name' == "Jalview") }
+          if (profile != null) {
+            profile.'setting'.each { s ->
+              def id = s.'@id'
+              def value = s.'@value'
+              if (id != null && value != null) {
+                props.putAt(id, value)
+              }
+            }
+          }
+        }
       }
     }
 
@@ -531,7 +564,7 @@ eclipse {
   if (IN_ECLIPSE) {
     // Don't want these to be activated if in headless build
     synchronizationTasks "eclipseSynchronizationTask"
-    autoBuildTasks "eclipseAutoBuildTask"
+    //autoBuildTasks "eclipseAutoBuildTask"
 
   }
 }
@@ -664,6 +697,8 @@ task setGitVals {
 
 
 task createBuildProperties(type: WriteProperties) {
+  group = "build"
+  description = "Create the ${buildProperties} file"
   dependsOn setGitVals
   inputs.dir(sourceDir)
   inputs.dir(resourceDir)
@@ -679,6 +714,13 @@ task createBuildProperties(type: WriteProperties) {
 }
 
 
+clean {
+  doFirst {
+    delete buildProperties
+  }
+}
+
+
 task cleanBuildingHTML(type: Delete) {
   doFirst {
     delete buildingHTML
@@ -774,6 +816,7 @@ task syncLib(type: Sync) {
 
 
 task syncResources(type: Sync) {
+  dependsOn createBuildProperties
   from resourceDir
   include "**/*.*"
   into "${classesDir}"
@@ -885,6 +928,7 @@ task cleanPackageDir(type: Delete) {
   }
 }
 
+
 jar {
   dependsOn linkCheck
   dependsOn buildIndices
@@ -1834,7 +1878,12 @@ DEBUG: ${eclipseDebug}
     if (stdout.toString().contains("Error processing ")) {
       // j2s did not complete transpile
       //throw new TaskExecutionException("Error during transpilation:\n${stderr}\nSee eclipse transpile log file '${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_j2s_transpile_stdout}'")
-      throw new GradleException("Error during transpilation:\n${stderr}\nSee eclipse transpile log file '${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_j2s_transpile_stdout}'")
+      if (jalviewjs_ignore_transpile_errors.equals("true")) {
+        println("IGNORING TRANSPILE ERRORS")
+        println("See eclipse transpile log file '${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_j2s_transpile_stdout}'")
+      } else {
+        throw new GradleException("Error during transpilation:\n${stderr}\nSee eclipse transpile log file '${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_j2s_transpile_stdout}'")
+      }
     }
   }
 
@@ -1955,7 +2004,7 @@ task jalviewjsBuildAllCores {
 
     def file = hash['file']
     if (! file.exists()) {
-      println("...classlist file '"+file.getPath()+"' does not exist, skipping")
+      //println("...classlist file '"+file.getPath()+"' does not exist, skipping")
       return false // this is a "continue" in groovy .each closure
     }
     def name = hash['name']
@@ -2028,7 +2077,8 @@ task jalviewjsBuildAllCores {
     'list': allJsFiles,
     'name': allClasslistName
   ]
-  jalviewjsCoreClasslists += allClasslist
+  // not including this version of "all" core at the moment
+  //jalviewjsCoreClasslists += allClasslist
   inputs.files(allClasslist['list'])
   outputs.file(allClasslist['jsfile'])
   outputs.file(allClasslist['zjsfile'])
@@ -2165,12 +2215,19 @@ task jalviewjsBuildSite {
 }
 
 
-task cleanJalviewjsSite {
+task cleanJalviewjsTransferSite {
   doFirst {
     delete "${jalviewDir}/${jalviewjsTransferSiteJsDir}"
     delete "${jalviewDir}/${jalviewjsTransferSiteLibDir}"
     delete "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}"
     delete "${jalviewDir}/${jalviewjsTransferSiteCoreDir}"
+  }
+}
+
+
+task cleanJalviewjsSite {
+  dependsOn cleanJalviewjsTransferSite
+  doFirst {
     delete "${jalviewDir}/${jalviewjsSiteDir}"
   }
 }
@@ -2270,8 +2327,8 @@ task jalviewjsIDE_checkJ2sPlugin {
   doFirst {
     def j2sPlugin = string("${jalviewDir}/${jalviewjs_j2s_plugin}")
     def j2sPluginFile = file(j2sPlugin)
-    def eclipseHome = System.properties["eclipse.home.location"]
     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.")
@@ -2279,8 +2336,8 @@ task jalviewjsIDE_checkJ2sPlugin {
     def eclipseJ2sPlugin = "${eclipseHome}/dropins/${j2sPluginFile.getName()}"
     def eclipseJ2sPluginFile = file(eclipseJ2sPlugin)
     if (!eclipseJ2sPluginFile.exists()) {
-      def msg = "Eclipse J2S Plugin is not installed"
-      println(msg)
+      def msg = "Eclipse J2S Plugin is not installed (could not find '${eclipseJ2sPlugin}')"
+      System.err.println(msg)
       if (! copyPlugin) {
         throw new GradleException(msg)
       }
@@ -2297,7 +2354,7 @@ task jalviewjsIDE_checkJ2sPlugin {
      
     if (j2sPluginMd5 != eclipseJ2sPluginMd5) {
       def msg = "WARNING! Eclipse J2S Plugin '${eclipseJ2sPlugin}' is different to this commit's version '${j2sPlugin}'"
-      println(msg)
+      System.err.println(msg)
       if (! copyPlugin) {
         throw new StopExecutionException(msg)
       }
@@ -2313,7 +2370,7 @@ task jalviewjsIDE_checkJ2sPlugin {
         into eclipseJ2sPluginFile.getParent()
       }
     } else {
-      def msg = "Eclipse J2S Plugin is the same as '${j2sPlugin}'"
+      def msg = "Eclipse J2S Plugin is the same as '${j2sPlugin}' (this is good)"
       println(msg)
     }
   }
@@ -2334,9 +2391,7 @@ task jalviewjsIDE_SyncCore {
 }
 
 
-task jalviewjsIDE_PrepareSite {
-  group "00 JalviewJS in Eclipse"
-  description "Sync libs and resources to site dir, but not closure cores"
+task jalviewjsIDE_SyncSiteAll {
   dependsOn jalviewjsSyncAllLibs
   dependsOn jalviewjsSyncResources
   dependsOn jalviewjsSyncSiteResources
@@ -2344,6 +2399,18 @@ task jalviewjsIDE_PrepareSite {
 }
 
 
+cleanJalviewjsTransferSite.mustRunAfter jalviewjsIDE_SyncSiteAll
+
+
+task jalviewjsIDE_PrepareSite {
+  group "00 JalviewJS in Eclipse"
+  description "Sync libs and resources to site dir, but not closure cores"
+
+  dependsOn jalviewjsIDE_SyncSiteAll
+  dependsOn cleanJalviewjsTransferSite
+}
+
+
 task jalviewjsIDE_AssembleSite {
   group "00 JalviewJS in Eclipse"
   description "Assembles unzipped supporting zipfiles, resources, site resources and closure cores into the Eclipse transpiled site"
@@ -2368,15 +2435,19 @@ task jalviewjsIDE_Server {
 // buildship runs this at import or gradle refresh
 task eclipseSynchronizationTask {
   //dependsOn eclipseSetup
-  dependsOn jalviewjsIDE_j2sFile
-  dependsOn jalviewjsIDE_checkJ2sPlugin
+  dependsOn createBuildProperties
+  if (J2S_ENABLED) {
+    dependsOn jalviewjsIDE_j2sFile
+    dependsOn jalviewjsIDE_checkJ2sPlugin
+    dependsOn jalviewjsIDE_PrepareSite
+  }
 }
 
 
 // buildship runs this at build time or project refresh
 task eclipseAutoBuildTask {
   //dependsOn jalviewjsIDE_checkJ2sPlugin
-  dependsOn jalviewjsIDE_PrepareSite
+  //dependsOn jalviewjsIDE_PrepareSite
 }