X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=96d6b8aeae64ff53d5622917e47a602edd6ea848;hb=16a7e3ba1a90e554d69249a45f469149b9c490c4;hp=8378a28aec70a90a7db9a82bad7942efb913bd58;hpb=1fa42eb71e69ca42f3b20eb26b17de99b015c55a;p=jalview.git diff --git a/build.gradle b/build.gradle index 8378a28..96d6b8a 100644 --- a/build.gradle +++ b/build.gradle @@ -19,6 +19,27 @@ 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) { + System.out.println("Exception reading local.properties") + } +} + repositories { jcenter() mavenCentral() @@ -33,15 +54,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 @@ -53,22 +74,6 @@ def compile_source_compatibility def compile_target_compatibility ext { - // local build environment properties - def localProps = "${jalviewDir}/local.properties" - if (file(localProps).exists()) { - def p = new Properties() - def localPropsFIS = new FileInputStream(localProps) - p.load(localPropsFIS) - localPropsFIS.close() - p.each { - key, val -> - def over = project.properties.get(key) != null - project.properties.put(key, val) - if (over) { - println("Overriding property '${key}' with local.properties value") - } - } - } getdownWebsiteDir = "${jalviewDir}/${getdown_website_dir}/${JAVA_VERSION}" getdownDir = "" reportRsyncCmd = false @@ -641,9 +646,9 @@ 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' @@ -736,21 +741,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 @@ -1264,11 +1275,7 @@ 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" } @@ -1278,13 +1285,17 @@ task jalviewjsSetEclipseWorkspace { def propVal = null if (project.hasProperty(propKey)) { propVal = project.getProperty(propKey) + if (propVal.startsWith("~/")) { + propVal = System.getProperty("user.home") + propVal.substring(1) + } } - def propsFileName = "${jalviewjsBuildDir}/${jalviewjs_eclipse_workspace_location_file}" + def propsFileName = "${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_eclipse_workspace_location_file}" + def propsFile = file(propsFileName) def eclipseWsDir = propVal def props = new Properties() - if (( eclipseWsDir == null || !file(eclipseWsDir).exists() ) && file(propsFileName).exists()) { - def ins = new FileInputStream("${jalviewDirAbsolutePath}/${propsFileName}") + if (( eclipseWsDir == null || !file(eclipseWsDir).exists() ) && propsFile.exists()) { + def ins = new FileInputStream(propsFileName) props.load(ins) ins.close() if (props.getProperty(propKey, null) != null) { @@ -1292,30 +1303,32 @@ 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) doFirst { + if (writeProps) { + props.setProperty(propKey, eclipseWsDir) + propsFile.parentFile.mkdirs() + def bytes = new ByteArrayOutputStream() + props.store(bytes, null) + def propertiesString = bytes.toString() + propsFile.text = propertiesString + } + println("ECLIPSE WORKSPACE: "+eclipseWorkspace.getPath()) } + inputs.property(propKey, eclipseWsDir) outputs.file(propsFileName) } -def eclipseDropinsDir -def utilsDropinsDir def eclipseBinary def eclipseVersion def eclipseDebug = false @@ -1324,26 +1337,23 @@ task jalviewjsEclipsePaths { def eclipseProduct def eclipseRoot = jalviewjs_eclipse_root - if (eclipseRoot.startsWith("~")) { + if (eclipseRoot.startsWith("~/")) { eclipseRoot = System.getProperty("user.home") + eclipseRoot.substring(1) } if (OperatingSystem.current().isMacOsX()) { eclipseRoot += "/Eclipse.app" - eclipseDropinsDir = "${eclipseRoot}/Contents/Eclipse/dropins" eclipseBinary = "${eclipseRoot}/Contents/MacOS/eclipse" eclipseProduct = "${eclipseRoot}/Contents/Eclipse/.eclipseproduct" } else if (OperatingSystem.current().isWindows()) { // check these paths!! if (file("${eclipseRoot}/eclipse").isDirectory() && file("${eclipseRoot}/eclipse/.eclipseproduct").exists()) { eclipseRoot += "/eclipse" } - eclipseDropinsDir = "${eclipseRoot}/dropins" eclipseBinary = "${eclipseRoot}/eclipse" eclipseProduct = "${eclipseRoot}/.eclipseproduct" } else { // linux or unix if (file("${eclipseRoot}/eclipse").isDirectory() && file("${eclipseRoot}/eclipse/.eclipseproduct").exists()) { eclipseRoot += "/eclipse" } - eclipseDropinsDir = "${eclipseRoot}/dropins" eclipseBinary = "${eclipseRoot}/eclipse" eclipseProduct = "${eclipseRoot}/.eclipseproduct" } @@ -1367,16 +1377,15 @@ task jalviewjsEclipsePaths { } else { eclipseVersionSuffix = "_4.13" } - utilsDropinsDir = "${jalviewDir}/${jalviewjs_eclipse_dropins_dir}${eclipseVersionSuffix}" */ - utilsDropinsDir = "${jalviewDir}/${jalviewjs_eclipse_dropins_dir}" + def propKey = "eclipse_debug" eclipseDebug = (project.hasProperty(propKey) && project.getProperty(propKey).equals("true")) doFirst { if (!assumedVersion) { - println("ECLIPSE_VERSION=${eclipseVersion}") + println("ECLIPSE VERSION=${eclipseVersion}") } } } @@ -1391,9 +1400,9 @@ task eclipseSetup { task OLDjalviewjsEclipseCopyDropins { dependsOn jalviewjsEclipsePaths dependsOn jalviewjsCleanEclipse - def inputFiles = fileTree(dir: utilsDropinsDir, include: "*.jar") + def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_eclipse_dropins_dir}", include: "*.jar") inputFiles += file(jalviewjs_j2s_plugin) - def outputDir = eclipseDropinsDir + def outputDir = "${buildDir}/jalviewjs inputs.files inputFiles inputFiles.each { file -> @@ -1415,15 +1424,12 @@ task OLDjalviewjsEclipseCopyDropins { task jalviewjsEclipseCopyDropins(type: Copy) { dependsOn jalviewjsEclipsePaths - from utilsDropinsDir - into eclipseDropinsDir + def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_eclipse_dropins_dir}", include: "*.jar") + inputFiles += file("${jalviewDir}/${jalviewjs_j2s_plugin}") + def outputDir = "${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_eclipse_tmp_dropins_dir}" - doLast { - copy { - from jalviewjs_j2s_plugin - into eclipseDropinsDir - } - } + from inputFiles + into outputDir } // this eclipse -clean doesn't actually work @@ -1444,10 +1450,6 @@ y """ def inputByteStream = new ByteArrayInputStream(inputString.getBytes()) standardInput = inputByteStream - - doFirst { - println("CLEAN ECLIPSE_DEBUG=${eclipseDebug}") - } } /* not really working yet jalviewjsEclipseCopyDropins.finalizedBy jalviewjsCleanEclipse @@ -1473,7 +1475,11 @@ task jalviewjsUnzipFiles { } task jalviewjsCreateJ2sSettings(type: WriteProperties) { + group "JalviewJS" + description "Create the .j2s file from the j2s.* properties" + dependsOn jalviewjsSitePath + outputFile ("${jalviewDir}/${jalviewjs_j2s_settings}") def j2s_props = project.properties.findAll { it.key.startsWith("j2s.") }.sort { it.key } def siteDirProperty = "j2s.site.directory" @@ -1482,14 +1488,14 @@ task jalviewjsCreateJ2sSettings(type: WriteProperties) { 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) { // default site location, don't override specifically set property - property(siteDirProperty,jalviewjsTransferSiteDir) + property(siteDirProperty,"${jalviewDir}/${jalviewjsTransferSiteDir}") } } inputs.properties(j2s_props) @@ -1551,14 +1557,9 @@ task jalviewjsProjectImport(type: Exec) { if (eclipseDebug) { args += "-debug" } - // can we use args += ["--launcher.appendVmargs", "-vmargs", "-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=utils/jalviewjs/eclipse/dropins"] here? (instead of copying plugins to eclipse dropins dir) - - doFirst { - println("IMPORT ECLIPSE_DEBUG=${eclipseDebug}") - } + args += [ "--launcher.appendVmargs", "-vmargs", "-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_eclipse_tmp_dropins_dir}" ] inputs.file("${jalviewDir}/.project") - outputs.dir(projdir) outputs.upToDateWhen { file(projdir).exists() } } @@ -1572,67 +1573,63 @@ task jalviewjsTranspile(type: Exec) { if (eclipseDebug) { args += "-debug" } - // can we use args += ["--launcher.appendVmargs", "-vmargs", "-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=swingjs"] here? (instead of copying plugins to eclipse dropins dir) + args += [ "--launcher.appendVmargs", "-vmargs", "-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_eclipse_tmp_dropins_dir}" ] def stdout def stderr - stdout = new ByteArrayOutputStream() - stderr = new ByteArrayOutputStream() + doFirst { + stdout = new ByteArrayOutputStream() + stderr = new ByteArrayOutputStream() - def logOutFileName = "${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_j2s_stdout}" - def logOutFile = file(logOutFileName) - logOutFile.createNewFile() - logOutFile.text = """ROOT: ${jalviewjs_eclipse_root} + def logOutFileName = "${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_j2s_stdout}" + def logOutFile = file(logOutFileName) + logOutFile.createNewFile() + logOutFile.text = """ROOT: ${jalviewjs_eclipse_root} BINARY: ${eclipseBinary} VERSION: ${eclipseVersion} WORKSPACE: ${eclipseWorkspace} DEBUG: ${eclipseDebug} ---- """ - def logOutFOS = new FileOutputStream(logOutFile, true) // true == append - //def logErrFileName = "${jalviewjsBuildDir}/${jalviewjs_j2s_stderr}" - //def logErrFile = file(logFileName) - //logErrFile.createNewFile() - //def logErrFOS = new FileErrputStream(logErrFile, false) - // combine stdout and stderr - def logErrFOS = logOutFOS - - if (jalviewjs_j2s_to_console.equals("true")) { - standardOutput = new org.apache.tools.ant.util.TeeOutputStream( - new org.apache.tools.ant.util.TeeOutputStream( - logOutFOS, - stdout), - standardOutput) + def logOutFOS = new FileOutputStream(logOutFile, true) // true == append + //def logErrFileName = "${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_j2s_stderr}" + //def logErrFile = file(logFileName) + //logErrFile.createNewFile() + //def logErrFOS = new FileErrputStream(logErrFile, false) + // combine stdout and stderr + def logErrFOS = logOutFOS + + if (jalviewjs_j2s_to_console.equals("true")) { + standardOutput = new org.apache.tools.ant.util.TeeOutputStream( + new org.apache.tools.ant.util.TeeOutputStream( + logOutFOS, + stdout), + standardOutput) errorOutput = new org.apache.tools.ant.util.TeeOutputStream( new org.apache.tools.ant.util.TeeOutputStream( logErrFOS, stderr), errorOutput) - } else { - standardOutput = new org.apache.tools.ant.util.TeeOutputStream( - logOutFOS, - stdout) + } else { + standardOutput = new org.apache.tools.ant.util.TeeOutputStream( + logOutFOS, + stdout) errorOutput = new org.apache.tools.ant.util.TeeOutputStream( logErrFOS, stderr) + } } doLast { if (stdout.toString().contains("Error processing ")) { // j2s did not complete transpile - throw new GradleException("Error during transpilation:\n${stderr}\nSee eclipse transpile log file '${jalviewjsBuildDir}/${jalviewjs_j2s_stdout}'") + throw new GradleException("Error during transpilation:\n${stderr}\nSee eclipse transpile log file '${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_j2s_stdout}'") } } - doFirst { - println("TRANSPILE ECLIPSE_DEBUG=${eclipseDebug}") - } - inputs.dir("${jalviewDir}/${sourceDir}") - outputs.dir("${jalviewDir}/${eclipse_bin_dir}/main") outputs.dir("${jalviewDir}/${jalviewjsTransferSiteDir}") - outputs.upToDateWhen { file("${jalviewDir}/${jalviewjsTransferSiteDir}${jalviewjs_server_resource}").exists() } - + outputs.upToDateWhen( { file("${jalviewDir}/${jalviewjsTransferSiteDir}${jalviewjs_server_resource}").exists() } ) } task jalviewjsCopyTransferSite(type: Copy) { @@ -1663,8 +1660,8 @@ task jalviewjsBuildSite { task cleanJalviewjsSite { doFirst { - delete jalviewjsTransferSiteDir - delete jalviewjsSiteDir + delete "${jalviewDir}/${jalviewjsTransferSiteDir}" + delete "${jalviewDir}/${jalviewjsSiteDir}" } } @@ -1681,17 +1678,18 @@ 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 { group "JalviewJS" - description "Starts a webserver on localhost to test the website" + def filename = "jalviewjsTest.html" + description "Starts a webserver on localhost to test the website. See ${filename} to access local site on most recently used port." dependsOn jalviewjsSitePath - def htmlFile = "${jalviewDirAbsolutePath}/jalviewjsTest.html" + def htmlFile = "${jalviewDirAbsolutePath}/${filename}" doLast { SimpleHttpFileServerFactory factory = new SimpleHttpFileServerFactory() @@ -1722,6 +1720,7 @@ task jalviewjsServer { } outputs.file(htmlFile) + outputs.upToDateWhen({false}) } task cleanJalviewjsAll { @@ -1731,13 +1730,15 @@ task cleanJalviewjsAll { dependsOn jalviewjsEclipsePaths doFirst { - delete jalviewjsBuildDir + delete "${jalviewDir}/${jalviewjsBuildDir}" delete "${jalviewDir}/${eclipse_bin_dir}" if (eclipseWorkspace != null && file(eclipseWorkspace.getAbsolutePath()+"/.metadata").exists()) { delete file(eclipseWorkspace.getAbsolutePath()+"/.metadata") } delete "${jalviewDir}/${jalviewjs_j2s_settings}" } + + outputs.upToDateWhen( { false } ) } task jalviewjs { @@ -1747,32 +1748,32 @@ task jalviewjs { } -task jalviewjsIDECopyTransferSite(type: Copy) { - from jalviewjsTransferSiteDir - into jalviewjsSiteDir +task jalviewjsIDE_CopyTransferSite(type: Copy) { + from "${jalviewDir}/${jalviewjsTransferSiteDir}" + into "${jalviewDir}/${jalviewjsSiteDir}" } -task jalviewjsIDEj2s { - group "JalviewJS in Eclipse" +task jalviewjsIDE_j2s { + group "00 JalviewJS in Eclipse" description "Creates the .j2s file" dependsOn jalviewjsCreateJ2sSettings } -task jalviewjsIDEBuildSite { - group "JalviewJS in Eclipse" - description "Copies the Eclipse transpiled site and unzips supporting zipfiles" - dependsOn jalviewjsIDECopyTransferSite +task jalviewjsIDE_AssembleSite { + group "00 JalviewJS in Eclipse" + description "Assembles the Eclipse transpiled site and unzips supporting zipfiles" + dependsOn jalviewjsIDE_CopyTransferSite dependsOn jalviewjsPrepareSite } -task jalviewjsIDESiteClean { - group "JalviewJS in Eclipse" +task jalviewjsIDE_SiteClean { + group "00 JalviewJS in Eclipse" description "Deletes the Eclipse transpiled site" dependsOn cleanJalviewjsSite } -task jalviewjsIDEServer { - group "JalviewJS in Eclipse" +task jalviewjsIDE_Server { + group "00 JalviewJS in Eclipse" description "Starts a webserver on localhost to test the website" dependsOn jalviewjsServer }