testDir = string("${jalviewDir}/${bareTestSourceDir}")
classesDir = string("${jalviewDir}/${classes_dir}")
+ destinationDirectory = file(classesDir)
// clover
useClover = clover.equals("true")
main {
java {
srcDirs sourceDir
- outputDir = file(classesDir)
+ destinationDirectory = file(classesDir)
}
resources {
srcDirs = [ resourcesBuildDir, docBuildDir, helpBuildDir ]
}
- compileClasspath = files(sourceSets.main.java.outputDir)
+ compileClasspath = files(sourceSets.main.java.destinationDirectory)
compileClasspath += fileTree(dir: "${jalviewDir}/${libDir}", include: ["*.jar"])
runtimeClasspath = compileClasspath
clover {
java {
srcDirs cloverInstrDir
- outputDir = cloverClassesDir
+ destinationDirectory = cloverClassesDir
}
resources {
srcDirs = sourceSets.main.resources.srcDirs
}
- compileClasspath = files( sourceSets.clover.java.outputDir )
+ compileClasspath = files( sourceSets.clover.java.destinationDirectory )
//compileClasspath += files( testClassesDir )
compileClasspath += fileTree(dir: "${jalviewDir}/${libDir}", include: ["*.jar"])
compileClasspath += fileTree(dir: "${jalviewDir}/${clover_lib_dir}", include: ["*.jar"])
test {
java {
srcDirs testSourceDir
- outputDir = file(testClassesDir)
+ destinationDirectory = file(testClassesDir)
}
resources {
srcDirs = useClover ? sourceSets.clover.resources.srcDirs : sourceSets.main.resources.srcDirs
}
- compileClasspath = files( sourceSets.test.java.outputDir )
+ compileClasspath = files( sourceSets.test.java.destinationDirectory )
compileClasspath += useClover ? sourceSets.clover.compileClasspath : sourceSets.main.compileClasspath
compileClasspath += fileTree(dir: "${jalviewDir}/${utils_dir}/testnglibs", include: ["**/*.jar"])
}
classpath {
- //defaultOutputDir = sourceSets.main.java.outputDir
+ //defaultOutputDir = sourceSets.main.java.destinationDirectory
configurations.each{ c->
if (c.isCanBeResolved()) {
minusConfigurations += [c]
HashMap<String, Boolean> alreadyAddedLibPath = new HashMap<>();
sourceSets.main.compileClasspath.findAll { it.name.endsWith(".jar") }.any {
- //don't want to add outputDir as eclipse is using its own output dir in bin/main
+ //don't want to add destinationDirectory as eclipse is using its own output dir in bin/main
if (it.isDirectory() || ! it.exists()) {
// don't add dirs to classpath, especially if they don't exist
return false // groovy "continue" in .any closure
}
sourceSets.test.compileClasspath.findAll { it.name.endsWith(".jar") }.any {
- //no longer want to add outputDir as eclipse is using its own output dir in bin/main
+ //no longer want to add destinationDirectory as eclipse is using its own output dir in bin/main
if (it.isDirectory() || ! it.exists()) {
// don't add dirs to classpath
return false // groovy "continue" in .any closure
clean {
doFirst {
- delete sourceSets.main.java.outputDir
+ delete sourceSets.main.java.destinationDirectory
}
}
cleanTest {
dependsOn cleanClover
doFirst {
- delete sourceSets.test.java.outputDir
+ delete sourceSets.test.java.destinationDirectory
}
}
task copyDocs(type: Copy) {
def inputDir = "${jalviewDir}/${doc_dir}"
- def outputDir = "${docBuildDir}/${doc_dir}"
+ def destinationDirectory = "${docBuildDir}/${doc_dir}"
from(inputDir) {
include('**/*.txt')
include('**/*.md')
exclude('**/*.html')
exclude('**/*.xml')
}
- into outputDir
+ into destinationDirectory
inputs.dir(inputDir)
- outputs.dir(outputDir)
+ outputs.dir(destinationDirectory)
}
}
if (inFrontMatter) {
def m = null
- if (m = line =~ /^date:\s*(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/) {
+ if (m == line =~ /^date:\s*(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/) {
map["date"] = new Date().parse("yyyy-MM-dd HH:mm:ss", m[0][1])
- } else if (m = line =~ /^date:\s*(\d{4}-\d{2}-\d{2})/) {
+ } else if (m == line =~ /^date:\s*(\d{4}-\d{2}-\d{2})/) {
map["date"] = new Date().parse("yyyy-MM-dd", m[0][1])
- } else if (m = line =~ /^channel:\s*(\S+)/) {
+ } else if (m == line =~ /^channel:\s*(\S+)/) {
map["channel"] = m[0][1]
- } else if (m = line =~ /^version:\s*(\S+)/) {
+ } else if (m == line =~ /^version:\s*(\S+)/) {
map["version"] = m[0][1]
- } else if (m = line =~ /^\s*([^:]+)\s*:\s*(\S.*)/) {
+ } else if (m == line =~ /^\s*([^:]+)\s*:\s*(\S.*)/) {
map[ m[0][1] ] = m[0][2]
}
if (dateOnly && map["date"] != null) {
def inSection = false
changes.eachLine { line ->
def m = null
- if (m = line =~ /^##([^#].*)$/) {
+ if (m == line =~ /^##([^#].*)$/) {
if (inSection) {
changesHugo += "</div>\n\n"
}
section = section.replaceAll(/[^a-z0-9_\-]/, "")
changesHugo += "<div class=\"${section}\">\n\n"
inSection = true
- } else if (m = line =~ /^(\s*-\s*)<!--([^>]+)-->(.*?)(<br\/?>)?\s*$/) {
+ } else if (m == line =~ /^(\s*-\s*)<!--([^>]+)-->(.*?)(<br\/?>)?\s*$/) {
def comment = m[0][2].trim()
if (comment != "") {
comment = comment.replaceAll('"', """)
def sectionName = null
content.eachLine { line ->
def m = null
- if (m = line =~ /^##([^#].*)$/) {
+ if (m == line =~ /^##([^#].*)$/) {
if (sectionName != null) {
sections[sectionName] = sectionContent
sectionName = null
task copyHelp(type: Copy) {
def inputDir = helpSourceDir
- def outputDir = "${helpBuildDir}/${help_dir}"
+ def destinationDirectory = "${helpBuildDir}/${help_dir}"
from(inputDir) {
include('**/*.txt')
include('**/*.md')
exclude('**/*.xml')
exclude('**/*.jhm')
}
- into outputDir
+ into destinationDirectory
inputs.dir(inputDir)
outputs.files(helpFile)
- outputs.dir(outputDir)
+ outputs.dir(destinationDirectory)
}
+/*
task releasesTemplates {
group "help"
description "Recreate whatsNew.html and releases.html from markdown files and templates in help"
def lm = null
def rContentProcessed = ""
rContent.eachLine { line ->
- if (lm = line =~ /^(\s*-)(\s*<!--[^>]*?-->)(.*)$/) {
+ if (lm == line =~ /^(\s*-)(\s*<!--[^>]*?-->)(.*)$/) {
line = "${lm[0][1]}${lm[0][3]}${lm[0][2]}"
- } else if (lm = line =~ /^###([^#]+.*)$/) {
+ } else if (lm == line =~ /^###([^#]+.*)$/) {
line = "_${lm[0][1].trim()}_"
}
rContentProcessed += line + "\n"
outputs.file(whatsnewHtmlFile)
}
+*/
task copyResources(type: Copy) {
group = "build"
description = "Copy (and make text substitutions in) the resources dir to the build area"
def inputDir = resourceDir
- def outputDir = resourcesBuildDir
+ def destinationDirectory = resourcesBuildDir
from(inputDir) {
include('**/*.txt')
include('**/*.md')
exclude('**/*.html')
exclude('**/*.xml')
}
- into outputDir
+ into destinationDirectory
inputs.dir(inputDir)
- outputs.dir(outputDir)
+ outputs.dir(destinationDirectory)
}
task copyChannelResources(type: Copy) {
description = "Copy the channel resources dir to the build resources area"
def inputDir = "${channelDir}/${resource_dir}"
- def outputDir = resourcesBuildDir
+ def destinationDirectory = resourcesBuildDir
from(inputDir) {
include(channel_props)
filter(ReplaceTokens,
from(inputDir) {
exclude(channel_props)
}
- into outputDir
+ into destinationDirectory
inputs.dir(inputDir)
- outputs.dir(outputDir)
+ outputs.dir(destinationDirectory)
}
task createBuildProperties(type: WriteProperties) {
dependsOn copyResources
+ dependsOn copyChannelResources
group = "build"
description = "Create the ${buildProperties} file"
task buildIndices(type: JavaExec) {
dependsOn copyHelp
+ //dependsOn releasesTemplates
classpath = sourceSets.main.compileClasspath
main = "com.sun.java.help.search.Indexer"
workingDir = "${helpBuildDir}/${help_dir}"
dependsOn buildResources
dependsOn copyDocs
dependsOn copyHelp
- dependsOn releasesTemplates
+ //dependsOn releasesTemplates
dependsOn convertMdFiles
dependsOn buildIndices
}
+// random block of dependencies
compileJava.dependsOn prepare
run.dependsOn compileJava
-compileTestJava.dependsOn compileJava
-
-
-
+//run.dependsOn prepare
+compileTestJava.dependsOn compileJava //
+compileTestJava.dependsOn buildIndices //
+processResources.dependsOn copyChannelResources //
+processResources.dependsOn copyResources //
+processResources.dependsOn createBuildProperties //
+processResources.dependsOn copyDocs //
+processResources.dependsOn convertMdFiles //
+processResources.dependsOn copyHelp //
+processResources.dependsOn buildIndices //
test {
group = "Verification"
description = "Runs all testTaskN tasks)"
/* END of test tasks results summary */
+/*
task compileLinkCheck(type: JavaCompile) {
options.fork = true
classpath = files("${jalviewDir}/${utils_dir}")
inputs.dir(helpBuildDir)
outputs.file(helpLinksCheckerOutFile)
}
+*/
// import the pubhtmlhelp target
}
}
+// block of dependencies
+//compileTestJava.dependsOn compileLinkCheck //
+//copyChannelResources.dependsOn compileLinkCheck //
+//convertMdFiles.dependsOn compileLinkCheck //
jar {
dependsOn prepare
- dependsOn linkCheck
+ dependsOn //linkCheck
manifest {
attributes "Main-Class": main_class,
"Implementation-Version": JALVIEW_VERSION
}
- def outputDir = "${jalviewDir}/${package_dir}"
- destinationDirectory = file(outputDir)
+ def destinationDirectory = "${jalviewDir}/${package_dir}"
+ destinationDirectory = file(destinationDirectory)
archiveFileName = rootProject.name+".jar"
duplicatesStrategy "EXCLUDE"
exclude "**/*.jar"
exclude "**/*.jar.*"
- inputs.dir(sourceSets.main.java.outputDir)
+ inputs.dir(sourceSets.main.java.destinationDirectory)
sourceSets.main.resources.srcDirs.each{ dir ->
inputs.dir(dir)
}
- outputs.file("${outputDir}/${archiveFileName}")
+ outputs.file("${destinationDirectory}/${archiveFileName}")
}
// this mainClassName is mandatory but gets ignored due to manifest created in doFirst{}. Set the Main-Class as an attribute in launcherJar instead
mainClassName = shadow_jar_main_class
mergeServiceFiles()
- classifier = "all-"+JALVIEW_VERSION+"-j"+JAVA_VERSION
+ archiveClassifier = "all-"+JALVIEW_VERSION+"-j"+JAVA_VERSION
minimize()
}
def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_eclipse_dropins_dir}", include: "*.jar")
inputFiles += file("${jalviewDir}/${jalviewjsJ2sPlugin}")
- def outputDir = "${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_eclipse_tmp_dropins_dir}"
+ def destinationDirectory = "${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_eclipse_tmp_dropins_dir}"
from inputFiles
- into outputDir
+ into destinationDirectory
}
dependsOn jalviewjsTransferUnzipAllLibs
def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteLibDir}")
inputFiles += fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}")
- def outputDir = "${jalviewDir}/${jalviewjsSiteDir}"
+ def destinationDirectory = "${jalviewDir}/${jalviewjsSiteDir}"
from inputFiles
- into outputDir
+ into destinationDirectory
def outputFiles = []
rename { filename ->
- outputFiles += "${outputDir}/${filename}"
+ outputFiles += "${destinationDirectory}/${filename}"
null
}
preserve {
dependsOn buildResources
def inputFiles = fileTree(dir: resourcesBuildDir)
- def outputDir = "${jalviewDir}/${jalviewjsSiteDir}/${jalviewjs_j2s_subdir}"
+ def destinationDirectory = "${jalviewDir}/${jalviewjsSiteDir}/${jalviewjs_j2s_subdir}"
from inputFiles
- into outputDir
+ into destinationDirectory
def outputFiles = []
rename { filename ->
- outputFiles += "${outputDir}/${filename}"
+ outputFiles += "${destinationDirectory}/${filename}"
null
}
preserve {
task jalviewjsSyncSiteResources (type: Sync) {
def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_site_resource_dir}")
- def outputDir = "${jalviewDir}/${jalviewjsSiteDir}"
+ def destinationDirectory = "${jalviewDir}/${jalviewjsSiteDir}"
from inputFiles
- into outputDir
+ into destinationDirectory
def outputFiles = []
rename { filename ->
- outputFiles += "${outputDir}/${filename}"
+ outputFiles += "${destinationDirectory}/${filename}"
null
}
preserve {
task jalviewjsSyncBuildProperties (type: Sync) {
dependsOn createBuildProperties
def inputFiles = [file(buildProperties)]
- def outputDir = "${jalviewDir}/${jalviewjsSiteDir}/${jalviewjs_j2s_subdir}"
+ def destinationDirectory = "${jalviewDir}/${jalviewjsSiteDir}/${jalviewjs_j2s_subdir}"
from inputFiles
- into outputDir
+ into destinationDirectory
def outputFiles = []
rename { filename ->
- outputFiles += "${outputDir}/${filename}"
+ outputFiles += "${destinationDirectory}/${filename}"
null
}
preserve {
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 destinationDirectory = "${jalviewDir}/${jalviewjsTransferSiteCoreDir}/${jalviewjs_j2s_subdir}/core"
def prefixFile = "${jsDir}/core/coretop2.js"
def suffixFile = "${jsDir}/core/corebottom2.js"
}
def list = fileTree(dir: j2sDir, includes: filelist)
- def jsfile = "${outputDir}/core${name}.js"
- def zjsfile = "${outputDir}/core${name}.z.js"
+ def jsfile = "${destinationDirectory}/core${name}.js"
+ def zjsfile = "${destinationDirectory}/core${name}.z.js"
jalviewjsCoreClasslists += [
'jsfile': jsfile,
// _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",
+ 'jsfile': "${destinationDirectory}/core${stevesoftClasslistName}.js",
+ 'zjsfile': "${destinationDirectory}/core${stevesoftClasslistName}.z.js",
'list': fileTree(dir: j2sDir, include: "com/stevesoft/pat/**/*.js"),
'name': stevesoftClasslistName
]
]
)
def allClasslist = [
- 'jsfile': "${outputDir}/core${allClasslistName}.js",
- 'zjsfile': "${outputDir}/core${allClasslistName}.z.js",
+ 'jsfile': "${destinationDirectory}/core${allClasslistName}.js",
+ 'zjsfile': "${destinationDirectory}/core${allClasslistName}.z.js",
'list': allJsFiles,
'name': allClasslistName
]
dependsOn jalviewjsBuildAllCores
def inputFileName = "${jalviewDir}/${j2s_coretemplate_html}"
def inputFile = file(inputFileName)
- def outputDir = "${jalviewDir}/${jalviewjsTransferSiteCoreDir}"
+ def destinationDirectory = "${jalviewDir}/${jalviewjsTransferSiteCoreDir}"
def outputFiles = []
jalviewjsCoreClasslists.each { cl ->
- def outputFile = "${outputDir}/${jalviewjsJalviewTemplateName}_${cl.name}.html"
+ def outputFile = "${destinationDirectory}/${jalviewjsJalviewTemplateName}_${cl.name}.html"
cl['outputfile'] = outputFile
outputFiles += outputFile
}
dependsOn jalviewjsBuildAllCores
dependsOn jalviewjsPublishCoreTemplates
def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteCoreDir}")
- def outputDir = "${jalviewDir}/${jalviewjsSiteDir}"
+ def destinationDirectory = "${jalviewDir}/${jalviewjsSiteDir}"
from inputFiles
- into outputDir
+ into destinationDirectory
def outputFiles = []
rename { filename ->
- outputFiles += "${outputDir}/${filename}"
+ outputFiles += "${destinationDirectory}/${filename}"
null
}
preserve {
git://source.jalview.org / jalview.git / blobdiff