}
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))
}
clean {
doFirst {
- delete buildProperties
+ delete buildProperties
}
}
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}'")
+ }
}
}
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']
'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'])
}
-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}"
}
}
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)
}
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)
}
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)
}
}
}
-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
}
+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"