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) {
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":
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":
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
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
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
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]*)$/:
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
break
}
-buildProperties = string("${resourceDir}/${build_properties_file}")
getdownAppDir = string("${getdownWebsiteDir}/${getdown_app_dir}")
//getdownJ11libDir = "${getdownWebsiteDir}/${getdown_j11lib_dir}"
jalviewjsJ2sSettingsFileName = string("${jalviewDir}/${jalviewjs_j2s_settings}")
jalviewjsJ2sProps = null
+ eclipseJavaVersion = "55"
+ jalviewjsJ2sPlugin = jalviewjs_j2s_plugin
+ if (IN_ECLIPSE) {
+ //def eclipseJavaVersion = System.property["java.class.version"]
+ if (Float.parseFloat(eclipseJavaVersion) >= 55 && file(jalviewjs_j2s_plugin_j11).exists()) { // 55 is Java 11
+ jalviewjsJ2sPlugin = jalviewjs_j2s_plugin_j11
+ }
+ }
eclipseWorkspace = null
eclipseBinary = string("")
eclipseVersion = string("")
eclipseDebug = false
+ eclipseJavaVersion = string("")
// ENDEXT
}
}
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))
}
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()
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)
+ }
+ }
+ }
+ }
}
}
clean {
doFirst {
- delete buildProperties
+ delete buildProperties
}
}
}
+task printProperties {
+ group "Debug"
+ description "Output to console all System.properties"
+ doFirst {
+ System.properties.each { key, val -> System.out.println("Property: ${key}=${val}") }
+ }
+}
+
+
task eclipseSetup {
dependsOn eclipseProject
dependsOn eclipseClasspath
dependsOn jalviewjsEclipsePaths
def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_eclipse_dropins_dir}", include: "*.jar")
- inputFiles += file("${jalviewDir}/${jalviewjs_j2s_plugin}")
+ inputFiles += file("${jalviewDir}/${jalviewjsJ2sPlugin}")
def outputDir = "${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_eclipse_tmp_dropins_dir}"
from inputFiles
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}"
}
}
task jalviewjsIDE_checkJ2sPlugin {
group "00 JalviewJS in Eclipse"
- description "Compare the swingjs/net.sf.j2s.core.jar file with the Eclipse IDE's plugin version (found in the 'dropins' dir)"
+ description "Compare the swingjs/net.sf.j2s.core(-j11)?.jar file with the Eclipse IDE's plugin version (found in the 'dropins' dir)"
doFirst {
- def j2sPlugin = string("${jalviewDir}/${jalviewjs_j2s_plugin}")
+ def j2sPlugin = string("${jalviewDir}/${jalviewjsJ2sPlugin}")
def j2sPluginFile = file(j2sPlugin)
- 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.")
}
def eclipseJ2sPlugin = "${eclipseHome}/dropins/${j2sPluginFile.getName()}"
def eclipseJ2sPluginFile = file(eclipseJ2sPlugin)
if (!eclipseJ2sPluginFile.exists()) {
- def msg = "Eclipse J2S Plugin is not installed"
- println(msg)
- if (! copyPlugin) {
- throw new GradleException(msg)
- }
- doCopy = true
+ def msg = "Eclipse J2S Plugin is not installed (could not find '${eclipseJ2sPlugin}')\nTry running task jalviewjsIDE_copyJ2sPlugin"
+ System.err.println(msg)
+ throw new StopExecutionException(msg)
}
def digest = MessageDigest.getInstance("MD5")
digest.update(j2sPluginFile.text.bytes)
def j2sPluginMd5 = new BigInteger(1, digest.digest()).toString(16).padLeft(32, '0')
- digest.update(eclipseJ2sPluginFile.text.bytes)
+ //digest.update(eclipseJ2sPluginFile.text.bytes)
def eclipseJ2sPluginMd5 = new BigInteger(1, digest.digest()).toString(16).padLeft(32, '0')
if (j2sPluginMd5 != eclipseJ2sPluginMd5) {
def msg = "WARNING! Eclipse J2S Plugin '${eclipseJ2sPlugin}' is different to this commit's version '${j2sPlugin}'"
+ System.err.println(msg)
+ throw new StopExecutionException(msg)
+ } else {
+ def msg = "Eclipse J2S Plugin is the same as '${j2sPlugin}' (this is good)"
println(msg)
- if (! copyPlugin) {
- throw new StopExecutionException(msg)
- }
- doCopy = true
}
+ }
+}
- if (doCopy) {
- def msg = "WARNING! Auto-copying this commit's j2s plugin version '${j2sPlugin}' to Eclipse J2S Plugin '${eclipseJ2sPlugin}'\n May require an Eclipse restart"
- println(msg)
- copy {
- from j2sPlugin
- eclipseJ2sPluginFile.getParentFile().mkdirs()
- into eclipseJ2sPluginFile.getParent()
- }
- } else {
- def msg = "Eclipse J2S Plugin is the same as '${j2sPlugin}'"
- println(msg)
+task jalviewjsIDE_copyJ2sPlugin {
+ group "00 JalviewJS in Eclipse"
+ description "Copy the swingjs/net.sf.j2s.core(-j11)?.jar file into the Eclipse IDE's 'dropins' dir"
+
+ doFirst {
+ def j2sPlugin = string("${jalviewDir}/${jalviewjsJ2sPlugin}")
+ def j2sPluginFile = file(j2sPlugin)
+ def eclipseHome = System.properties["eclipse.home.location"]
+ if (eclipseHome == null || ! IN_ECLIPSE) {
+ throw new StopExecutionException("Cannot find running Eclipse home from System.properties['eclipse.home.location']. NOT copying J2S Plugin.")
+ }
+ def eclipseJ2sPlugin = "${eclipseHome}/dropins/${j2sPluginFile.getName()}"
+ def eclipseJ2sPluginFile = file(eclipseJ2sPlugin)
+ def msg = "WARNING! Copying this commit's j2s plugin '${j2sPlugin}' to Eclipse J2S Plugin '${eclipseJ2sPlugin}'\n* May require an Eclipse restart"
+ System.err.println(msg)
+ copy {
+ from j2sPlugin
+ eclipseJ2sPluginFile.getParentFile().mkdirs()
+ into eclipseJ2sPluginFile.getParent()
}
}
}
}
-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"
git://source.jalview.org / jalview.git / blobdiff