import org.gradle.internal.os.OperatingSystem
import org.gradle.plugins.ide.eclipse.model.Output
import org.gradle.plugins.ide.eclipse.model.Library
+import java.security.MessageDigest
import groovy.transform.ExternalizeMethods
id 'eclipse'
id 'com.github.johnrengelman.shadow' version '4.0.3'
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")
- }
+ id 'com.dorongold.task-tree' version '1.4' // only needed to display task dependency tree with gradle task1 [task2 ...] taskTree
}
repositories {
compile 'org.apache.commons:commons-compress:1.18'
}
-mainClassName = launcherClass
-def cloverInstrDir = file("${buildDir}/${cloverSourcesInstrDir}")
-def classes = "${jalviewDir}/${classesDir}"
-if (clover.equals("true")) {
- use_clover = true
- classes = "${buildDir}/${cloverClassesDir}"
-} else {
- use_clover = false
- classes = "${jalviewDir}/${classesDir}"
+// in ext the values are cast to Object. Ensure string values are cast as String (and not GStringImpl) for later use
+def string(Object o) {
+ return o.toString()
}
-// configure classpath/args for j8/j11 compilation
-def jalviewDirAbsolutePath = file(jalviewDir).getAbsolutePath()
-def libDir
-def libDistDir
-def compile_source_compatibility
-def compile_target_compatibility
+ext {
+ jalviewDirAbsolutePath = file(jalviewDir).getAbsolutePath()
+ jalviewDirRelativePath = jalviewDir
+
+ // local build environment properties
+ def localProps = "${jalviewDirAbsolutePath}/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")
+ }
+ }
+
+ // this property set when running Eclipse headlessly
+ j2sHeadlessBuildProperty = string("net.sf.j2s.core.headlessbuild")
+ // this property set by Eclipse
+ eclipseApplicationProperty = string("eclipse.application")
+ // CHECK IF RUNNING FROM WITHIN ECLIPSE
+ def eclipseApplicationPropertyVal = System.properties[eclipseApplicationProperty]
+ IN_ECLIPSE = eclipseApplicationPropertyVal != null && eclipseApplicationPropertyVal.startsWith("org.eclipse.ui.")
+ // BUT WITHOUT THE HEADLESS BUILD PROPERTY SET
+ if (System.properties[j2sHeadlessBuildProperty].equals("true")) {
+ println("Setting IN_ECLIPSE to ${IN_ECLIPSE} as System.properties['${j2sHeadlessBuildProperty}'] == '${System.properties[j2sHeadlessBuildProperty]}'")
+ IN_ECLIPSE = false
+ }
+ if (IN_ECLIPSE) {
+ println("WITHIN ECLIPSE IDE")
+ } 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}'")
+ }
+ /-* *-/
+ if (false && IN_ECLIPSE) {
+ jalviewDir = jalviewDirAbsolutePath
+ }
+ */
+
+ // essentials
+ bareSourceDir = string(source_dir)
+ sourceDir = string("${jalviewDir}/${bareSourceDir}")
+ resourceDir = string("${jalviewDir}/${resource_dir}")
+ bareTestSourceDir = string(test_source_dir)
+ testSourceDir = string("${jalviewDir}/${bareTestSourceDir}")
+
+ // clover
+ cloverInstrDir = file("${buildDir}/${cloverSourcesInstrDir}")
+ classesDir = string("${jalviewDir}/${classes_dir}")
+ if (clover.equals("true")) {
+ use_clover = true
+ classesDir = string("${buildDir}/${cloverClassesDir}")
+ } else {
+ use_clover = false
+ classesDir = string("${jalviewDir}/${classes_dir}")
+ }
+ classes = classesDir
-ext {
- getdownWebsiteDir = "${jalviewDir}/${getdown_website_dir}/${JAVA_VERSION}"
- getdownDir = ""
+ getdownWebsiteDir = string("${jalviewDir}/${getdown_website_dir}/${JAVA_VERSION}")
+ getdownDir = string("")
reportRsyncCmd = false
buildDist = true
- buildProperties = build_properties_file
- getdownLauncher = "${jalviewDir}/${getdown_lib_dir}/${getdown_launcher}"
+ buildProperties = string("${resourceDir}/${build_properties_file}")
+ getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher}")
switch (CHANNEL) {
case "BUILD":
// TODO: get bamboo build artifact URL for getdown artifacts
getdown_channel_base = bamboo_channelbase
- getdown_channel_name = "${bamboo_planKey}/${JAVA_VERSION}"
- getdown_app_base = "${bamboo_channelbase}/${bamboo_planKey}${bamboo_getdown_channel_suffix}/${JAVA_VERSION}"
+ 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 = "${jalviewDir}/${classesDir}/${build_properties_file}"
+ buildProperties = string("${resourceDir}/${build_properties_file}")
break
case "RELEASE":
getdown_channel_name = CHANNEL.toLowerCase()
- getdownDir = "${getdown_channel_name}/${JAVA_VERSION}"
- getdown_app_base = "${getdown_channel_base}/${getdownDir}"
+ getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}")
+ getdown_app_base = string("${getdown_channel_base}/${getdownDir}")
getdown_app_dir = getdown_app_dir_release
- buildProperties = "${jalviewDir}/${classesDir}/${build_properties_file}"
+ buildProperties = string("${resourceDir}/${build_properties_file}")
reportRsyncCommand = true
break
case "ARCHIVE":
getdown_channel_name = CHANNEL.toLowerCase()+"/${JALVIEW_VERSION}"
- getdownDir = "${getdown_channel_name}/${JAVA_VERSION}"
- getdown_app_base = "${getdown_channel_base}/${getdownDir}"
+ getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}")
+ getdown_app_base = string("${getdown_channel_base}/${getdownDir}")
getdown_app_dir = getdown_app_dir_alt
if (!file("${ARCHIVEDIR}/${packageDir}").exists()) {
print "Must provide an ARCHIVEDIR value to produce an archive distribution"
exit
} else {
- packageDir = "${ARCHIVEDIR}/${packageDir}"
- buildProperties = "${ARCHIVEDIR}/${classesDir}/${build_properties_file}"
+ packageDir = string("${ARCHIVEDIR}/${packageDir}")
+ buildProperties = string("${ARCHIVEDIR}/${resource_dir}/${build_properties_file}")
buildDist = false
}
reportRsyncCommand = true
break
case "ARCHIVELOCAL":
- getdown_channel_name = "archive/${JALVIEW_VERSION}"
- getdownDir = "${getdown_channel_name}/${JAVA_VERSION}"
+ getdown_channel_name = string("archive/${JALVIEW_VERSION}")
+ getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}")
getdown_app_base = file(getdownWebsiteDir).toURI().toString()
getdown_app_dir = getdown_app_dir_alt
if (!file("${ARCHIVEDIR}/${packageDir}").exists()) {
print "Must provide an ARCHIVEDIR value to produce an archive distribution"
exit
} else {
- packageDir = "${ARCHIVEDIR}/${packageDir}"
- buildProperties = "${ARCHIVEDIR}/${classesDir}/${build_properties_file}"
+ packageDir = string("${ARCHIVEDIR}/${packageDir}")
+ buildProperties = string("${ARCHIVEDIR}/${resource_dir}/${build_properties_file}")
buildDist = false
}
reportRsyncCommand = true
- getdownLauncher = "${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}"
+ getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}")
break
case "DEVELOP":
getdown_channel_name = CHANNEL.toLowerCase()
- getdownDir = "${getdown_channel_name}/${JAVA_VERSION}"
- getdown_app_base = "${getdown_channel_base}/${getdownDir}"
+ getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}")
+ getdown_app_base = string("${getdown_channel_base}/${getdownDir}")
getdown_app_dir = getdown_app_dir_alt
- buildProperties = "${jalviewDir}/${classesDir}/${build_properties_file}"
+ buildProperties = string("${resourceDir}/${build_properties_file}")
reportRsyncCommand = true
break
case "TEST-RELEASE":
getdown_channel_name = CHANNEL.toLowerCase()
- getdownDir = "${getdown_channel_name}/${JAVA_VERSION}"
- getdown_app_base = "${getdown_channel_base}/${getdownDir}"
+ getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}")
+ getdown_app_base = string("${getdown_channel_base}/${getdownDir}")
getdown_app_dir = getdown_app_dir_alt
- buildProperties = "${jalviewDir}/${classesDir}/${build_properties_file}"
+ buildProperties = string("${resourceDir}/${build_properties_file}")
reportRsyncCommand = true
break
case ~/^SCRATCH(|-[-\w]*)$/:
getdown_channel_name = CHANNEL
- getdownDir = "${getdown_channel_name}/${JAVA_VERSION}"
- getdown_app_base = "${getdown_channel_base}/${getdownDir}"
+ getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}")
+ getdown_app_base = string("${getdown_channel_base}/${getdownDir}")
getdown_app_dir = getdown_app_dir_alt
- buildProperties = "${jalviewDir}/${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 = "${jalviewDir}/${classesDir}/${build_properties_file}"
- getdownLauncher = "${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}"
+ buildProperties = string("${resourceDir}/${build_properties_file}")
+ getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}")
break
default: // something wrong specified
}
- getdownAppDir = "${getdownWebsiteDir}/${getdown_app_dir}"
+ getdownAppDir = string("${getdownWebsiteDir}/${getdown_app_dir}")
//getdownJ11libDir = "${getdownWebsiteDir}/${getdown_j11lib_dir}"
- getdownResourceDir = "${getdownWebsiteDir}/${getdown_resource_dir}"
- getdownInstallDir = "${getdownWebsiteDir}/${getdown_install_dir}"
- getdownFilesDir = "${jalviewDir}/${getdown_files_dir}/${JAVA_VERSION}/"
- getdownFilesInstallDir = "${getdownFilesDir}/${getdown_install_dir}"
+ getdownResourceDir = string("${getdownWebsiteDir}/${getdown_resource_dir}")
+ getdownInstallDir = string("${getdownWebsiteDir}/${getdown_install_dir}")
+ getdownFilesDir = string("${jalviewDir}/${getdown_files_dir}/${JAVA_VERSION}/")
+ getdownFilesInstallDir = string("${getdownFilesDir}/${getdown_install_dir}")
/* compile without modules -- using classpath libraries
modules_compileClasspath = fileTree(dir: "${jalviewDir}/${j11modDir}", include: ["*.jar"])
modules_runtimeClasspath = modules_compileClasspath
*/
- gitHash = ""
- gitBranch = ""
+ gitHash = string("")
+ gitBranch = string("")
println("Using a ${CHANNEL} profile.")
-}
-def JAVA_INTEGER_VERSION
-def additional_compiler_args = []
-// these are getdown.txt properties defined dependent on the JAVA_VERSION
-def getdown_alt_java_min_version
-def getdown_alt_java_max_version
-// this property is assigned below and expanded to multiple lines in the getdown task
-def getdown_alt_multi_java_location
-// this property is for the Java library used in eclipse
-def eclipse_java_runtime_name
-if (JAVA_VERSION.equals("1.8")) {
- JAVA_INTEGER_VERSION = "8"
- //libDir = j8libDir
- libDir = j11libDir
- libDistDir = j8libDir
- compile_source_compatibility = 1.8
- compile_target_compatibility = 1.8
- getdown_alt_java_min_version = getdown_alt_java8_min_version
- getdown_alt_java_max_version = getdown_alt_java8_max_version
- getdown_alt_multi_java_location = getdown_alt_java8_txt_multi_java_location
- eclipse_java_runtime_name = "JavaSE-1.8"
-} else if (JAVA_VERSION.equals("11")) {
- JAVA_INTEGER_VERSION = "11"
- libDir = j11libDir
- libDistDir = j11libDir
- compile_source_compatibility = 11
- compile_target_compatibility = 11
- getdown_alt_java_min_version = getdown_alt_java11_min_version
- getdown_alt_java_max_version = getdown_alt_java11_max_version
- getdown_alt_multi_java_location = getdown_alt_java11_txt_multi_java_location
- eclipse_java_runtime_name = "JavaSE-11"
- /* compile without modules -- using classpath libraries
- additional_compiler_args += [
- '--module-path', ext.modules_compileClasspath.asPath,
- '--add-modules', j11modules
- ]
- */
-} else if (JAVA_VERSION.equals("12") || JAVA_VERSION.equals("13")) {
- JAVA_INTEGER_VERSION = JAVA_VERSION
- libDir = j11libDir
- libDistDir = j11libDir
- compile_source_compatibility = JAVA_VERSION
- compile_target_compatibility = JAVA_VERSION
- getdown_alt_java_min_version = getdown_alt_java11_min_version
- getdown_alt_java_max_version = getdown_alt_java11_max_version
- getdown_alt_multi_java_location = getdown_alt_java11_txt_multi_java_location
- eclipse_java_runtime_name = "JavaSE-11"
- /* compile without modules -- using classpath libraries
- additional_compiler_args += [
- '--module-path', ext.modules_compileClasspath.asPath,
- '--add-modules', j11modules
- ]
- */
-} else {
- throw new GradleException("JAVA_VERSION=${JAVA_VERSION} not currently supported by Jalview")
+ additional_compiler_args = []
+ // configure classpath/args for j8/j11 compilation
+ if (JAVA_VERSION.equals("1.8")) {
+ JAVA_INTEGER_VERSION = string("8")
+ //libDir = j8libDir
+ libDir = j11libDir
+ libDistDir = j8libDir
+ compile_source_compatibility = 1.8
+ compile_target_compatibility = 1.8
+ // these are getdown.txt properties defined dependent on the JAVA_VERSION
+ getdown_alt_java_min_version = getdown_alt_java8_min_version
+ getdown_alt_java_max_version = getdown_alt_java8_max_version
+ // this property is assigned below and expanded to multiple lines in the getdown task
+ getdown_alt_multi_java_location = getdown_alt_java8_txt_multi_java_location
+ // this property is for the Java library used in eclipse
+ eclipse_java_runtime_name = string("JavaSE-1.8")
+ } else if (JAVA_VERSION.equals("11")) {
+ JAVA_INTEGER_VERSION = string("11")
+ libDir = j11libDir
+ libDistDir = j11libDir
+ compile_source_compatibility = 11
+ compile_target_compatibility = 11
+ getdown_alt_java_min_version = getdown_alt_java11_min_version
+ getdown_alt_java_max_version = getdown_alt_java11_max_version
+ getdown_alt_multi_java_location = getdown_alt_java11_txt_multi_java_location
+ eclipse_java_runtime_name = string("JavaSE-11")
+ /* compile without modules -- using classpath libraries
+ additional_compiler_args += [
+ '--module-path', modules_compileClasspath.asPath,
+ '--add-modules', j11modules
+ ]
+ */
+ } else if (JAVA_VERSION.equals("12") || JAVA_VERSION.equals("13")) {
+ JAVA_INTEGER_VERSION = JAVA_VERSION
+ libDir = j11libDir
+ libDistDir = j11libDir
+ compile_source_compatibility = JAVA_VERSION
+ compile_target_compatibility = JAVA_VERSION
+ getdown_alt_java_min_version = getdown_alt_java11_min_version
+ getdown_alt_java_max_version = getdown_alt_java11_max_version
+ getdown_alt_multi_java_location = getdown_alt_java11_txt_multi_java_location
+ eclipse_java_runtime_name = string("JavaSE-11")
+ /* compile without modules -- using classpath libraries
+ additional_compiler_args += [
+ '--module-path', modules_compileClasspath.asPath,
+ '--add-modules', j11modules
+ ]
+ */
+ } else {
+ throw new GradleException("JAVA_VERSION=${JAVA_VERSION} not currently supported by Jalview")
+ }
+
+
+ // for install4j
+ macosJavaVMDir = string("${System.env.HOME}/buildtools/jre/openjdk-java_vm/getdown/macos-jre${JAVA_VERSION}/jre")
+ macosJavaVMTgz = string("${System.env.HOME}/buildtools/jre/openjdk-java_vm/install4j/tgz/macos-jre${JAVA_VERSION}.tar.gz")
+ windowsJavaVMDir = string("${System.env.HOME}/buildtools/jre/openjdk-java_vm/getdown/windows-jre${JAVA_VERSION}/jre")
+ windowsJavaVMTgz = string("${System.env.HOME}/buildtools/jre/openjdk-java_vm/install4j/tgz/windows-jre${JAVA_VERSION}.tar.gz")
+ install4jDir = string("${jalviewDir}/${install4jResourceDir}")
+ install4jConfFileName = string("jalview-installers-java${JAVA_VERSION}.install4j")
+ install4jConfFile = string("${install4jDir}/${install4jConfFileName}")
+
+
+ buildingHTML = string("${jalviewDir}/${docDir}/building.html")
+ helpFile = string("${classesDir}/${help_dir}/help.jhm")
+ helpParentDir = string("${jalviewDir}/${help_parent_dir}")
+ helpDir = string("${help_dir}")
+ helpSourceDir = string("${helpParentDir}/${helpDir}")
+
+
+ relativeBuildDir = file(jalviewDirAbsolutePath).toPath().relativize(buildDir.toPath())
+ jalviewjsBuildDir = string("${relativeBuildDir}/jalviewjs")
+ jalviewjsSiteDir = string("${jalviewjsBuildDir}/${jalviewjs_site_dir}")
+ if (IN_ECLIPSE) {
+ jalviewjsTransferSiteJsDir = string(jalviewjsSiteDir)
+ } else {
+ jalviewjsTransferSiteJsDir = string("${jalviewjsBuildDir}/tmp/${jalviewjs_site_dir}_js")
+ }
+ jalviewjsTransferSiteLibDir = string("${jalviewjsBuildDir}/tmp/${jalviewjs_site_dir}_lib")
+ jalviewjsTransferSiteSwingJsDir = string("${jalviewjsBuildDir}/tmp/${jalviewjs_site_dir}_swingjs")
+ jalviewjsTransferSiteCoreDir = string("${jalviewjsBuildDir}/tmp/${jalviewjs_site_dir}_core")
+ jalviewjsJalviewCoreHtmlFile = string("")
+ jalviewjsJalviewCoreName = string(jalviewjs_core_name)
+ jalviewjsCoreClasslists = []
+ jalviewjsJalviewTemplateName = string(jalviewjs_name)
+ jalviewjsJ2sSettingsFileName = string("${jalviewDir}/${jalviewjs_j2s_settings}")
+ jalviewjsJ2sProps = null
+
+ eclipseWorkspace = null
+ eclipseBinary = string("")
+ eclipseVersion = string("")
+ eclipseDebug = false
+ // ENDEXT
}
sourceSets {
-
main {
java {
- srcDirs "${jalviewDir}/${sourceDir}"
- outputDir = file("${classes}")
+ srcDirs sourceDir
+ outputDir = file(classesDir)
}
resources {
- srcDirs "${jalviewDir}/${resourceDir}"
+ srcDirs resourceDir
}
jar.destinationDir = file("${jalviewDir}/${packageDir}")
test {
java {
- srcDirs "${jalviewDir}/${testSourceDir}"
+ srcDirs testSourceDir
outputDir = file("${jalviewDir}/${testOutputDir}")
}
cloverRuntime.extendsFrom cloverCompile
}
-
eclipse {
project {
name = eclipse_project_name
def removeTheseToo = []
HashMap<String, Boolean> alreadyAddedSrcPath = new HashMap<>();
cp.entries.each { entry ->
+ // This conditional removes all src classpathentries that a) have already been added or b) aren't "src" or "test".
+ // e.g. this removes the resources dir being copied into bin/main, bin/test AND bin/clover
+ // we add the resources and help/help dirs in as libs afterwards (see below)
if (entry.kind == 'src') {
- if (alreadyAddedSrcPath.getAt(entry.path) || !(entry.path == sourceDir || entry.path == testSourceDir)) {
+ if (alreadyAddedSrcPath.getAt(entry.path) || !(entry.path == bareSourceDir || entry.path == bareTestSourceDir)) {
removeTheseToo += entry
} else {
alreadyAddedSrcPath.putAt(entry.path, true)
}
}
+
}
cp.entries.removeAll(removeTheseToo)
- if (file("${jalviewDir}/${eclipse_bin_dir}/main").isDirectory()) {
- cp.entries += new Output("${eclipse_bin_dir}/main")
- }
- if (file(helpParentDir).isDirectory()) {
- cp.entries += new Library(fileReference(helpParentDir))
+ cp.entries += new Output("${eclipse_bin_dir}/main")
+ if (file(helpSourceDir).isDirectory()) {
+ cp.entries += new Library(fileReference(helpSourceDir))
}
if (file(resourceDir).isDirectory()) {
cp.entries += new Library(fileReference(resourceDir))
sourceSets.main.compileClasspath.findAll { it.name.endsWith(".jar") }.each {
//don't want to add outputDir as eclipse is using its own output dir in bin/main
if (it.isDirectory() || ! it.exists()) {
- // don't add dirs to classpath
- return
+ // don't add dirs to classpath, especially if they don't exist
+ return false // groovy "continue" in .any closure
}
def itPath = it.toString()
if (itPath.startsWith("${jalviewDirAbsolutePath}/")) {
}
} // jdt
-
- synchronizationTasks "eclipseSynchronizationTask"
- autoBuildTasks "eclipseAutoBuildTask"
+ if (IN_ECLIPSE) {
+ // Don't want these to be activated if in headless build
+ synchronizationTasks "eclipseSynchronizationTask"
+ //autoBuildTasks "eclipseAutoBuildTask"
+
+ }
}
task cloverInstr() {
// only instrument source, we build test classes as normal
- inputs.files files (sourceSets.main.allJava) // , fileTree(dir:"$jalviewDir/$testSourceDir", include: ["**/*.java"]))
+ inputs.files files (sourceSets.main.allJava) // , fileTree(dir: testSourceDir, include: ["**/*.java"]))
outputs.dir cloverInstrDir
doFirst {
ignoreExitValue true
}
- project.ext.gitHash = hashStdOut.toString().trim()
- project.ext.gitBranch = branchStdOut.toString().trim()
+ gitHash = hashStdOut.toString().trim()
+ gitBranch = branchStdOut.toString().trim()
outputs.upToDateWhen { false }
}
task createBuildProperties(type: WriteProperties) {
+ group = "build"
+ description = "Create the ${buildProperties} file"
dependsOn setGitVals
- inputs.dir("${jalviewDir}/${sourceDir}")
- inputs.dir("${jalviewDir}/${resourceDir}")
+ inputs.dir(sourceDir)
+ inputs.dir(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")
property "BUILD_DATE", getDate("HH:mm:ss dd MMMM yyyy")
property "VERSION", JALVIEW_VERSION
- property "INSTALLATION", INSTALLATION+" git-commit:"+project.ext.gitHash+" ["+project.ext.gitBranch+"]"
+ property "INSTALLATION", INSTALLATION+" git-commit:"+gitHash+" ["+gitBranch+"]"
outputs.file(outputFile)
}
-def buildingHTML = "${jalviewDir}/${docDir}/building.html"
+clean {
+ doFirst {
+ delete buildProperties
+ }
+}
+
+
task cleanBuildingHTML(type: Delete) {
doFirst {
delete buildingHTML
commandLine pandoc, '-s', '-o', buildingHTML, '--metadata', 'pagetitle="Building Jalview from Source"', '--toc', '-H', css, buildingMD
} else {
println("Cannot find pandoc. Skipping convert building.md to HTML")
- throw new StopExecutionException()
+ throw new StopExecutionException("Cannot find pandoc. Skipping convert building.md to HTML")
}
}
task syncDocs(type: Sync) {
dependsOn convertBuildingMD
- def syncDir = "${classes}/${docDir}"
+ def syncDir = "${classesDir}/${docDir}"
from fileTree("${jalviewDir}/${docDir}")
into syncDir
}
-def helpFile = "${classes}/${helpDir}/help.jhm"
task copyHelp(type: Copy) {
- def inputDir = "${jalviewDir}/${helpParentDir}/${helpDir}"
- def outputDir = "${classes}/${helpDir}"
+ def inputDir = helpSourceDir
+ def outputDir = "${classesDir}/${helpDir}"
from(inputDir) {
exclude '**/*.gif'
exclude '**/*.jpg'
exclude '**/*.png'
- filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['Version-Rel': JALVIEW_VERSION,'Year-Rel': getDate("yyyy")])
+ filter(ReplaceTokens,
+ beginToken: '$$',
+ endToken: '$$',
+ tokens: [
+ 'Version-Rel': JALVIEW_VERSION,
+ 'Year-Rel': getDate("yyyy")
+ ]
+ )
}
from(inputDir) {
include '**/*.gif'
task syncLib(type: Sync) {
- def syncDir = "${classes}/${libDistDir}"
+ def syncDir = "${classesDir}/${libDistDir}"
from fileTree("${jalviewDir}/${libDistDir}")
into syncDir
}
task syncResources(type: Sync) {
- from "${jalviewDir}/${resourceDir}"
+ dependsOn createBuildProperties
+ from resourceDir
include "**/*.*"
- into "${classes}"
+ into "${classesDir}"
preserve {
include "**"
}
dependsOn copyHelp
classpath = sourceSets.main.compileClasspath
main = "com.sun.java.help.search.Indexer"
- workingDir = "${classes}/${helpDir}"
+ workingDir = "${classesDir}/${helpDir}"
def argDir = "html"
args = [ argDir ]
inputs.dir("${workingDir}/${argDir}")
- outputs.dir("${classes}/doc")
- outputs.dir("${classes}/help")
+ outputs.dir("${classesDir}/doc")
+ outputs.dir("${classesDir}/help")
outputs.file("${workingDir}/JavaHelpSearch/DOCS")
outputs.file("${workingDir}/JavaHelpSearch/DOCS.TAB")
outputs.file("${workingDir}/JavaHelpSearch/OFFSETS")
classpath = files("${jalviewDir}/${utilsDir}")
main = "HelpLinksChecker"
workingDir = jalviewDir
- def help = "${classes}/${helpDir}"
- args = [ "${classes}/${helpDir}", "-nointernet" ]
+ def help = "${classesDir}/${helpDir}"
+ args = [ "${classesDir}/${helpDir}", "-nointernet" ]
def outFOS = new FileOutputStream(helpLinksCheckerOutFile, false) // false == don't append
def errFOS = outFOS
outFOS,
errorOutput)
- inputs.dir("${classes}/${helpDir}")
+ inputs.dir("${classesDir}/${helpDir}")
outputs.file(helpLinksCheckerOutFile)
}
// import the pubhtmlhelp target
ant.properties.basedir = "${jalviewDir}"
-ant.properties.helpBuildDir = "${jalviewDirAbsolutePath}/${classes}/${helpDir}"
+ant.properties.helpBuildDir = "${jalviewDirAbsolutePath}/${classes_dir}/${helpDir}"
ant.importBuild "${utilsDir}/publishHelp.xml"
}
}
+
jar {
dependsOn linkCheck
dependsOn buildIndices
exclude "**/*.jar"
exclude "**/*.jar.*"
- inputs.dir("${classes}")
+ inputs.dir(classesDir)
outputs.file("${jalviewDir}/${packageDir}/${archiveName}")
}
task copyJars(type: Copy) {
- from fileTree(dir: "${classes}", include: "**/*.jar").files
+ from fileTree(dir: classesDir, include: "**/*.jar").files
into "${jalviewDir}/${packageDir}"
}
def getdownWebsiteResourceFilenames = []
def getdownTextString = ""
- def getdownResourceDir = project.ext.getdownResourceDir
- def getdownAppDir = project.ext.getdownAppDir
+ def getdownResourceDir = getdownResourceDir
+ def getdownAppDir = getdownAppDir
def getdownResourceFilenames = []
doFirst {
// clean the getdown website and files dir before creating getdown folders
- delete project.ext.getdownWebsiteDir
- delete project.ext.getdownFilesDir
+ delete getdownWebsiteDir
+ delete getdownFilesDir
copy {
from buildProperties
rename(build_properties_file, getdown_build_properties)
- into project.ext.getdownAppDir
+ into getdownAppDir
}
getdownWebsiteResourceFilenames += "${getdown_app_dir}/${getdown_build_properties}"
getdownResourceFilenames.each{ filename ->
copy {
from filename
- into project.ext.getdownResourceDir
+ into getdownResourceDir
}
}
getdownTextString += line
copy {
from f.getPath()
- into project.ext.getdownAppDir
+ into getdownAppDir
}
}
getdownTextString += line
copy {
from f.getPath()
- into project.ext.getdownJ11libDir
+ into getdownJ11libDir
}
}
}
getdownTextString += "resource = ${getdown_launcher_new}\n"
getdownTextString += "class = ${mainClass}\n"
- def getdown_txt = file("${project.ext.getdownWebsiteDir}/getdown.txt")
+ def getdown_txt = file("${getdownWebsiteDir}/getdown.txt")
getdown_txt.write(getdownTextString)
- def launch_jvl = file("${project.ext.getdownWebsiteDir}/${getdown_launch_jvl}")
+ def launch_jvl = file("${getdownWebsiteDir}/${getdown_launch_jvl}")
launch_jvl.write("appbase="+props.get("getdown_txt_appbase"))
copy {
from getdownLauncher
rename(file(getdownLauncher).getName(), getdown_launcher_new)
- into project.ext.getdownWebsiteDir
+ into getdownWebsiteDir
}
copy {
if (file(getdownLauncher).getName() != getdown_launcher) {
rename(file(getdownLauncher).getName(), getdown_launcher)
}
- into project.ext.getdownWebsiteDir
+ into getdownWebsiteDir
}
if (! (CHANNEL.startsWith("ARCHIVE") || CHANNEL.startsWith("DEVELOP"))) {
copy {
from getdownResourceDir
- into "${project.ext.getdownFilesDir}/${getdown_resource_dir}"
+ into "${getdownFilesDir}/${getdown_resource_dir}"
}
}
if (buildDist) {
inputs.dir("${jalviewDir}/${packageDir}")
}
- outputs.dir(project.ext.getdownWebsiteDir)
- outputs.dir(project.ext.getdownFilesDir)
+ outputs.dir(getdownWebsiteDir)
+ outputs.dir(getdownFilesDir)
}
classpath = files("${getdownWebsiteDir}/${getdown_launcher}")
}
main = "com.threerings.getdown.tools.Digester"
- args project.ext.getdownWebsiteDir
- inputs.dir(project.ext.getdownWebsiteDir)
- outputs.file("${project.ext.getdownWebsiteDir}/digest2.txt")
+ args getdownWebsiteDir
+ inputs.dir(getdownWebsiteDir)
+ outputs.file("${getdownWebsiteDir}/digest2.txt")
}
clean {
doFirst {
- delete project.ext.getdownWebsiteDir
- delete project.ext.getdownFilesDir
+ delete getdownWebsiteDir
+ delete getdownFilesDir
}
}
}
-def install4jConf
-def macosJavaVMDir
-def macosJavaVMTgz
-def windowsJavaVMDir
-def windowsJavaVMTgz
-def install4jDir = "${jalviewDir}/${install4jResourceDir}"
-def install4jConfFile = "jalview-installers-java${JAVA_VERSION}.install4j"
-install4jConf = "${install4jDir}/${install4jConfFile}"
-
task copyInstall4jTemplate(type: Copy) {
- macosJavaVMDir = "${System.env.HOME}/buildtools/jre/openjdk-java_vm/getdown/macos-jre${JAVA_VERSION}/jre"
- macosJavaVMTgz = "${System.env.HOME}/buildtools/jre/openjdk-java_vm/install4j/tgz/macos-jre${JAVA_VERSION}.tar.gz"
- windowsJavaVMDir = "${System.env.HOME}/buildtools/jre/openjdk-java_vm/getdown/windows-jre${JAVA_VERSION}/jre"
- windowsJavaVMTgz = "${System.env.HOME}/buildtools/jre/openjdk-java_vm/install4j/tgz/windows-jre${JAVA_VERSION}.tar.gz"
from (install4jDir) {
include install4jTemplate
- rename (install4jTemplate, install4jConfFile)
- filter(ReplaceTokens, beginToken: '', endToken: '', tokens: ['9999999999': JAVA_VERSION])
- filter(ReplaceTokens, beginToken: '$$', endToken: '$$',
- tokens: [
- 'JAVA_VERSION': JAVA_VERSION,
- 'JAVA_INTEGER_VERSION': JAVA_INTEGER_VERSION,
- 'VERSION': JALVIEW_VERSION,
- 'MACOS_JAVA_VM_DIR': macosJavaVMDir,
- 'MACOS_JAVA_VM_TGZ': macosJavaVMTgz,
- 'WINDOWS_JAVA_VM_DIR': windowsJavaVMDir,
- 'WINDOWS_JAVA_VM_TGZ': windowsJavaVMTgz,
- 'INSTALL4JINFOPLISTFILEASSOCIATIONS': install4jInfoPlistFileAssociations,
- 'COPYRIGHT_MESSAGE': install4jCopyrightMessage,
- 'MACOS_BUNDLE_ID': install4jMacOSBundleId,
- 'GETDOWN_RESOURCE_DIR': getdown_resource_dir,
- 'GETDOWN_DIST_DIR': getdown_app_dir,
- 'GETDOWN_ALT_DIR': getdown_app_dir_alt,
- 'GETDOWN_INSTALL_DIR': getdown_install_dir
- ]
+ rename (install4jTemplate, install4jConfFileName)
+ filter(ReplaceTokens,
+ beginToken: '',
+ endToken: '',
+ tokens: [
+ '9999999999': JAVA_VERSION
+ ]
+ )
+ filter(ReplaceTokens,
+ beginToken: '$$',
+ endToken: '$$',
+ tokens: [
+ 'JAVA_VERSION': JAVA_VERSION,
+ 'JAVA_INTEGER_VERSION': JAVA_INTEGER_VERSION,
+ 'VERSION': JALVIEW_VERSION,
+ 'MACOS_JAVA_VM_DIR': macosJavaVMDir,
+ 'MACOS_JAVA_VM_TGZ': macosJavaVMTgz,
+ 'WINDOWS_JAVA_VM_DIR': windowsJavaVMDir,
+ 'WINDOWS_JAVA_VM_TGZ': windowsJavaVMTgz,
+ 'INSTALL4JINFOPLISTFILEASSOCIATIONS': install4jInfoPlistFileAssociations,
+ 'COPYRIGHT_MESSAGE': install4jCopyrightMessage,
+ 'MACOS_BUNDLE_ID': install4jMacOSBundleId,
+ 'GETDOWN_RESOURCE_DIR': getdown_resource_dir,
+ 'GETDOWN_DIST_DIR': getdown_app_dir,
+ 'GETDOWN_ALT_DIR': getdown_app_dir_alt,
+ 'GETDOWN_INSTALL_DIR': getdown_install_dir
+ ]
)
- if (OSX_KEYPASS=="") {
- filter(ReplaceTokens, beginToken: 'codeSigning macEnabled="', endToken: '"', tokens: ['true':'codeSigning macEnabled="false"'])
- filter(ReplaceTokens, beginToken: 'runPostProcessor="true" ',endToken: 'Processor', tokens: ['post':'runPostProcessor="false" postProcessor'])
+ if (OSX_KEYPASS == "") {
+ filter(ReplaceTokens,
+ beginToken: 'codeSigning macEnabled="',
+ endToken: '"',
+ tokens: [
+ 'true': 'codeSigning macEnabled="false"'
+ ]
+ )
+ filter(ReplaceTokens,
+ beginToken: 'runPostProcessor="true" ',
+ endToken: 'Processor',
+ tokens: [
+ 'post': 'runPostProcessor="false" postProcessor'
+ ]
+ )
}
}
into install4jDir
- outputs.files(install4jConf)
+ outputs.files(install4jConfFile)
doLast {
// include file associations in installer
flags: "s",
match: '<action name="EXTENSIONS_REPLACED_BY_GRADLE".*?</action>',
replace: installerFileAssociationsXml,
- file: install4jConf
+ file: install4jConfFile
)
/*
// include uninstaller applescript app files in dmg
flags: "s",
match: '<file name="UNINSTALL_OLD_JALVIEW_APP_REPLACED_IN_GRADLE" file=.*?>',
replace: installerDMGUninstallerXml,
- file: install4jConf
+ file: install4jConfFile
)
*/
}
}
+clean {
+ doFirst {
+ delete install4jConfFile
+ }
+}
+
+
task installers(type: com.install4j.gradle.Install4jTask) {
group = "distribution"
description = "Create the install4j installers"
dependsOn getdown
dependsOn copyInstall4jTemplate
- projectFile = file(install4jConf)
+ projectFile = file(install4jConfFile)
variables = [majorVersion: version.substring(2, 11), build: 001, OSX_KEYSTORE: OSX_KEYSTORE, JSIGN_SH: JSIGN_SH]
destination = "${jalviewDir}/${install4jBuildDir}/${JAVA_VERSION}"
buildSelected = true
println("Using projectFile "+projectFile)
}
- inputs.dir(project.ext.getdownWebsiteDir)
- inputs.file(install4jConf)
+ inputs.dir(getdownWebsiteDir)
+ inputs.file(install4jConfFile)
inputs.dir(macosJavaVMDir)
inputs.dir(windowsJavaVMDir)
outputs.dir("${jalviewDir}/${install4jBuildDir}/${JAVA_VERSION}")
}
-clean {
- doFirst {
- delete install4jConf
- }
-}
-
-
task sourceDist (type: Tar) {
def VERSION_UNDERSCORES = JALVIEW_VERSION.replaceAll("\\.", "_")
from(jalviewDir) {
exclude (EXCLUDE_FILES)
include (PROCESS_FILES)
- filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['Version-Rel': JALVIEW_VERSION,'Year-Rel': getDate("yyyy")])
+ filter(ReplaceTokens,
+ beginToken: '$$',
+ endToken: '$$',
+ tokens: [
+ 'Version-Rel': JALVIEW_VERSION,
+ 'Year-Rel': getDate("yyyy")
+ ]
+ )
}
from(jalviewDir) {
exclude (EXCLUDE_FILES)
exclude (PROCESS_FILES)
- exclude ("appletlib")
- exclude ("**/*locales")
- exclude ("*locales/**")
- exclude ("utils/InstallAnywhere")
+ exclude ("appletlib")
+ exclude ("**/*locales")
+ exclude ("*locales/**")
+ exclude ("utils/InstallAnywhere")
exclude (getdown_files_dir)
- exclude (getdown_website_dir)
+ exclude (getdown_website_dir)
- // exluding these as not using jars as modules yet
- exclude ("${j11modDir}/**/*.jar")
-}
-// from (jalviewDir) {
-// // explicit includes for stuff that seemed to not get included
-// include(fileTree("test/**/*."))
-// exclude(EXCLUDE_FILES)
-// exclude(PROCESS_FILES)
-// }
+ // exluding these as not using jars as modules yet
+ exclude ("${j11modDir}/**/*.jar")
+ }
+ // from (jalviewDir) {
+ // // explicit includes for stuff that seemed to not get included
+ // include(fileTree("test/**/*."))
+ // exclude(EXCLUDE_FILES)
+ // exclude(PROCESS_FILES)
+ // }
}
dependsOn copyHelp
dependsOn pubhtmlhelp
- inputs.dir("${classes}/${helpDir}")
- outputs.dir("${helpOutputDir}")
+ inputs.dir("${classesDir}/${helpDir}")
+ outputs.dir("${buildDir}/distributions/${helpDir}")
}
-def jalviewjsBuildDir
-def jalviewjsSiteDir
-def jalviewjsTransferSiteJsDir
-def jalviewjsTransferSiteLibDir
-def jalviewjsTransferSiteSwingJsDir
-def jalviewjsTransferSiteCoreDir
-task jalviewjsSitePath {
- def relativeBuildDir = file(jalviewDirAbsolutePath).toPath().relativize(buildDir.toPath())
- jalviewjsBuildDir = "${relativeBuildDir}/jalviewjs"
- jalviewjsSiteDir = "${jalviewjsBuildDir}/${jalviewjs_site_dir}"
- jalviewjsTransferSiteJsDir = "${jalviewjsBuildDir}/tmp/${jalviewjs_site_dir}_js"
- jalviewjsTransferSiteLibDir = "${jalviewjsBuildDir}/tmp/${jalviewjs_site_dir}_lib"
- jalviewjsTransferSiteSwingJsDir = "${jalviewjsBuildDir}/tmp/${jalviewjs_site_dir}_swingjs"
- jalviewjsTransferSiteCoreDir = "${jalviewjsBuildDir}/tmp/${jalviewjs_site_dir}_core"
+task j2sSetHeadlessBuild {
+ doFirst {
+ IN_ECLIPSE = false
+ }
}
-def eclipseWorkspace
task jalviewjsSetEclipseWorkspace {
def propKey = "jalviewjs_eclipse_workspace"
def propVal = null
def eclipseWsDir = propVal
def props = new Properties()
+ def writeProps = true
if (( eclipseWsDir == null || !file(eclipseWsDir).exists() ) && propsFile.exists()) {
def ins = new FileInputStream(propsFileName)
props.load(ins)
ins.close()
if (props.getProperty(propKey, null) != null) {
eclipseWsDir = props.getProperty(propKey)
+ writeProps = false
}
}
- def writeProps = false
if (eclipseWsDir == null || !file(eclipseWsDir).exists()) {
def tempDir = File.createTempDir()
eclipseWsDir = tempDir.getAbsolutePath()
eclipseWorkspace = file(eclipseWsDir)
doFirst {
+ // do not run a headless transpile when we claim to be in Eclipse
+ if (IN_ECLIPSE) {
+ println("Skipping task ${name} as IN_ECLIPSE=${IN_ECLIPSE}")
+ throw new StopExecutionException("Not running headless transpile whilst IN_ECLIPSE is '${IN_ECLIPSE}'")
+ } else {
+ println("Running task ${name} as IN_ECLIPSE=${IN_ECLIPSE}")
+ }
+
if (writeProps) {
props.setProperty(propKey, eclipseWsDir)
propsFile.parentFile.mkdirs()
props.store(bytes, null)
def propertiesString = bytes.toString()
propsFile.text = propertiesString
+ print("NEW ")
+ } else {
+ print("EXISTING ")
}
println("ECLIPSE WORKSPACE: "+eclipseWorkspace.getPath())
//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() }
+ outputs.upToDateWhen { eclipseWorkspace.exists() && propsFile.exists() }
}
-def eclipseBinary
-def eclipseVersion
-def eclipseDebug = false
-def eclipseVersionSuffix = ""
task jalviewjsEclipsePaths {
def eclipseProduct
eclipseDebug = (project.hasProperty(propKey) && project.getProperty(propKey).equals("true"))
doFirst {
+ // do not run a headless transpile when we claim to be in Eclipse
+ if (IN_ECLIPSE) {
+ println("Skipping task ${name} as IN_ECLIPSE=${IN_ECLIPSE}")
+ throw new StopExecutionException("Not running headless transpile whilst IN_ECLIPSE is '${IN_ECLIPSE}'")
+ } else {
+ println("Running task ${name} as IN_ECLIPSE=${IN_ECLIPSE}")
+ }
+
if (!assumedVersion) {
println("ECLIPSE VERSION=${eclipseVersion}")
}
task jalviewjsTransferUnzipSwingJs {
- dependsOn jalviewjsSitePath
-
def file_zip = "${jalviewDir}/${jalviewjs_swingjs_zip}"
doLast {
task jalviewjsTransferUnzipLib {
- dependsOn jalviewjsSitePath
-
def zipFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_libjs_dir}", include: "*.zip")
doLast {
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 }
+ jalviewjsJ2sProps = project.properties.findAll { it.key.startsWith("j2s.") }.sort { it.key }
def siteDirProperty = "j2s.site.directory"
def setSiteDir = false
- j2s_props.each { prop, val ->
+ jalviewjsJ2sProps.each { prop, val ->
if (val != null) {
if (prop == siteDirProperty) {
if (!(val.startsWith('/') || val.startsWith("file://") )) {
property(prop,val)
}
if (!setSiteDir) { // default site location, don't override specifically set property
- property(siteDirProperty,"${jalviewDir}/${jalviewjsTransferSiteJsDir}")
+ property(siteDirProperty,"${jalviewDirRelativePath}/${jalviewjsTransferSiteJsDir}")
}
}
- inputs.properties(j2s_props)
- outputs.file(outputFile)
+ outputFile = jalviewjsJ2sSettingsFileName
+
+ if (! IN_ECLIPSE) {
+ inputs.properties(jalviewjsJ2sProps)
+ outputs.file(jalviewjsJ2sSettingsFileName)
+ }
}
task jalviewjsSyncAllLibs (type: Sync) {
- dependsOn jalviewjsSitePath
dependsOn jalviewjsTransferUnzipAllLibs
def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteLibDir}")
inputFiles += fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}")
task jalviewjsSyncResources (type: Sync) {
- dependsOn jalviewjsSitePath
- def inputFiles = fileTree(dir: "${jalviewDir}/${resourceDir}")
+ def inputFiles = fileTree(dir: resourceDir)
def outputDir = "${jalviewDir}/${jalviewjsSiteDir}/${jalviewjs_j2s_subdir}"
from inputFiles
task jalviewjsSyncSiteResources (type: Sync) {
- dependsOn jalviewjsSitePath
def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_site_resource_dir}")
def outputDir = "${jalviewDir}/${jalviewjsSiteDir}"
task jalviewjsSyncBuildProperties (type: Sync) {
- dependsOn jalviewjsSitePath
dependsOn createBuildProperties
def inputFiles = [file(buildProperties)]
def outputDir = "${jalviewDir}/${jalviewjsSiteDir}/${jalviewjs_j2s_subdir}"
dependsOn jalviewjsEclipsePaths
dependsOn jalviewjsEclipseSetup
+ doFirst {
+ // do not run a headless import when we claim to be in Eclipse
+ if (IN_ECLIPSE) {
+ println("Skipping task ${name} as IN_ECLIPSE=${IN_ECLIPSE}")
+ throw new StopExecutionException("Not running headless import whilst IN_ECLIPSE is '${IN_ECLIPSE}'")
+ } else {
+ println("Running task ${name} as IN_ECLIPSE=${IN_ECLIPSE}")
+ }
+ }
+
//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 += "-debug"
}
args += [ "--launcher.appendVmargs", "-vmargs", "-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_eclipse_tmp_dropins_dir}" ]
+ if (!IN_ECLIPSE) {
+ args += [ "-D${j2sHeadlessBuildProperty}=true" ]
+ }
inputs.file("${jalviewDir}/.project")
outputs.upToDateWhen {
dependsOn jalviewjsProjectImport
dependsOn jalviewjsEclipsePaths
+ doFirst {
+ // do not run a headless transpile when we claim to be in Eclipse
+ if (IN_ECLIPSE) {
+ println("Skipping task ${name} as IN_ECLIPSE=${IN_ECLIPSE}")
+ throw new StopExecutionException("Not running headless transpile whilst IN_ECLIPSE is '${IN_ECLIPSE}'")
+ } else {
+ println("Running task ${name} as IN_ECLIPSE=${IN_ECLIPSE}")
+ }
+ }
+
executable(eclipseBinary)
args(["-nosplash", "--launcher.suppressErrors", "-application", "org.eclipse.jdt.apt.core.aptBuild", "-data", eclipseWorkspace, "-${jalviewjs_eclipse_build_arg}", eclipse_project_name ])
if (eclipseDebug) {
args += "-debug"
}
args += [ "--launcher.appendVmargs", "-vmargs", "-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_eclipse_tmp_dropins_dir}" ]
+ if (!IN_ECLIPSE) {
+ args += [ "-D${j2sHeadlessBuildProperty}=true" ]
+ }
def stdout
def stderr
----
"""
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
doLast {
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}'")
}
}
}
-task jalviewjsNoTranspileSyncCore (type: Sync) {
- dependsOn jalviewjsSitePath
- dependsOn "jalviewjsNoTranspileBuildAllCores"
+def jalviewjsCallCore(String name, 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 = "Creating core for ${name}...\nGenerating ${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_${1}")
+ 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 ]
+ maxHeapSize = "2g"
+
+ 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 listed in the classlists dir"
+ dependsOn jalviewjsTranspile
+ dependsOn jalviewjsTransferUnzipSwingJs
+
+ def j2sDir = "${jalviewDir}/${jalviewjsTransferSiteJsDir}/${jalviewjs_j2s_subdir}"
+ def swingJ2sDir = "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}/${jalviewjs_j2s_subdir}"
+ def libJ2sDir = "${jalviewDir}/${jalviewjsTransferSiteLibDir}/${jalviewjs_j2s_subdir}"
+ def jsDir = "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}/${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 classlistFiles = []
+ // add the classlists found int the jalviewjs_classlists_dir
+ fileTree(dir: "${jalviewDir}/${jalviewjs_classlists_dir}", include: "*.txt").each {
+ file ->
+ def name = file.getName() - ".txt"
+ classlistFiles += [
+ 'file': file,
+ 'name': name
+ ]
+ }
+
+ // _jmol and _jalview cores. Add any other peculiar classlist.txt files here
+ //classlistFiles += [ 'file': file("${jalviewDir}/${jalviewjs_classlist_jmol}"), 'name': "_jvjmol" ]
+ classlistFiles += [ 'file': file("${jalviewDir}/${jalviewjs_classlist_jalview}"), 'name': jalviewjsJalviewCoreName ]
+
+ jalviewjsCoreClasslists = []
+
+ classlistFiles.each {
+ hash ->
+
+ def file = hash['file']
+ if (! file.exists()) {
+ //println("...classlist file '"+file.getPath()+"' does not exist, skipping")
+ return false // this is a "continue" in groovy .each closure
+ }
+ def name = hash['name']
+ if (name == null) {
+ name = file.getName() - ".txt"
+ }
+
+ def filelist = []
+ file.eachLine {
+ line ->
+ filelist += line
+ }
+ def list = fileTree(dir: j2sDir, includes: filelist)
+
+ def jsfile = "${outputDir}/core${name}.js"
+ def zjsfile = "${outputDir}/core${name}.z.js"
+
+ jalviewjsCoreClasslists += [
+ 'jsfile': jsfile,
+ 'zjsfile': zjsfile,
+ 'list': list,
+ 'name': name
+ ]
+
+ inputs.file(file)
+ inputs.files(list)
+ outputs.file(jsfile)
+ outputs.file(zjsfile)
+ }
+
+ // _stevesoft core. add any cores without a classlist here (and the inputs and outputs)
+ def stevesoftClasslistName = "_stevesoft"
+ def stevesoftClasslist = [
+ 'jsfile': "${outputDir}/core${stevesoftClasslistName}.js",
+ 'zjsfile': "${outputDir}/core${stevesoftClasslistName}.z.js",
+ 'list': fileTree(dir: j2sDir, include: "com/stevesoft/pat/**/*.js"),
+ 'name': stevesoftClasslistName
+ ]
+ jalviewjsCoreClasslists += stevesoftClasslist
+ inputs.files(stevesoftClasslist['list'])
+ outputs.file(stevesoftClasslist['jsfile'])
+ outputs.file(stevesoftClasslist['zjsfile'])
+
+ // _all core
+ def allClasslistName = "_all"
+ def allJsFiles = fileTree(dir: j2sDir, include: "**/*.js")
+ allJsFiles += fileTree(
+ dir: libJ2sDir,
+ include: "**/*.js",
+ excludes: [
+ // these exlusions are files that the closure-compiler produces errors for. Should fix them
+ "**/org/jmol/jvxl/readers/IsoIntersectFileReader.js",
+ "**/org/jmol/export/JSExporter.js"
+ ]
+ )
+ allJsFiles += fileTree(
+ dir: swingJ2sDir,
+ include: "**/*.js",
+ excludes: [
+ // these exlusions are files that the closure-compiler produces errors for. Should fix them
+ "**/sun/misc/Unsafe.js",
+ "**/swingjs/jquery/jquery-editable-select.js",
+ "**/swingjs/jquery/j2sComboBox.js",
+ "**/sun/misc/FloatingDecimal.js"
+ ]
+ )
+ def allClasslist = [
+ 'jsfile': "${outputDir}/core${allClasslistName}.js",
+ 'zjsfile': "${outputDir}/core${allClasslistName}.z.js",
+ 'list': allJsFiles,
+ 'name': allClasslistName
+ ]
+ // not including this version of "all" core at the moment
+ //jalviewjsCoreClasslists += allClasslist
+ inputs.files(allClasslist['list'])
+ outputs.file(allClasslist['jsfile'])
+ outputs.file(allClasslist['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")
+
+ jalviewjsCoreClasslists.each {
+ jalviewjsCallCore(it.name, it.list, prefixFile, suffixFile, it.jsfile, it.zjsfile, logOutFile, jalviewjs_j2s_to_console.equals("true"))
+ }
+ }
+
+}
+
+
+def jalviewjsPublishCoreTemplate(String coreName, String templateName, File inputFile, String outputFile) {
+ copy {
+ from inputFile
+ into file(outputFile).getParentFile()
+ rename { filename ->
+ if (filename.equals(inputFile.getName())) {
+ return file(outputFile).getName()
+ }
+ return null
+ }
+ filter(ReplaceTokens,
+ beginToken: '_',
+ endToken: '_',
+ tokens: [
+ 'MAIN': '"'+mainClass+'"',
+ 'CODE': "null",
+ 'NAME': jalviewjsJalviewTemplateName+" [core ${coreName}]",
+ 'COREKEY': jalviewjs_core_key,
+ 'CORENAME': coreName
+ ]
+ )
+ }
+}
+
+
+task jalviewjsPublishCoreTemplates {
+ dependsOn jalviewjsBuildAllCores
+ def inputFileName = "${jalviewDir}/${j2s_coretemplate_html}"
+ def inputFile = file(inputFileName)
+ def outputDir = "${jalviewDir}/${jalviewjsTransferSiteCoreDir}"
+
+ def outputFiles = []
+ jalviewjsCoreClasslists.each { cl ->
+ def outputFile = "${outputDir}/${jalviewjsJalviewTemplateName}_${cl.name}.html"
+ cl['outputfile'] = outputFile
+ outputFiles += outputFile
+ }
+
+ doFirst {
+ jalviewjsCoreClasslists.each { cl ->
+ jalviewjsPublishCoreTemplate(cl.name, jalviewjsJalviewTemplateName, inputFile, cl.outputfile)
+ }
+ }
+ inputs.file(inputFile)
+ outputs.files(outputFiles)
+}
+
+
+task jalviewjsSyncCore (type: Sync) {
+ dependsOn jalviewjsBuildAllCores
+ dependsOn jalviewjsPublishCoreTemplates
def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteCoreDir}")
def outputDir = "${jalviewDir}/${jalviewjsSiteDir}"
}
-task jalviewjsSyncCore (type: Sync) {
- dependsOn jalviewjsTranspile
- dependsOn jalviewjsNoTranspileSyncCore
- dependsOn "jalviewjsBuildAllCores"
-}
-
-
// this Copy version of TransferSiteJs will delete anything else in the target dir
task jalviewjsCopyTransferSiteJs(type: Copy) {
dependsOn jalviewjsTranspile
// this Sync version of TransferSite is used by buildship to keep the website automatically up to date when a file changes
-task jalviewjsNoTranspileSyncTransferSiteJs(type: Sync) {
+task jalviewjsSyncTransferSiteJs(type: Sync) {
from "${jalviewDir}/${jalviewjsTransferSiteJsDir}"
include "**/*.*"
into "${jalviewDir}/${jalviewjsSiteDir}"
}
}
+
jalviewjsSyncAllLibs.mustRunAfter jalviewjsCopyTransferSiteJs
jalviewjsSyncResources.mustRunAfter jalviewjsCopyTransferSiteJs
jalviewjsSyncSiteResources.mustRunAfter jalviewjsCopyTransferSiteJs
jalviewjsSyncBuildProperties.mustRunAfter jalviewjsCopyTransferSiteJs
-jalviewjsSyncAllLibs.mustRunAfter jalviewjsNoTranspileSyncTransferSiteJs
-jalviewjsSyncResources.mustRunAfter jalviewjsNoTranspileSyncTransferSiteJs
-jalviewjsSyncSiteResources.mustRunAfter jalviewjsNoTranspileSyncTransferSiteJs
-jalviewjsSyncBuildProperties.mustRunAfter jalviewjsNoTranspileSyncTransferSiteJs
-
-
-task jalviewjsNoTranspilePrepareSite {
- dependsOn jalviewjsSyncAllLibs
- dependsOn jalviewjsSyncResources
- dependsOn jalviewjsSyncSiteResources
- dependsOn jalviewjsSyncBuildProperties
- dependsOn jalviewjsNoTranspileSyncCore
-}
+jalviewjsSyncAllLibs.mustRunAfter jalviewjsSyncTransferSiteJs
+jalviewjsSyncResources.mustRunAfter jalviewjsSyncTransferSiteJs
+jalviewjsSyncSiteResources.mustRunAfter jalviewjsSyncTransferSiteJs
+jalviewjsSyncBuildProperties.mustRunAfter jalviewjsSyncTransferSiteJs
task jalviewjsPrepareSite {
}
-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}"
}
}
group "JalviewJS"
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}/${filename}"
doLast {
def start = port
def running = false
def url
+ def jalviewjsServer
while(port < start+1000 && !running) {
try {
def doc_root = new File("${jalviewDirAbsolutePath}/${jalviewjsSiteDir}")
- def jalviewjsServer = factory.start(doc_root, port)
+ jalviewjsServer = factory.start(doc_root, port)
running = true
url = jalviewjsServer.getResourceUrl(jalviewjs_server_resource)
println("SERVER STARTED with document root ${doc_root}.")
println("Go to "+url+" . Run gradle --stop to stop (kills all gradle daemons).")
println("For debug: "+url+"?j2sdebug")
-
- file(htmlFile).text = """
- <p><a href="${url}">Jalview JS Test. <${url}></a></p>
- <p><a href="${url}?j2sdebug">Jalview JS Test with debug. <${url}?j2sdebug<</a></p>
- """
-
+ println("For verbose: "+url+"?j2sverbose")
} catch (Exception e) {
port++;
}
}
+ def htmlText = """
+ <p><a href="${url}">JalviewJS Test. <${url}></a></p>
+ <p><a href="${url}?j2sdebug">JalviewJS Test with debug. <${url}?j2sdebug></a></p>
+ <p><a href="${url}?j2sverbose">JalviewJS Test with verbose. <${url}?j2sdebug></a></p>
+ """
+ jalviewjsCoreClasslists.each { cl ->
+ def urlcore = jalviewjsServer.getResourceUrl(file(cl.outputfile).getName())
+ htmlText += """
+ <p><a href="${urlcore}">${jalviewjsJalviewTemplateName} [core ${cl.name}]. <${urlcore}></a></p>
+ """
+ println("For core ${cl.name}: "+urlcore)
+ }
+ file(htmlFile).text = htmlText
}
outputs.file(htmlFile)
}
-task jalviewjs {
- group "JalviewJS"
- description "Build the site"
- dependsOn jalviewjsBuildSite
-}
+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)"
+
+ doFirst {
+ def j2sPlugin = string("${jalviewDir}/${jalviewjs_j2s_plugin}")
+ 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 digest = MessageDigest.getInstance("MD5")
+ digest.update(j2sPluginFile.text.bytes)
+ def j2sPluginMd5 = new BigInteger(1, digest.digest()).toString(16).padLeft(32, '0')
-task jalviewjsIDE_CopyTransferSiteJs(type: Copy) {
- from "${jalviewDir}/${jalviewjsTransferSiteJsDir}"
- into "${jalviewDir}/${jalviewjsSiteDir}"
+ 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}'"
+ 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_SyncCore {
+ group "00 JalviewJS in Eclipse"
+ description "Build the core js lib closures listed in the classlists dir and publish core html from template"
+ dependsOn jalviewjsSyncCore
+}
+
+
+task jalviewjsIDE_SyncSiteAll {
+ dependsOn jalviewjsSyncAllLibs
+ dependsOn jalviewjsSyncResources
+ dependsOn jalviewjsSyncSiteResources
+ dependsOn jalviewjsSyncBuildProperties
+}
+
+
+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 the Eclipse transpiled site and unzips supporting zipfiles"
- dependsOn jalviewjsIDE_CopyTransferSiteJs
- dependsOn jalviewjsNoTranspilePrepareSite
+ description "Assembles unzipped supporting zipfiles, resources, site resources and closure cores into the Eclipse transpiled site"
+ dependsOn jalviewjsPrepareSite
}
}
-// buildship runs this at import
+// buildship runs this at import or gradle refresh
task eclipseSynchronizationTask {
- dependsOn eclipseSetup
- dependsOn jalviewjsIDE_j2sFile
+ //dependsOn eclipseSetup
+ dependsOn createBuildProperties
+ if (J2S_ENABLED) {
+ dependsOn jalviewjsIDE_j2sFile
+ dependsOn jalviewjsIDE_checkJ2sPlugin
+ dependsOn jalviewjsIDE_PrepareSite
+ }
}
-// buildship runs this at build time
+// buildship runs this at build time or project refresh
task eclipseAutoBuildTask {
- dependsOn jalviewjsNoTranspileSyncTransferSiteJs
- dependsOn jalviewjsNoTranspilePrepareSite
-}
-
-
-
-
-
-
-
-
-// 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")
+ //dependsOn jalviewjsIDE_checkJ2sPlugin
+ //dependsOn jalviewjsIDE_PrepareSite
}
-task jalviewjsNoTranspileBuildAllCores {
- dependsOn jalviewjsSitePath
- dependsOn jalviewjsTransferUnzipSwingJs
-
- def j2sDir = "${jalviewDir}/${jalviewjsTransferSiteJsDir}/${jalviewjs_j2s_subdir}"
- def jsDir = "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}/${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 classlistFiles = []
- // add the classlists found int the jalviewjs_classlists_dir
- fileTree(dir: "${jalviewDir}/${jalviewjs_classlists_dir}", include: "*.txt").each {
- file ->
- def name = file.getName() - ".txt"
- classlistFiles += [
- 'file': file,
- 'name': name
- ]
- }
-
- // _jmol and _jalview cores. Add any other peculiar classlist.txt files here
- classlistFiles += [ 'file': file("${jalviewDir}/${jalviewjs_classlist_jmol}"), 'name': "_jvjmol" ]
- classlistFiles += [ 'file': file("${jalviewDir}/${jalviewjs_classlist_jalview}"), 'name': "_jalview" ]
-
- def classlists = []
-
- classlistFiles.each {
- hash ->
-
- def file = hash['file']
- if (! file.exists()) {
- println("...classlist file '"+file.getPath()+"' does not exist, skipping")
- return false // this is a "continue" in groovy .each closure
- }
- def name = hash['name']
- if (name == null) {
- name = file.getName() - ".txt"
- }
-
- def filelist = []
- file.eachLine {
- line ->
- filelist += line
- }
- def list = fileTree(dir: j2sDir, includes: filelist)
-
- def jsfile = "${outputDir}/core${name}.js"
- def zjsfile = "${outputDir}/core${name}.z.js"
-
- classlists += [
- 'jsfile': jsfile,
- 'zjsfile': zjsfile,
- 'list': list
- ]
-
- inputs.file(file)
- inputs.files(list)
- outputs.file(jsfile)
- outputs.file(zjsfile)
- }
-
- // _stevesoft core. add any cores without a classlist here (and the inputs and outputs)
- def stevesoftClasslist = [
- 'jsfile': "${outputDir}/core_stevesoft.js",
- 'zjsfile': "${outputDir}/core_stevesoft.z.js",
- 'list': fileTree(dir: j2sDir, include: "com/stevesoft/pat/**/*.js")
- ]
- classlists += stevesoftClasslist
- inputs.files(stevesoftClasslist['list'])
- outputs.file(stevesoftClasslist['jsfile'])
- outputs.file(stevesoftClasslist['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")+" jalviewjsNoTranspileBuildAllCores\n----\n")
- classlists.each {
- jalviewjsCallCore(it.list, prefixFile, suffixFile, it.jsfile, it.zjsfile, logOutFile, jalviewjs_j2s_to_console.equals("true"))
- }
- }
-}
-jalviewjsNoTranspileBuildAllCores.mustRunAfter jalviewjsTranspile
-task jalviewjsBuildAllCores {
+task jalviewjs {
group "JalviewJS"
- description "Build the core js lib closures listed in the classlists dir"
- dependsOn jalviewjsTranspile
- dependsOn jalviewjsNoTranspileBuildAllCores
-}
-
-
-task jalviewjsIDE_BuildAllCores {
- group "00 JalviewJS in Eclipse"
- description "Build the core js lib closures listed in the classlists dir"
- dependsOn jalviewjsNoTranspileBuildAllCores
-}
-
-
-task jalviewjsPublishCoreTemplate {
- dependsOn jalviewjsBuildAllCores
+ description "Build the site"
+ dependsOn jalviewjsBuildSite
}
git://source.jalview.org / jalview.git / blobdiff