id 'com.install4j.gradle' version '7.0.9'
}
+// local build environment properties
+def localProps = "${jalviewDir}/local.properties"
+if (file(localProps).exists()) {
+ try {
+ def p = new Properties()
+ def localPropsFIS = new FileInputStream(localProps)
+ p.load(localPropsFIS)
+ localPropsFIS.close()
+ p.each {
+ key, val ->
+ def over = getProperty(key) != null
+ setProperty(key, val)
+ if (over) {
+ println("Overriding property '${key}' with local.properties value '${val}'")
+ }
+ }
+ } catch (Exception e) {
+ System.out.println("Exception reading local.properties")
+ }
+}
+
repositories {
jcenter()
mavenCentral()
}
mainClassName = launcherClass
-def cloverInstrDir = file("$buildDir/$cloverSourcesInstrDir")
-def classes = "$jalviewDir/$classesDir"
+def cloverInstrDir = file("${buildDir}/${cloverSourcesInstrDir}")
+def classes = "${jalviewDir}/${classesDir}"
if (clover.equals("true")) {
use_clover = true
- classes = "$buildDir/$cloverClassesDir"
+ classes = "${buildDir}/${cloverClassesDir}"
} else {
use_clover = false
- classes = "$jalviewDir/$classesDir"
+ classes = "${jalviewDir}/${classesDir}"
}
// configure classpath/args for j8/j11 compilation
def compile_target_compatibility
ext {
- // local build environment properties
- def localProps = "${jalviewDir}/local.properties"
- if (file(localProps).exists()) {
- def p = new Properties()
- def localPropsFIS = new FileInputStream(localProps)
- p.load(localPropsFIS)
- localPropsFIS.close()
- p.each {
- key, val ->
- def over = project.properties.get(key) != null
- project.properties.put(key, val)
- if (over) {
- println("Overriding property '${key}' with local.properties value")
- }
- }
- }
getdownWebsiteDir = "${jalviewDir}/${getdown_website_dir}/${JAVA_VERSION}"
getdownDir = ""
reportRsyncCmd = false
buildDist = true
- buildProperties = buildPropertiesFile
+ buildProperties = build_properties_file
getdownLauncher = "${jalviewDir}/${getdown_lib_dir}/${getdown_launcher}"
switch (CHANNEL) {
getdown_channel_name = "${bamboo_planKey}/${JAVA_VERSION}"
getdown_app_base = "${bamboo_channelbase}/${bamboo_planKey}${bamboo_getdown_channel_suffix}/${JAVA_VERSION}"
getdown_app_dir = getdown_app_dir_alt
- buildProperties = "${jalviewDir}/${classesDir}/${buildPropertiesFile}"
+ buildProperties = "${jalviewDir}/${classesDir}/${build_properties_file}"
break
case "RELEASE":
getdownDir = "${getdown_channel_name}/${JAVA_VERSION}"
getdown_app_base = "${getdown_channel_base}/${getdownDir}"
getdown_app_dir = getdown_app_dir_release
- buildProperties = "${jalviewDir}/${classesDir}/${buildPropertiesFile}"
+ buildProperties = "${jalviewDir}/${classesDir}/${build_properties_file}"
reportRsyncCommand = true
break
exit
} else {
packageDir = "${ARCHIVEDIR}/${packageDir}"
- buildProperties = "${ARCHIVEDIR}/${classesDir}/${buildPropertiesFile}"
+ buildProperties = "${ARCHIVEDIR}/${classesDir}/${build_properties_file}"
buildDist = false
}
reportRsyncCommand = true
exit
} else {
packageDir = "${ARCHIVEDIR}/${packageDir}"
- buildProperties = "${ARCHIVEDIR}/${classesDir}/${buildPropertiesFile}"
+ buildProperties = "${ARCHIVEDIR}/${classesDir}/${build_properties_file}"
buildDist = false
}
reportRsyncCommand = true
getdownDir = "${getdown_channel_name}/${JAVA_VERSION}"
getdown_app_base = "${getdown_channel_base}/${getdownDir}"
getdown_app_dir = getdown_app_dir_alt
- buildProperties = "${jalviewDir}/${classesDir}/${buildPropertiesFile}"
+ buildProperties = "${jalviewDir}/${classesDir}/${build_properties_file}"
reportRsyncCommand = true
break
getdownDir = "${getdown_channel_name}/${JAVA_VERSION}"
getdown_app_base = "${getdown_channel_base}/${getdownDir}"
getdown_app_dir = getdown_app_dir_alt
- buildProperties = "${jalviewDir}/${classesDir}/${buildPropertiesFile}"
+ buildProperties = "${jalviewDir}/${classesDir}/${build_properties_file}"
reportRsyncCommand = true
break
getdownDir = "${getdown_channel_name}/${JAVA_VERSION}"
getdown_app_base = "${getdown_channel_base}/${getdownDir}"
getdown_app_dir = getdown_app_dir_alt
- buildProperties = "${jalviewDir}/${classesDir}/${buildPropertiesFile}"
+ buildProperties = "${jalviewDir}/${classesDir}/${build_properties_file}"
reportRsyncCommand = true
break
case "LOCAL":
getdown_app_base = file(getdownWebsiteDir).toURI().toString()
getdown_app_dir = getdown_app_dir_alt
- buildProperties = "${jalviewDir}/${classesDir}/${buildPropertiesFile}"
+ buildProperties = "${jalviewDir}/${classesDir}/${build_properties_file}"
getdownLauncher = "${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}"
break
}
} // jdt
+
+ synchronizationTasks "eclipseSynchronizationTask"
+ autoBuildTasks "eclipseAutoBuildTask"
}
task createBuildProperties(type: WriteProperties) {
dependsOn setGitVals
inputs.dir("${jalviewDir}/${sourceDir}")
- inputs.dir("${classes}")
inputs.dir("${jalviewDir}/${resourceDir}")
+ file(buildProperties).getParentFile().mkdirs()
outputFile (buildProperties)
// taking time specific comment out to allow better incremental builds
comment "--Jalview Build Details--\n"+getDate("yyyy-MM-dd HH:mm:ss")
def outputDir = "${classes}/${helpDir}"
from(inputDir) {
exclude '**/*.gif'
- exclude '**/*.jpg'
- exclude '**/*.png'
- filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['Version-Rel': JALVIEW_VERSION,'Year-Rel': getDate("yyyy")])
+ exclude '**/*.jpg'
+ exclude '**/*.png'
+ filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['Version-Rel': JALVIEW_VERSION,'Year-Rel': getDate("yyyy")])
}
from(inputDir) {
include '**/*.gif'
outputs.file("${jalviewDir}/${utilsDir}/BufferedLineReader.class")
}
-def helplinkscheckertouchfile = file("${jalviewDir}/${utilsDir}/HelpLinksChecker.touch")
task linkCheck(type: JavaExec) {
dependsOn prepare, compileLinkCheck
+
+ def helpLinksCheckerOutFile = file("${jalviewDir}/${utilsDir}/HelpLinksChecker.out")
classpath = files("${jalviewDir}/${utilsDir}")
main = "HelpLinksChecker"
workingDir = jalviewDir
def help = "${classes}/${helpDir}"
args = [ "${classes}/${helpDir}", "-nointernet" ]
- doLast {
- helplinkscheckertouchfile.createNewFile()
- }
+ def outFOS = new FileOutputStream(helpLinksCheckerOutFile, false) // false == don't append
+ def errFOS = outFOS
+ standardOutput = new org.apache.tools.ant.util.TeeOutputStream(
+ outFOS,
+ standardOutput)
+ errorOutput = new org.apache.tools.ant.util.TeeOutputStream(
+ outFOS,
+ errorOutput)
inputs.dir("${classes}/${helpDir}")
- outputs.file(helplinkscheckertouchfile)
+ outputs.file(helpLinksCheckerOutFile)
}
// import the pubhtmlhelp target
copy {
from buildProperties
- rename(buildPropertiesFile, getdown_build_properties)
+ rename(build_properties_file, getdown_build_properties)
into project.ext.getdownAppDir
}
getdownWebsiteResourceFilenames += "${getdown_app_dir}/${getdown_build_properties}"
def jalviewjsBuildDir
def jalviewjsSiteDir
-def jalviewjsTransferSiteDir
+def jalviewjsTransferSiteJsDir
+def jalviewjsTransferSiteLibDir
+def jalviewjsTransferSiteCoreDir
task jalviewjsSitePath {
def relativeBuildDir = file(jalviewDirAbsolutePath).toPath().relativize(buildDir.toPath())
jalviewjsBuildDir = "${relativeBuildDir}/jalviewjs"
- if (jalviewjs_site_dir.startsWith('/')) {
- jalviewjsSiteDir = jalviewjs_site_dir
- } else {
- jalviewjsSiteDir = "${jalviewjsBuildDir}/${jalviewjs_site_dir}"
- }
- jalviewjsTransferSiteDir = "${jalviewjsBuildDir}/tmp/site"
+ jalviewjsSiteDir = "${jalviewjsBuildDir}/${jalviewjs_site_dir}"
+ jalviewjsTransferSiteJsDir = "${jalviewjsBuildDir}/tmp/${jalviewjs_site_dir}_js"
+ jalviewjsTransferSiteLibDir = "${jalviewjsBuildDir}/tmp/${jalviewjs_site_dir}_lib"
+ jalviewjsTransferSiteCoreDir = "${jalviewjsBuildDir}/tmp/${jalviewjs_site_dir}_core"
}
def eclipseWorkspace
def propVal = null
if (project.hasProperty(propKey)) {
propVal = project.getProperty(propKey)
+ if (propVal.startsWith("~/")) {
+ propVal = System.getProperty("user.home") + propVal.substring(1)
+ }
}
- def propsFileName = "${jalviewjsBuildDir}/${jalviewjs_eclipse_workspace_location_file}"
+ def propsFileName = "${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_eclipse_workspace_location_file}"
+ def propsFile = file(propsFileName)
def eclipseWsDir = propVal
def props = new Properties()
- if (( eclipseWsDir == null || !file(eclipseWsDir).exists() ) && file(propsFileName).exists()) {
- def ins = new FileInputStream("${jalviewDirAbsolutePath}/${propsFileName}")
+ if (( eclipseWsDir == null || !file(eclipseWsDir).exists() ) && propsFile.exists()) {
+ def ins = new FileInputStream(propsFileName)
props.load(ins)
ins.close()
if (props.getProperty(propKey, null) != null) {
}
}
+ def writeProps = false
if (eclipseWsDir == null || !file(eclipseWsDir).exists()) {
def tempDir = File.createTempDir()
eclipseWsDir = tempDir.getAbsolutePath()
- props.setProperty(propKey, eclipseWsDir)
- def propsFile = file(propsFileName)
- propsFile.parentFile.mkdirs()
- propsFile.createNewFile() // doesn't affect existing file
- def outs = new FileOutputStream(propsFile, false)
- props.store(outs, null)
- outs.close()
+ writeProps = true
}
-
eclipseWorkspace = file(eclipseWsDir)
doFirst {
+ if (writeProps) {
+ props.setProperty(propKey, eclipseWsDir)
+ propsFile.parentFile.mkdirs()
+ def bytes = new ByteArrayOutputStream()
+ props.store(bytes, null)
+ def propertiesString = bytes.toString()
+ propsFile.text = propertiesString
+ }
+
println("ECLIPSE WORKSPACE: "+eclipseWorkspace.getPath())
}
- inputs.property(propKey, eclipseWsDir)
+
+ //inputs.property(propKey, eclipseWsDir) // eclipseWsDir only gets set once this task runs, so will be out-of-date
outputs.file(propsFileName)
+ outputs.upToDateWhen { eclipseWorkspace.exists() }
}
-def eclipseDropinsDir
-def utilsDropinsDir
def eclipseBinary
def eclipseVersion
def eclipseDebug = false
def eclipseProduct
def eclipseRoot = jalviewjs_eclipse_root
- if (eclipseRoot.startsWith("~")) {
+ if (eclipseRoot.startsWith("~/")) {
eclipseRoot = System.getProperty("user.home") + eclipseRoot.substring(1)
}
if (OperatingSystem.current().isMacOsX()) {
eclipseRoot += "/Eclipse.app"
- eclipseDropinsDir = "${eclipseRoot}/Contents/Eclipse/dropins"
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"
}
} else {
eclipseVersionSuffix = "_4.13"
}
- utilsDropinsDir = "${jalviewDir}/${jalviewjs_eclipse_dropins_dir}${eclipseVersionSuffix}"
*/
- utilsDropinsDir = "${jalviewDir}/${jalviewjs_eclipse_dropins_dir}"
+
def propKey = "eclipse_debug"
eclipseDebug = (project.hasProperty(propKey) && project.getProperty(propKey).equals("true"))
doFirst {
if (!assumedVersion) {
- println("ECLIPSE_VERSION=${eclipseVersion}")
+ println("ECLIPSE VERSION=${eclipseVersion}")
}
}
}
task OLDjalviewjsEclipseCopyDropins {
dependsOn jalviewjsEclipsePaths
dependsOn jalviewjsCleanEclipse
- def inputFiles = fileTree(dir: utilsDropinsDir, include: "*.jar")
+ def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_eclipse_dropins_dir}", include: "*.jar")
inputFiles += file(jalviewjs_j2s_plugin)
- def outputDir = eclipseDropinsDir
+ def outputDir = "${buildDir}/jalviewjs
inputs.files inputFiles
inputFiles.each { file ->
task jalviewjsEclipseCopyDropins(type: Copy) {
dependsOn jalviewjsEclipsePaths
- from utilsDropinsDir
- into eclipseDropinsDir
+ def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_eclipse_dropins_dir}", include: "*.jar")
+ inputFiles += file("${jalviewDir}/${jalviewjs_j2s_plugin}")
+ def outputDir = "${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_eclipse_tmp_dropins_dir}"
- doLast {
- copy {
- from jalviewjs_j2s_plugin
- into eclipseDropinsDir
- }
- }
+ from inputFiles
+ into outputDir
}
// this eclipse -clean doesn't actually work
"""
def inputByteStream = new ByteArrayInputStream(inputString.getBytes())
standardInput = inputByteStream
-
- doFirst {
- println("CLEAN ECLIPSE_DEBUG=${eclipseDebug}")
- }
}
/* not really working yet
jalviewjsEclipseCopyDropins.finalizedBy jalviewjsCleanEclipse
*/
-task jalviewjsUnzipFiles {
+def jalviewjsTransferSiteUnzipDir
+task jalviewjsTransferUnzipLib {
dependsOn jalviewjsSitePath
def zipFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_libjs_dir}", include: "*.zip")
zipFiles.each { file_zip ->
copy {
from zipTree(file_zip)
- into jalviewjsSiteDir
+ into "${jalviewDir}/${jalviewjsTransferSiteLibDir}"
}
}
}
inputs.files zipFiles
- outputs.dir jalviewjsSiteDir
+ outputs.dir "${jalviewDir}/${jalviewjsTransferSiteLibDir}"
}
task jalviewjsCreateJ2sSettings(type: WriteProperties) {
+ group "JalviewJS"
+ description "Create the .j2s file from the j2s.* properties"
+
dependsOn jalviewjsSitePath
+
outputFile ("${jalviewDir}/${jalviewjs_j2s_settings}")
def j2s_props = project.properties.findAll { it.key.startsWith("j2s.") }.sort { it.key }
def siteDirProperty = "j2s.site.directory"
if (val != null) {
if (prop == siteDirProperty) {
if (!(val.startsWith('/') || val.startsWith("file://") )) {
- val = "${jalviewjsTransferSiteDir}/${val}"
+ val = "${jalviewDir}/${jalviewjsTransferSiteJsDir}/${val}"
}
setSiteDir = true
}
property(prop,val)
}
if (!setSiteDir) { // default site location, don't override specifically set property
- property(siteDirProperty,jalviewjsTransferSiteDir)
+ property(siteDirProperty,"${jalviewDir}/${jalviewjsTransferSiteJsDir}")
}
}
inputs.properties(j2s_props)
dependsOn jalviewjsCreateJ2sSettings
}
-task jalviewjsCopyResources (type: Sync) {
+task jalviewjsSyncLib (type: Sync) {
+ dependsOn jalviewjsSitePath
+ dependsOn jalviewjsTransferUnzipLib
+ def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteLibDir}")
+ def outputDir = "${jalviewDir}/${jalviewjsSiteDir}"
+
+ from inputFiles
+ into outputDir
+ def outputFiles = []
+ rename { filename ->
+ outputFiles += "${outputDir}/${filename}"
+ null
+ }
+ preserve {
+ include "**"
+ }
+ outputs.files outputFiles
+ inputs.files inputFiles
+}
+
+task jalviewjsSyncCore (type: Sync) {
+ dependsOn jalviewjsSitePath
+ dependsOn "jalviewjsBuildAllCores"
+ def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteCoreDir}")
+ def outputDir = "${jalviewDir}/${jalviewjsSiteDir}"
+
+ from inputFiles
+ into outputDir
+ def outputFiles = []
+ rename { filename ->
+ outputFiles += "${outputDir}/${filename}"
+ null
+ }
+ preserve {
+ include "**"
+ }
+ outputs.files outputFiles
+ inputs.files inputFiles
+}
+
+task jalviewjsSyncResources (type: Sync) {
dependsOn jalviewjsSitePath
- def inputFiles = fileTree(dir: resourceDir)
- def outputDir = "${jalviewjsSiteDir}/${jalviewjs_j2s_subdir}"
+ def inputFiles = fileTree(dir: "${jalviewDir}/${resourceDir}")
+ def outputDir = "${jalviewDir}/${jalviewjsSiteDir}/${jalviewjs_j2s_subdir}"
from inputFiles
into outputDir
inputs.files inputFiles
}
-task jalviewjsCopySiteResources (type: Sync) {
+task jalviewjsSyncSiteResources (type: Sync) {
dependsOn jalviewjsSitePath
def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_site_resource_dir}")
- def outputDir = jalviewjsSiteDir
+ def outputDir = "${jalviewDir}/${jalviewjsSiteDir}"
+
+ from inputFiles
+ into outputDir
+ def outputFiles = []
+ rename { filename ->
+ outputFiles += "${outputDir}/${filename}"
+ null
+ }
+ preserve {
+ include "**"
+ }
+ outputs.files outputFiles
+ inputs.files inputFiles
+}
+
+task jalviewjsSyncBuildProperties (type: Sync) {
+ dependsOn jalviewjsSitePath
+ dependsOn createBuildProperties
+ def inputFiles = [file(buildProperties)]
+ def outputDir = "${jalviewDir}/${jalviewjsSiteDir}/${jalviewjs_j2s_subdir}"
from inputFiles
into outputDir
dependsOn jalviewjsEclipsePaths
dependsOn jalviewjsEclipseSetup
- def projdir = eclipseWorkspace.getPath()+"/.metadata/.plugins/org.eclipse.core.resources/.projects/jalview/org.eclipse.jdt.core"
+ //def projdir = eclipseWorkspace.getPath()+"/.metadata/.plugins/org.eclipse.core.resources/.projects/jalview/org.eclipse.jdt.core"
+ def projdir = eclipseWorkspace.getPath()+"/.metadata/.plugins/org.eclipse.core.resources/.projects/jalview"
executable(eclipseBinary)
args(["-nosplash", "--launcher.suppressErrors", "-application", "com.seeq.eclipse.importprojects.headlessimport", "-data", eclipseWorkspace.getPath(), "-import", jalviewDirAbsolutePath])
if (eclipseDebug) {
args += "-debug"
}
-
- doFirst {
- println("IMPORT ECLIPSE_DEBUG=${eclipseDebug}")
- }
+ args += [ "--launcher.appendVmargs", "-vmargs", "-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_eclipse_tmp_dropins_dir}" ]
inputs.file("${jalviewDir}/.project")
- outputs.dir(projdir)
- outputs.upToDateWhen { file(projdir).exists() }
+ outputs.upToDateWhen {
+ file(projdir).exists()
+ }
}
task jalviewjsTranspile(type: Exec) {
if (eclipseDebug) {
args += "-debug"
}
+ args += [ "--launcher.appendVmargs", "-vmargs", "-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_eclipse_tmp_dropins_dir}" ]
def stdout
def stderr
- stdout = new ByteArrayOutputStream()
- stderr = new ByteArrayOutputStream()
+ doFirst {
+ stdout = new ByteArrayOutputStream()
+ stderr = new ByteArrayOutputStream()
- def logOutFileName = "${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_j2s_stdout}"
- def logOutFile = file(logOutFileName)
- logOutFile.createNewFile()
- logOutFile.text = """ROOT: ${jalviewjs_eclipse_root}
+ def logOutFileName = "${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_j2s_transpile_stdout}"
+ def logOutFile = file(logOutFileName)
+ logOutFile.createNewFile()
+ logOutFile.text = """ROOT: ${jalviewjs_eclipse_root}
BINARY: ${eclipseBinary}
VERSION: ${eclipseVersion}
WORKSPACE: ${eclipseWorkspace}
DEBUG: ${eclipseDebug}
----
"""
- def logOutFOS = new FileOutputStream(logOutFile, true) // true == append
- //def logErrFileName = "${jalviewjsBuildDir}/${jalviewjs_j2s_stderr}"
- //def logErrFile = file(logFileName)
- //logErrFile.createNewFile()
- //def logErrFOS = new FileErrputStream(logErrFile, false)
- // combine stdout and stderr
- def logErrFOS = logOutFOS
-
- if (jalviewjs_j2s_to_console.equals("true")) {
- standardOutput = new org.apache.tools.ant.util.TeeOutputStream(
- new org.apache.tools.ant.util.TeeOutputStream(
- logOutFOS,
- stdout),
- standardOutput)
+ def logOutFOS = new FileOutputStream(logOutFile, true) // true == append
+ //def logErrFileName = "${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_j2s_stderr}"
+ //def logErrFile = file(logFileName)
+ //logErrFile.createNewFile()
+ //def logErrFOS = new FileErrputStream(logErrFile, false)
+ // combine stdout and stderr
+ def logErrFOS = logOutFOS
+
+ if (jalviewjs_j2s_to_console.equals("true")) {
+ standardOutput = new org.apache.tools.ant.util.TeeOutputStream(
+ new org.apache.tools.ant.util.TeeOutputStream(
+ logOutFOS,
+ stdout),
+ standardOutput)
errorOutput = new org.apache.tools.ant.util.TeeOutputStream(
new org.apache.tools.ant.util.TeeOutputStream(
logErrFOS,
stderr),
errorOutput)
- } else {
- standardOutput = new org.apache.tools.ant.util.TeeOutputStream(
- logOutFOS,
- stdout)
+ } else {
+ standardOutput = new org.apache.tools.ant.util.TeeOutputStream(
+ logOutFOS,
+ stdout)
errorOutput = new org.apache.tools.ant.util.TeeOutputStream(
logErrFOS,
stderr)
+ }
}
doLast {
if (stdout.toString().contains("Error processing ")) {
// j2s did not complete transpile
- throw new GradleException("Error during transpilation:\n${stderr}\nSee eclipse transpile log file '${jalviewjsBuildDir}/${jalviewjs_j2s_stdout}'")
+ throw new GradleException("Error during transpilation:\n${stderr}\nSee eclipse transpile log file '${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_j2s_transpile_stdout}'")
}
}
- doFirst {
- println("TRANSPILE ECLIPSE_DEBUG=${eclipseDebug}")
- }
-
- inputs.dir(sourceDir)
- outputs.dir("${eclipse_bin_dir}/main")
- outputs.dir(jalviewjsTransferSiteDir)
- outputs.upToDateWhen { file("${jalviewjsTransferSiteDir}${jalviewjs_server_resource}").exists() }
-
+ inputs.dir("${jalviewDir}/${sourceDir}")
+ outputs.dir("${jalviewDir}/${jalviewjsTransferSiteJsDir}")
+ outputs.upToDateWhen( { file("${jalviewDir}/${jalviewjsTransferSiteJsDir}${jalviewjs_server_resource}").exists() } )
}
-task jalviewjsCopyTransferSite(type: Copy) {
+// this Copy version of TransferSiteJs will delete anything else in the target dir
+task jalviewjsCopyTransferSiteJs(type: Copy) {
dependsOn jalviewjsTranspile
- from jalviewjsTransferSiteDir
- into jalviewjsSiteDir
+ from "${jalviewDir}/${jalviewjsTransferSiteJsDir}"
+ into "${jalviewDir}/${jalviewjsSiteDir}"
+}
+
+// this Sync version of TransferSite is used by buildship to keep the website automatically up to date when a file changes
+task jalviewjsSyncTransferSiteJs(type: Sync) {
+ from "${jalviewDir}/${jalviewjsTransferSiteJsDir}"
+ include "**/*.*"
+ into "${jalviewDir}/${jalviewjsSiteDir}"
+ preserve {
+ include "**"
+ }
}
-jalviewjsUnzipFiles.mustRunAfter jalviewjsCopyTransferSite
-jalviewjsCopyResources.mustRunAfter jalviewjsCopyTransferSite
-jalviewjsCopySiteResources.mustRunAfter jalviewjsCopyTransferSite
+jalviewjsSyncLib.mustRunAfter jalviewjsCopyTransferSiteJs
+jalviewjsSyncResources.mustRunAfter jalviewjsCopyTransferSiteJs
+jalviewjsSyncSiteResources.mustRunAfter jalviewjsCopyTransferSiteJs
+jalviewjsSyncBuildProperties.mustRunAfter jalviewjsCopyTransferSiteJs
+
+jalviewjsSyncLib.mustRunAfter jalviewjsSyncTransferSiteJs
+jalviewjsSyncResources.mustRunAfter jalviewjsSyncTransferSiteJs
+jalviewjsSyncSiteResources.mustRunAfter jalviewjsSyncTransferSiteJs
+jalviewjsSyncBuildProperties.mustRunAfter jalviewjsSyncTransferSiteJs
task jalviewjsPrepareSite {
group "JalviewJS"
description "Prepares the website folder including unzipping files and copying resources"
- dependsOn jalviewjsSitePath
- dependsOn jalviewjsUnzipFiles
- dependsOn jalviewjsCopyResources
- dependsOn jalviewjsCopySiteResources
+ dependsOn jalviewjsSyncLib
+ dependsOn jalviewjsSyncResources
+ dependsOn jalviewjsSyncSiteResources
+ dependsOn jalviewjsSyncBuildProperties
+ dependsOn jalviewjsSyncCore
}
task jalviewjsBuildSite {
group "JalviewJS"
description "Builds the whole website including transpiled code"
- dependsOn jalviewjsCopyTransferSite
+ dependsOn jalviewjsCopyTransferSiteJs
dependsOn jalviewjsPrepareSite
}
task cleanJalviewjsSite {
doFirst {
- delete jalviewjsTransferSiteDir
- delete jalviewjsSiteDir
+ delete "${jalviewDir}/${jalviewjsTransferSiteJsDir}"
+ delete "${jalviewDir}/${jalviewjsTransferSiteLibDir}"
+ delete "${jalviewDir}/${jalviewjsTransferSiteCoreDir}"
+ delete "${jalviewDir}/${jalviewjsSiteDir}"
}
}
compression Compression.GZIP
- from jalviewjsSiteDir
+ from "${jalviewDir}/${jalviewjsSiteDir}"
into jalviewjs_site_dir // this is inside the tar file
- inputs.dir(jalviewjsSiteDir)
+ inputs.dir("${jalviewDir}/${jalviewjsSiteDir}")
}
task jalviewjsServer {
group "JalviewJS"
- description "Starts a webserver on localhost to test the website"
+ def filename = "jalviewjsTest.html"
+ description "Starts a webserver on localhost to test the website. See ${filename} to access local site on most recently used port."
dependsOn jalviewjsSitePath
- def htmlFile = "${jalviewDirAbsolutePath}/jalviewjsTest.html"
+ def htmlFile = "${jalviewDirAbsolutePath}/${filename}"
doLast {
SimpleHttpFileServerFactory factory = new SimpleHttpFileServerFactory()
}
outputs.file(htmlFile)
+ outputs.upToDateWhen({false})
}
task cleanJalviewjsAll {
dependsOn jalviewjsEclipsePaths
doFirst {
- delete jalviewjsBuildDir
+ delete "${jalviewDir}/${jalviewjsBuildDir}"
delete "${jalviewDir}/${eclipse_bin_dir}"
if (eclipseWorkspace != null && file(eclipseWorkspace.getAbsolutePath()+"/.metadata").exists()) {
delete file(eclipseWorkspace.getAbsolutePath()+"/.metadata")
}
delete "${jalviewDir}/${jalviewjs_j2s_settings}"
}
+
+ outputs.upToDateWhen( { false } )
}
task jalviewjs {
}
-task jalviewjsIDECopyTransferSite(type: Copy) {
- from jalviewjsTransferSiteDir
- into jalviewjsSiteDir
+task jalviewjsIDE_CopyTransferSiteJs(type: Copy) {
+ from "${jalviewDir}/${jalviewjsTransferSiteJsDir}"
+ into "${jalviewDir}/${jalviewjsSiteDir}"
}
-task jalviewjsIDEj2s {
- group "JalviewJS in Eclipse"
+task jalviewjsIDE_j2sFile {
+ group "00 JalviewJS in Eclipse"
description "Creates the .j2s file"
dependsOn jalviewjsCreateJ2sSettings
}
-task jalviewjsIDEBuildSite {
- group "JalviewJS in Eclipse"
- description "Copies the Eclipse transpiled site and unzips supporting zipfiles"
- dependsOn jalviewjsIDECopyTransferSite
+task jalviewjsIDE_AssembleSite {
+ group "00 JalviewJS in Eclipse"
+ description "Assembles the Eclipse transpiled site and unzips supporting zipfiles"
+ dependsOn jalviewjsIDE_CopyTransferSiteJs
dependsOn jalviewjsPrepareSite
}
-task jalviewjsIDESiteClean {
- group "JalviewJS in Eclipse"
+task jalviewjsIDE_SiteClean {
+ group "00 JalviewJS in Eclipse"
description "Deletes the Eclipse transpiled site"
dependsOn cleanJalviewjsSite
}
-task jalviewjsIDEServer {
- group "JalviewJS in Eclipse"
+task jalviewjsIDE_Server {
+ group "00 JalviewJS in Eclipse"
description "Starts a webserver on localhost to test the website"
dependsOn jalviewjsServer
}
+// buildship runs this at import
+task eclipseSynchronizationTask {
+ dependsOn eclipseSetup
+ dependsOn jalviewjsIDE_j2sFile
+}
+
+// buildship runs this at build time
+task eclipseAutoBuildTask {
+ dependsOn jalviewjsSyncTransferSiteJs
+ dependsOn jalviewjsPrepareSite
+}
+
+
+
+
+
+
+
+
+// closure
+
+def jalviewjsCallCore(FileCollection list, String prefixFile, String suffixFile, String jsfile, String zjsfile, File logOutFile, Boolean logOutConsole) {
+
+ def stdout = new ByteArrayOutputStream()
+ def stderr = new ByteArrayOutputStream()
+
+ def coreFile = file(jsfile)
+ def msg = ""
+ msg = "Generating ${jsfile}"
+ println(msg)
+ logOutFile.createNewFile()
+ logOutFile.append(msg+"\n")
+
+ def coreTop = file(prefixFile)
+ def coreBottom = file(suffixFile)
+ coreFile.getParentFile().mkdirs()
+ coreFile.createNewFile()
+ coreFile.write( coreTop.text )
+ list.each {
+ f ->
+ if (f.exists()) {
+ def t = f.text
+ t.replaceAll("Clazz\\.","Clazz_")
+ t.replaceAll("Class__","Clazz._")
+ coreFile.append( t )
+ } else {
+ msg = "...file "+f.getPath()+" does not exist, skipping"
+ println(msg)
+ logOutFile.append(msg+"\n")
+ }
+ }
+ coreFile.append( coreBottom.text )
+
+ msg = "Generating ${zjsfile}"
+ println(msg)
+ logOutFile.append(msg+"\n")
+ def logOutFOS = new FileOutputStream(logOutFile, true) // true == append
+ def logErrFOS = logOutFOS
+
+ javaexec {
+ classpath = files(["${jalviewDir}/tools/closure_compiler.jar"])
+ args = [ "--js", jsfile, "--js_output_file", zjsfile ]
+
+ msg = "\nRunning '"+commandLine.join(' ')+"'\n"
+ println(msg)
+ logOutFile.append(msg+"\n")
+
+ if (logOutConsole) {
+ standardOutput = new org.apache.tools.ant.util.TeeOutputStream(
+ new org.apache.tools.ant.util.TeeOutputStream(
+ logOutFOS,
+ stdout),
+ standardOutput)
+ errorOutput = new org.apache.tools.ant.util.TeeOutputStream(
+ new org.apache.tools.ant.util.TeeOutputStream(
+ logErrFOS,
+ stderr),
+ errorOutput)
+ } else {
+ standardOutput = new org.apache.tools.ant.util.TeeOutputStream(
+ logOutFOS,
+ stdout)
+ errorOutput = new org.apache.tools.ant.util.TeeOutputStream(
+ logErrFOS,
+ stderr)
+ }
+ }
+ msg = "--"
+ println(msg)
+ logOutFile.append(msg+"\n")
+}
+
+
+
+task jalviewjsBuildAllCores {
+ group "JalviewJS"
+ description "Build the core js lib closures"
+
+ dependsOn jalviewjsSitePath
+ dependsOn jalviewjsTransferUnzipLib
+ dependsOn jalviewjsTranspile
+
+ def j2sDir = "${jalviewDir}/${jalviewjsTransferSiteJsDir}/${jalviewjs_j2s_subdir}"
+ def jsDir = "${jalviewDir}/${jalviewjsTransferSiteLibDir}/${jalviewjs_js_subdir}"
+ def outputDir = "${jalviewDir}/${jalviewjsTransferSiteCoreDir}/${jalviewjs_j2s_subdir}/core"
+ def prefixFile = "${jsDir}/core/coretop2.js"
+ def suffixFile = "${jsDir}/core/corebottom2.js"
+
+ inputs.file prefixFile
+ inputs.file suffixFile
+
+ def classlists = []
+ fileTree(dir: "${jalviewDir}/${jalviewjs_classlists_dir}", include: "*.txt").each {
+ file ->
+ def name = file.getName() - ".txt"
+
+ def filelist = []
+ file.eachLine {
+ line ->
+ filelist += line
+ }
+ def list = fileTree(dir: j2sDir, includes: filelist)
+
+ def coreFileName = "core${name}.js"
+ def jsfile = "${outputDir}/${coreFileName}"
+ def coreZFileName = "core${name}.z.js"
+ def zjsfile = "${outputDir}/${coreZFileName}"
+
+ classlists += [
+ 'jsfile': jsfile,
+ 'zjsfile': zjsfile,
+ 'list': list
+ ]
+
+ inputs.file(file)
+ inputs.files(list)
+ outputs.file(jsfile)
+ outputs.file(zjsfile)
+ }
+
+
+ doFirst {
+ def logOutFile = file("${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_j2s_closure_stdout}")
+ logOutFile.getParentFile().mkdirs()
+ logOutFile.createNewFile()
+ logOutFile.write(getDate("yyyy-MM-dd HH:mm:ss")+" jalviewjsBuildAllCores\n----\n")
+
+ classlists.each {
+ jalviewjsCallCore(it.list, prefixFile, suffixFile, it.jsfile, it.zjsfile, logOutFile, jalviewjs_j2s_to_console.equals("true"))
+ }
+ }
+
+}