X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=51f95ac4b269732094707102589ff1d850301384;hb=0c67684aaee6951336e64a6afb564aed03790fda;hp=48033f141d04646abcedb029df0dc32669fcfe4a;hpb=3f8dcb45270ca39e8fcb29db9a42c1a82a7ca8cf;p=jalview.git diff --git a/build.gradle b/build.gradle index 48033f1..51f95ac 100644 --- a/build.gradle +++ b/build.gradle @@ -19,6 +19,26 @@ plugins { 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) { + } +} + repositories { jcenter() mavenCentral() @@ -33,15 +53,15 @@ dependencies { } 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 @@ -153,7 +173,6 @@ ext { } - println("Using a ${CHANNEL} profile. appbase=${getdown_app_base}") getdownAppDir = "${getdownWebsiteDir}/${getdown_app_dir}" //getdownJ11libDir = "${getdownWebsiteDir}/${getdown_j11lib_dir}" getdownResourceDir = "${getdownWebsiteDir}/${getdown_resource_dir}" @@ -167,6 +186,7 @@ ext { gitHash = "" gitBranch = "" + println("Using a ${CHANNEL} profile.") } def JAVA_INTEGER_VERSION @@ -625,14 +645,14 @@ task copyHelp(type: Copy) { 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' - include '**/*.jpg' - include '**/*.png' + include '**/*.jpg' + include '**/*.png' } into outputDir @@ -650,7 +670,6 @@ task syncLib(type: Sync) { task syncResources(type: Sync) { from "${jalviewDir}/${resourceDir}" include "**/*.*" - exclude "install4j" into "${classes}" preserve { include "**" @@ -687,7 +706,7 @@ test { sourceCompatibility = compile_source_compatibility targetCompatibility = compile_target_compatibility jvmArgs += additional_compiler_args - print ("Setting target compatibility to "+targetCompatibility+"\n") + } task buildIndices(type: JavaExec) { @@ -721,21 +740,27 @@ task compileLinkCheck(type: JavaCompile) { 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 @@ -851,13 +876,13 @@ task getdownWebsite() { // go through properties looking for getdown_txt_... def props = project.properties.sort { it.key } - if (getdown_alt_java_min_version.length() > 0) { - props.put("getdown_txt_java_min_version", getdown_alt_java_min_version) - } - if (getdown_alt_java_max_version.length() > 0) { - props.put("getdown_txt_java_max_version", getdown_alt_java_max_version) - } - props.put("getdown_txt_multi_java_location", getdown_alt_multi_java_location) + if (getdown_alt_java_min_version.length() > 0) { + props.put("getdown_txt_java_min_version", getdown_alt_java_min_version) + } + if (getdown_alt_java_max_version.length() > 0) { + props.put("getdown_txt_java_max_version", getdown_alt_java_max_version) + } + props.put("getdown_txt_multi_java_location", getdown_alt_multi_java_location) props.put("getdown_txt_appbase", getdown_app_base) props.each{ prop, val -> @@ -992,7 +1017,7 @@ task getdownWebsite() { } copy { - from getdownResourceDir + from getdownResourceDir into "${project.ext.getdownFilesDir}/${getdown_resource_dir}" } } @@ -1140,14 +1165,16 @@ task installers(type: com.install4j.gradle.Install4jTask) { dependsOn getdown dependsOn copyInstall4jTemplate projectFile = file(install4jConf) - println("Using projectFile "+projectFile) variables = [majorVersion: version.substring(2, 11), build: 001, OSX_KEYSTORE: OSX_KEYSTORE, JSIGN_SH: JSIGN_SH] destination = "${jalviewDir}/${install4jBuildDir}/${JAVA_VERSION}" buildSelected = true if (OSX_KEYPASS) { macKeystorePassword=OSX_KEYPASS + } + doFirst { + println("Using projectFile "+projectFile) } inputs.dir(project.ext.getdownWebsiteDir) @@ -1155,7 +1182,6 @@ task installers(type: com.install4j.gradle.Install4jTask) { inputs.dir(macosJavaVMDir) inputs.dir(windowsJavaVMDir) outputs.dir("${jalviewDir}/${install4jBuildDir}/${JAVA_VERSION}") - } clean { @@ -1248,27 +1274,27 @@ def jalviewjsTransferSiteDir 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}" - } + jalviewjsSiteDir = "${jalviewjsBuildDir}/${jalviewjs_site_dir}" jalviewjsTransferSiteDir = "${jalviewjsBuildDir}/tmp/site" } def eclipseWorkspace task jalviewjsSetEclipseWorkspace { def propKey = "jalviewjs_eclipse_workspace" - def propsFileName = "${jalviewjsBuildDir}/${jalviewjs_eclipse_workspace_location_file}" - def props = new Properties() - def eclipseWsDir def propVal = null if (project.hasProperty(propKey)) { propVal = project.getProperty(propKey) - eclipseWsDir = propVal + if (propVal.startsWith("~/")) { + propVal = System.getProperty("user.home") + propVal.substring(1) + } } - if (( eclipseWsDir == null || !file(eclipseWsDir).exists() ) && file(propsFileName).exists()) { - def ins = new FileInputStream("${jalviewDirAbsolutePath}/${propsFileName}") + 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() ) && propsFile.exists()) { + def ins = new FileInputStream(propsFileName) props.load(ins) ins.close() if (props.getProperty(propKey, null) != null) { @@ -1276,101 +1302,106 @@ task jalviewjsSetEclipseWorkspace { } } + 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) - - println("ECLIPSE WORKSPACE: "+eclipseWorkspace.getPath()) - - inputs.property(propKey, propVal) - outputs.file(propsFileName) -} - -task jalviewjsUnzipFiles { - dependsOn jalviewjsSitePath - - def zipFiles = fileTree(dir: "${jalviewjs_utils_dir}/${jalviewjs_libjs_dir}", include: "*.zip") - zipFiles += "${jalviewjs_utils_dir}/${jalviewjs_swingjs_zip}" - - doLast { - zipFiles.each { file_zip -> - copy { - from zipTree(file_zip) - into jalviewjsSiteDir - } + 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.files zipFiles - outputs.dir jalviewjsSiteDir + inputs.property(propKey, eclipseWsDir) + outputs.file(propsFileName) } -def eclipseDropinsDir + def eclipseBinary def eclipseVersion -def fromDropinsDir +def eclipseDebug = false +def eclipseVersionSuffix = "" task jalviewjsEclipsePaths { - def eclipseRoot def eclipseProduct - eclipseRoot = jalviewjs_eclipse_root - if (eclipseRoot.startsWith("~")) { + + def eclipseRoot = jalviewjs_eclipse_root + 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" } eclipseVersion = "4.12" // default + def assumedVersion = true if (file(eclipseProduct).exists()) { def fis = new FileInputStream(eclipseProduct) def props = new Properties() props.load(fis) eclipseVersion = props.getProperty("version") fis.close() - println("ECLIPSE_VERSION=${eclipseVersion}") + assumedVersion = false } + /* String[] v = eclipseVersion.split("\\.") def v0 = Integer.valueOf(v[0]) def v1 = Integer.valueOf(v[1]) if (v0 < 4 || ( v0 == 4 && v1 < 13 )) { - fromDropinsDir = "eclipse/dropins_4.12" + eclipseVersionSuffix = "_4.12" } else { - fromDropinsDir = "eclipse/dropins_4.13" - } + eclipseVersionSuffix = "_4.13" + } + */ + + + def propKey = "eclipse_debug" + eclipseDebug = (project.hasProperty(propKey) && project.getProperty(propKey).equals("true")) + + doFirst { + if (!assumedVersion) { + println("ECLIPSE VERSION=${eclipseVersion}") + } + } } -task jalviewjsEclipseCopyDropins { +task eclipseSetup { + dependsOn eclipseProject + dependsOn eclipseClasspath + dependsOn eclipseJdt +} + +/* using the Copy task below +task OLDjalviewjsEclipseCopyDropins { dependsOn jalviewjsEclipsePaths - def inputFiles = fileTree(dir: "${jalviewjs_utils_dir}/${fromDropinsDir}", include: "*.jar") - def outputDir = eclipseDropinsDir + dependsOn jalviewjsCleanEclipse + def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_eclipse_dropins_dir}", include: "*.jar") + inputFiles += file(jalviewjs_j2s_plugin) + def outputDir = "${buildDir}/jalviewjs inputs.files inputFiles inputFiles.each { file -> @@ -1386,35 +1417,87 @@ task jalviewjsEclipseCopyDropins { } } } +*/ // this version (type: Copy) will delete anything in the eclipse dropins folder that isn't in fromDropinsDir -task NEWjalviewjsEclipseCopyDropins(type: Copy) { +task jalviewjsEclipseCopyDropins(type: Copy) { dependsOn jalviewjsEclipsePaths - from fromDropinsDir - 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}" + + from inputFiles + into outputDir +} + +// this eclipse -clean doesn't actually work +task jalviewjsCleanEclipse(type: Exec) { + dependsOn eclipseSetup + dependsOn jalviewjsEclipsePaths + dependsOn jalviewjsEclipseCopyDropins + + executable(eclipseBinary) + args(["-nosplash", "--launcher.suppressErrors", "-data", eclipseWorkspace.getPath(), "-clean", "-console", "-consoleLog"]) + if (eclipseDebug) { + args += "-debug" + } + args += "-l" + + def inputString = """exit +y +""" + def inputByteStream = new ByteArrayInputStream(inputString.getBytes()) + standardInput = inputByteStream +} +/* not really working yet +jalviewjsEclipseCopyDropins.finalizedBy jalviewjsCleanEclipse +*/ + +task jalviewjsUnzipFiles { + dependsOn jalviewjsSitePath + + def zipFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_libjs_dir}", include: "*.zip") + zipFiles += "${jalviewDir}/${jalviewjs_swingjs_zip}" + + doLast { + zipFiles.each { file_zip -> + copy { + from zipTree(file_zip) + into "${jalviewDir}/${jalviewjsSiteDir}" + } + } + } + + inputs.files zipFiles + outputs.dir "${jalviewDir}/${jalviewjsSiteDir}" } task jalviewjsCreateJ2sSettings(type: WriteProperties) { + group "JalviewJS" + description "Create the .j2s file from the j2s.* properties" + dependsOn jalviewjsSitePath + outputFile ("${jalviewDir}/${jalviewjs_j2s_settings}") - def props = project.properties.sort { it.key } + def j2s_props = project.properties.findAll { it.key.startsWith("j2s.") }.sort { it.key } def siteDirProperty = "j2s.site.directory" def setSiteDir = false - props.each { prop, val -> - if (prop.startsWith("j2s.") && val != null) { + j2s_props.each { prop, val -> + if (val != null) { if (prop == siteDirProperty) { if (!(val.startsWith('/') || val.startsWith("file://") )) { - val = "${jalviewjsTransferSiteDir}/${val}" + val = "${jalviewDir}/${jalviewjsTransferSiteDir}/${val}" } setSiteDir = true } property(prop,val) } - if (!setSiteDir) { - property(siteDirProperty,jalviewjsTransferSiteDir) + if (!setSiteDir) { // default site location, don't override specifically set property + property(siteDirProperty,"${jalviewDir}/${jalviewjsTransferSiteDir}") } } - inputs.properties(props.findAll( { k, v -> k.startsWith("j2s.") } )) + inputs.properties(j2s_props) outputs.file(outputFile) } @@ -1424,10 +1507,10 @@ task jalviewjsEclipseSetup { dependsOn jalviewjsCreateJ2sSettings } -task jalviewjsCopyResources (type: Copy) { +task jalviewjsCopyResources (type: Sync) { dependsOn jalviewjsSitePath - def inputFiles = fileTree(dir: jalviewjs_resource_dir) - def outputDir = "${jalviewjsSiteDir}/${jalviewjs_j2s_subdir}" + def inputFiles = fileTree(dir: "${jalviewDir}/${resourceDir}") + def outputDir = "${jalviewDir}/${jalviewjsSiteDir}/${jalviewjs_j2s_subdir}" from inputFiles into outputDir @@ -1436,14 +1519,17 @@ task jalviewjsCopyResources (type: Copy) { outputFiles += "${outputDir}/${filename}" null } + preserve { + include "**" + } outputs.files outputFiles inputs.files inputFiles } -task jalviewjsCopySiteResources (type: Copy) { +task jalviewjsCopySiteResources (type: Sync) { dependsOn jalviewjsSitePath - def inputFiles = fileTree(dir: "${jalviewjs_utils_dir}/${jalviewjs_site_resource_dir}") - def outputDir = jalviewjsSiteDir + def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_site_resource_dir}") + def outputDir = "${jalviewDir}/${jalviewjsSiteDir}" from inputFiles into outputDir @@ -1452,26 +1538,27 @@ task jalviewjsCopySiteResources (type: Copy) { outputFiles += "${outputDir}/${filename}" null } + preserve { + include "**" + } outputs.files outputFiles inputs.files inputFiles } task jalviewjsProjectImport(type: Exec) { - // work out how to do this! - dependsOn eclipseProject - dependsOn eclipseClasspath - dependsOn eclipseJdt + dependsOn eclipseSetup dependsOn jalviewjsEclipsePaths dependsOn jalviewjsEclipseSetup + + def projdir = eclipseWorkspace.getPath()+"/.metadata/.plugins/org.eclipse.core.resources/.projects/jalview/org.eclipse.jdt.core" executable(eclipseBinary) args(["-nosplash", "--launcher.suppressErrors", "-application", "com.seeq.eclipse.importprojects.headlessimport", "-data", eclipseWorkspace.getPath(), "-import", jalviewDirAbsolutePath]) - if (eclipse_debug == "true") { + if (eclipseDebug) { args += "-debug" } + args += [ "--launcher.appendVmargs", "-vmargs", "-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_eclipse_tmp_dropins_dir}" ] - def projdir = eclipseWorkspace.getPath()+"/.metadata/.plugins/org.eclipse.core.resources/.projects/jalview/org.eclipse.jdt.core" inputs.file("${jalviewDir}/.project") - outputs.dir(projdir) outputs.upToDateWhen { file(projdir).exists() } } @@ -1479,11 +1566,13 @@ task jalviewjsTranspile(type: Exec) { dependsOn jalviewjsEclipseSetup dependsOn jalviewjsProjectImport dependsOn jalviewjsEclipsePaths + executable(eclipseBinary) - args(["-nosplash", "--launcher.suppressErrors", "-application", "org.eclipse.jdt.apt.core.aptBuild", "-data", eclipseWorkspace, "-${jalviewjs_eclipseBuildArg}", eclipse_project_name ]) - if (eclipse_debug == "true") { + 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}" ] def stdout def stderr @@ -1494,13 +1583,21 @@ task jalviewjsTranspile(type: Exec) { def logOutFileName = "${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_j2s_stdout}" def logOutFile = file(logOutFileName) logOutFile.createNewFile() - def logOutFOS = new FileOutputStream(logOutFile, false) - //def logErrFileName = "${jalviewjsBuildDir}/${jalviewjs_j2s_stderr}" + logOutFile.text = """ROOT: ${jalviewjs_eclipse_root} +BINARY: ${eclipseBinary} +VERSION: ${eclipseVersion} +WORKSPACE: ${eclipseWorkspace} +DEBUG: ${eclipseDebug} +---- +""" + 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( @@ -1521,24 +1618,23 @@ task jalviewjsTranspile(type: Exec) { 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_stdout}'") } } - 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}/${jalviewjsTransferSiteDir}") + outputs.upToDateWhen( { file("${jalviewDir}/${jalviewjsTransferSiteDir}${jalviewjs_server_resource}").exists() } ) } task jalviewjsCopyTransferSite(type: Copy) { dependsOn jalviewjsTranspile - from jalviewjsTransferSiteDir - into jalviewjsSiteDir + from "${jalviewDir}/${jalviewjsTransferSiteDir}" + into "${jalviewDir}/${jalviewjsSiteDir}" } jalviewjsUnzipFiles.mustRunAfter jalviewjsCopyTransferSite @@ -1563,8 +1659,8 @@ task jalviewjsBuildSite { task cleanJalviewjsSite { doFirst { - delete jalviewjsTransferSiteDir - delete jalviewjsSiteDir + delete "${jalviewDir}/${jalviewjsTransferSiteDir}" + delete "${jalviewDir}/${jalviewjsSiteDir}" } } @@ -1581,10 +1677,10 @@ task jalviewjsSiteTar(type: Tar) { 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 { @@ -1622,19 +1718,25 @@ task jalviewjsServer { } outputs.file(htmlFile) + outputs.upToDateWhen({false}) } task cleanJalviewjsAll { group "JalviewJS" description "Delete all configuration and build artifacts to do with JalviewJS build" dependsOn cleanJalviewjsSite + dependsOn jalviewjsEclipsePaths doFirst { - delete jalviewjsBuildDir + delete "${jalviewDir}/${jalviewjsBuildDir}" delete "${jalviewDir}/${eclipse_bin_dir}" - delete file(eclipseWorkspace.getAbsolutePath()+"/.metadata") + if (eclipseWorkspace != null && file(eclipseWorkspace.getAbsolutePath()+"/.metadata").exists()) { + delete file(eclipseWorkspace.getAbsolutePath()+"/.metadata") + } delete "${jalviewDir}/${jalviewjs_j2s_settings}" } + + outputs.upToDateWhen( { false } ) } task jalviewjs { @@ -1645,8 +1747,8 @@ task jalviewjs { task jalviewjsIDECopyTransferSite(type: Copy) { - from jalviewjsTransferSiteDir - into jalviewjsSiteDir + from "${jalviewDir}/${jalviewjsTransferSiteDir}" + into "${jalviewDir}/${jalviewjsSiteDir}" } task jalviewjsIDEj2s {