X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=c5c16c3933180ee895810fe0c03a9d6b637e7d2f;hb=refs%2Fheads%2Fbug%2FJAL-3473_SpinnerNumberModel_causing_IllegalArgumentException;hp=d259e13ad723aae87e1f9ec1362fdd6b236db286;hpb=2bac51d2121543d6784db7c4c5f9cea595c02778;p=jalview.git diff --git a/build.gradle b/build.gradle index d259e13..c5c16c3 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 @@ -166,7 +187,7 @@ ext { gitHash = "" gitBranch = "" - println("Using a ${CHANNEL} profile. appbase=${getdown_app_base}") + println("Using a ${CHANNEL} profile.") } def JAVA_INTEGER_VERSION @@ -625,14 +646,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 +671,6 @@ task syncLib(type: Sync) { task syncResources(type: Sync) { from "${jalviewDir}/${resourceDir}" include "**/*.*" - exclude "install4j" into "${classes}" preserve { include "**" @@ -721,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 @@ -1249,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" } @@ -1263,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) { @@ -1277,59 +1303,57 @@ 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 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" } @@ -1344,6 +1368,7 @@ task jalviewjsEclipsePaths { fis.close() assumedVersion = false } + /* String[] v = eclipseVersion.split("\\.") def v0 = Integer.valueOf(v[0]) def v1 = Integer.valueOf(v[1]) @@ -1352,22 +1377,32 @@ task jalviewjsEclipsePaths { } else { eclipseVersionSuffix = "_4.13" } + */ - utilsDropinsDir = "${jalviewjs_utils_dir}/${jalviewjs_eclipse_dropins_dir}${eclipseVersionSuffix}" + def propKey = "eclipse_debug" eclipseDebug = (project.hasProperty(propKey) && project.getProperty(propKey).equals("true")) doFirst { if (!assumedVersion) { - println("ECLIPSE_VERSION=${eclipseVersion}") + println("ECLIPSE VERSION=${eclipseVersion}") } } } -task jalviewjsEclipseCopyDropins { +task eclipseSetup { + dependsOn eclipseProject + dependsOn eclipseClasspath + dependsOn eclipseJdt +} + +/* using the Copy task below +task OLDjalviewjsEclipseCopyDropins { dependsOn jalviewjsEclipsePaths - def inputFiles = fileTree(dir: utilsDropinsDir, 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 -> @@ -1383,35 +1418,68 @@ 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 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}" + + 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: "${jalviewjs_utils_dir}/${jalviewjs_libjs_dir}", include: "*.zip") - zipFiles += "${jalviewjs_utils_dir}/${jalviewjs_swingjs_zip}${eclipseVersionSuffix}" + 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 jalviewjsSiteDir + into "${jalviewDir}/${jalviewjsSiteDir}" } } } inputs.files zipFiles - outputs.dir jalviewjsSiteDir + 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 j2s_props = project.properties.findAll { it.key.startsWith("j2s.") }.sort { it.key } def siteDirProperty = "j2s.site.directory" @@ -1420,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) @@ -1440,10 +1508,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 @@ -1452,14 +1520,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 @@ -1468,14 +1539,15 @@ task jalviewjsCopySiteResources (type: Copy) { outputFiles += "${outputDir}/${filename}" null } + preserve { + include "**" + } outputs.files outputFiles inputs.files inputFiles } task jalviewjsProjectImport(type: Exec) { - dependsOn eclipseProject - dependsOn eclipseClasspath - dependsOn eclipseJdt + dependsOn eclipseSetup dependsOn jalviewjsEclipsePaths dependsOn jalviewjsEclipseSetup @@ -1485,13 +1557,9 @@ task jalviewjsProjectImport(type: Exec) { if (eclipseDebug) { args += "-debug" } - - doFirst { - println("IMPORT ECLIPSE_DEBUG=${eclipseDebug}") - } + args += [ "--launcher.appendVmargs", "-vmargs", "-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${jalviewDirAbsolutePath}/${jalviewjsBuildDir}/${jalviewjs_eclipse_tmp_dropins_dir}" ] inputs.file("${jalviewDir}/.project") - outputs.dir(projdir) outputs.upToDateWhen { file(projdir).exists() } } @@ -1501,68 +1569,73 @@ task jalviewjsTranspile(type: Exec) { dependsOn jalviewjsEclipsePaths executable(eclipseBinary) - args(["-nosplash", "--launcher.suppressErrors", "-application", "org.eclipse.jdt.apt.core.aptBuild", "-data", eclipseWorkspace, "-${jalviewjs_eclipseBuildArg}", eclipse_project_name ]) + 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 - stdout = new ByteArrayOutputStream() - stderr = new ByteArrayOutputStream() - - 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}" - //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) + 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} +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( + 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(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 @@ -1587,8 +1660,8 @@ task jalviewjsBuildSite { task cleanJalviewjsSite { doFirst { - delete jalviewjsTransferSiteDir - delete jalviewjsSiteDir + delete "${jalviewDir}/${jalviewjsTransferSiteDir}" + delete "${jalviewDir}/${jalviewjsSiteDir}" } } @@ -1605,10 +1678,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 { @@ -1646,6 +1719,7 @@ task jalviewjsServer { } outputs.file(htmlFile) + outputs.upToDateWhen({false}) } task cleanJalviewjsAll { @@ -1655,13 +1729,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 { @@ -1672,8 +1748,8 @@ task jalviewjs { task jalviewjsIDECopyTransferSite(type: Copy) { - from jalviewjsTransferSiteDir - into jalviewjsSiteDir + from "${jalviewDir}/${jalviewjsTransferSiteDir}" + into "${jalviewDir}/${jalviewjsSiteDir}" } task jalviewjsIDEj2s {