X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=1f1bc2f6d9ba7c01880c10075b5f210955af0fad;hb=8e6e5eba1f8130dad6c2b697bf7671cb7036c1c0;hp=76c1c4401ef6f9360c6d47c14013e1ec41eee071;hpb=6aec2dea780d21b874707b429964afa91558a6ff;p=jalview.git diff --git a/build.gradle b/build.gradle index 76c1c44..1f1bc2f 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ import org.apache.tools.ant.filters.ReplaceTokens 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 @@ -17,27 +18,7 @@ plugins { 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 { @@ -53,118 +34,192 @@ dependencies { 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 { - getdownWebsiteDir = "${jalviewDir}/${getdown_website_dir}/${JAVA_VERSION}" - getdownDir = "" + 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 + + 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 + // Don't ignore transpile errors for release build + if (jalviewjs_ignore_transpile_errors.equals("true")) { + jalviewjs_ignore_transpile_errors = "false" + println("Setting jalviewjs_ignore_transpile_errors to 'false'") + } 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 + // Don't ignore transpile errors for release build + if (jalviewjs_ignore_transpile_errors.equals("true")) { + jalviewjs_ignore_transpile_errors = "false" + println("Setting jalviewjs_ignore_transpile_errors to 'false'") + } 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 @@ -174,89 +229,135 @@ ext { } - 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 + + eclipseJavaVersion = "55" + jalviewjsJ2sPlugin = jalviewjs_j2s_plugin + if (IN_ECLIPSE) { + //def eclipseJavaVersion = System.property["java.class.version"] + if (Float.parseFloat(eclipseJavaVersion) >= 55 && file(jalviewjs_j2s_plugin_j11).exists()) { // 55 is Java 11 + jalviewjsJ2sPlugin = jalviewjs_j2s_plugin_j11 + } + } + eclipseWorkspace = null + eclipseBinary = string("") + eclipseVersion = string("") + eclipseDebug = false + eclipseJavaVersion = string("") + // 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}") @@ -287,7 +388,7 @@ sourceSets { test { java { - srcDirs "${jalviewDir}/${testSourceDir}" + srcDirs testSourceDir outputDir = file("${jalviewDir}/${testOutputDir}") } @@ -326,7 +427,6 @@ configurations { cloverRuntime.extendsFrom cloverCompile } - eclipse { project { name = eclipse_project_name @@ -356,21 +456,23 @@ eclipse { def removeTheseToo = [] HashMap 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)) @@ -381,8 +483,8 @@ eclipse { 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}/")) { @@ -435,6 +537,7 @@ eclipse { javaRuntimeName = eclipse_java_runtime_name // add in jalview project specific properties/preferences into eclipse core preferences + // and also the codestyle XML file file { withProperties { props -> def jalview_prefs = new Properties() @@ -446,20 +549,39 @@ eclipse { props.putAt(t, v) } } + // codestyle file -- overrides previous formatter prefs + def csFile = file("${jalviewDirAbsolutePath}/${eclipse_codestyle_file}") + if (csFile.exists()) { + XmlParser parser = new XmlParser() + def profiles = parser.parse(csFile) + def profile = profiles.'profile'.find { p -> (p.'@kind' == "CodeFormatterProfile" && p.'@name' == "Jalview") } + if (profile != null) { + profile.'setting'.each { s -> + def id = s.'@id' + def value = s.'@value' + if (id != null && value != null) { + props.putAt(id, value) + } + } + } + } } } } // 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 { @@ -576,17 +698,19 @@ task setGitVals { 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 @@ -594,12 +718,18 @@ task createBuildProperties(type: WriteProperties) { //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 @@ -630,7 +760,7 @@ task convertBuildingMD(type: Exec) { 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") } } @@ -651,22 +781,28 @@ clean { 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' @@ -682,16 +818,17 @@ task copyHelp(type: Copy) { 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 "**" } @@ -736,13 +873,13 @@ task buildIndices(type: JavaExec) { 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") @@ -772,8 +909,8 @@ task linkCheck(type: JavaExec) { 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 @@ -784,13 +921,13 @@ task linkCheck(type: JavaExec) { 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" @@ -800,6 +937,7 @@ task cleanPackageDir(type: Delete) { } } + jar { dependsOn linkCheck dependsOn buildIndices @@ -821,13 +959,13 @@ jar { 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}" } @@ -888,19 +1026,19 @@ task getdownWebsite() { 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}" @@ -954,7 +1092,7 @@ task getdownWebsite() { getdownResourceFilenames.each{ filename -> copy { from filename - into project.ext.getdownResourceDir + into getdownResourceDir } } @@ -973,7 +1111,7 @@ task getdownWebsite() { getdownTextString += line copy { from f.getPath() - into project.ext.getdownAppDir + into getdownAppDir } } @@ -987,7 +1125,7 @@ task getdownWebsite() { getdownTextString += line copy { from f.getPath() - into project.ext.getdownJ11libDir + into getdownJ11libDir } } } @@ -998,16 +1136,16 @@ task getdownWebsite() { 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 { @@ -1015,7 +1153,7 @@ task getdownWebsite() { 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"))) { @@ -1048,15 +1186,15 @@ task getdownWebsite() { 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) } @@ -1068,9 +1206,9 @@ task getdownDigest(type: JavaExec) { 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") } @@ -1099,8 +1237,8 @@ task getdown() { clean { doFirst { - delete project.ext.getdownWebsiteDir - delete project.ext.getdownFilesDir + delete getdownWebsiteDir + delete getdownFilesDir } } @@ -1126,49 +1264,56 @@ install4j { } -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 + ] ) - 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']) + 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' + ] + ) } } into install4jDir - outputs.files(install4jConf) + outputs.files(install4jConfFile) doLast { // include file associations in installer @@ -1178,7 +1323,7 @@ task copyInstall4jTemplate(type: Copy) { flags: "s", match: '', replace: installerFileAssociationsXml, - file: install4jConf + file: install4jConfFile ) /* // include uninstaller applescript app files in dmg @@ -1188,19 +1333,26 @@ task copyInstall4jTemplate(type: Copy) { flags: "s", match: '', 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 @@ -1213,21 +1365,14 @@ task installers(type: com.install4j.gradle.Install4jTask) { 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("\\.", "_") @@ -1274,28 +1419,35 @@ task sourceDist (type: Tar) { 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) + // } } @@ -1303,29 +1455,18 @@ task helppages { 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 @@ -1340,16 +1481,17 @@ task jalviewjsSetEclipseWorkspace { 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() @@ -1358,6 +1500,14 @@ task jalviewjsSetEclipseWorkspace { 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() @@ -1365,6 +1515,9 @@ task jalviewjsSetEclipseWorkspace { props.store(bytes, null) def propertiesString = bytes.toString() propsFile.text = propertiesString + print("NEW ") + } else { + print("EXISTING ") } println("ECLIPSE WORKSPACE: "+eclipseWorkspace.getPath()) @@ -1372,14 +1525,10 @@ task jalviewjsSetEclipseWorkspace { //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 @@ -1420,6 +1569,14 @@ task jalviewjsEclipsePaths { 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}") } @@ -1427,6 +1584,15 @@ task jalviewjsEclipsePaths { } +task printProperties { + group "Debug" + description "Output to console all System.properties" + doFirst { + System.properties.each { key, val -> System.out.println("Property: ${key}=${val}") } + } +} + + task eclipseSetup { dependsOn eclipseProject dependsOn eclipseClasspath @@ -1439,7 +1605,7 @@ task jalviewjsEclipseCopyDropins(type: Copy) { dependsOn jalviewjsEclipsePaths def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_eclipse_dropins_dir}", include: "*.jar") - inputFiles += file("${jalviewDir}/${jalviewjs_j2s_plugin}") + inputFiles += file("${jalviewDir}/${jalviewjsJ2sPlugin}") def outputDir = "${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_eclipse_tmp_dropins_dir}" from inputFiles @@ -1473,8 +1639,6 @@ jalviewjsEclipseCopyDropins.finalizedBy jalviewjsCleanEclipse task jalviewjsTransferUnzipSwingJs { - dependsOn jalviewjsSitePath - def file_zip = "${jalviewDir}/${jalviewjs_swingjs_zip}" doLast { @@ -1490,8 +1654,6 @@ task jalviewjsTransferUnzipSwingJs { task jalviewjsTransferUnzipLib { - dependsOn jalviewjsSitePath - def zipFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_libjs_dir}", include: "*.zip") doLast { @@ -1518,13 +1680,10 @@ 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 } + 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://") )) { @@ -1535,11 +1694,15 @@ task jalviewjsCreateJ2sSettings(type: WriteProperties) { 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) + } } @@ -1551,7 +1714,6 @@ task jalviewjsEclipseSetup { task jalviewjsSyncAllLibs (type: Sync) { - dependsOn jalviewjsSitePath dependsOn jalviewjsTransferUnzipAllLibs def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteLibDir}") inputFiles += fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteSwingJsDir}") @@ -1573,8 +1735,7 @@ task jalviewjsSyncAllLibs (type: Sync) { 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 @@ -1593,7 +1754,6 @@ task jalviewjsSyncResources (type: Sync) { task jalviewjsSyncSiteResources (type: Sync) { - dependsOn jalviewjsSitePath def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjs_site_resource_dir}") def outputDir = "${jalviewDir}/${jalviewjsSiteDir}" @@ -1613,7 +1773,6 @@ task jalviewjsSyncSiteResources (type: Sync) { task jalviewjsSyncBuildProperties (type: Sync) { - dependsOn jalviewjsSitePath dependsOn createBuildProperties def inputFiles = [file(buildProperties)] def outputDir = "${jalviewDir}/${jalviewjsSiteDir}/${jalviewjs_j2s_subdir}" @@ -1640,8 +1799,11 @@ task jalviewjsProjectImport(type: Exec) { doFirst { // do not run a headless import when we claim to be in Eclipse - if (ECLIPSE_IDE_DEVELOPER.equals("true")) { - throw new StopExecutionException("Not running headless import whilst ECLIPSE_IDE_DEVELOPER is '"+ECLIPSE_IDE_DEVELOPER+"'") + 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}") } } @@ -1653,6 +1815,9 @@ task jalviewjsProjectImport(type: Exec) { 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 { @@ -1668,8 +1833,11 @@ task jalviewjsTranspile(type: Exec) { doFirst { // do not run a headless transpile when we claim to be in Eclipse - if (ECLIPSE_IDE_DEVELOPER.equals("true")) { - throw new StopExecutionException("Not running headless transpile whilst ECLIPSE_IDE_DEVELOPER is '"+ECLIPSE_IDE_DEVELOPER+"'") + 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}") } } @@ -1679,6 +1847,9 @@ task jalviewjsTranspile(type: Exec) { 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 @@ -1725,7 +1896,12 @@ DEBUG: ${eclipseDebug} 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}'") + if (jalviewjs_ignore_transpile_errors.equals("true")) { + println("IGNORING TRANSPILE ERRORS") + println("See eclipse transpile log file '${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_j2s_transpile_stdout}'") + } else { + throw new GradleException("Error during transpilation:\n${stderr}\nSee eclipse transpile log file '${jalviewDir}/${jalviewjsBuildDir}/${jalviewjs_j2s_transpile_stdout}'") + } } } @@ -1735,14 +1911,14 @@ DEBUG: ${eclipseDebug} } -def jalviewjsCallCore(FileCollection list, String prefixFile, String suffixFile, String jsfile, String zjsfile, File logOutFile, Boolean logOutConsole) { +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 = "Generating ${jsfile}" + msg = "Creating core for ${name}...\nGenerating ${jsfile}" println(msg) logOutFile.createNewFile() logOutFile.append(msg+"\n") @@ -1756,8 +1932,7 @@ def jalviewjsCallCore(FileCollection list, String prefixFile, String suffixFile, f -> if (f.exists()) { def t = f.text - t.replaceAll("Clazz\\.","Clazz_") - t.replaceAll("Class__","Clazz._") + t.replaceAll("Clazz\\.([^_])","Clazz_${1}") coreFile.append( t ) } else { msg = "...file '"+f.getPath()+"' does not exist, skipping" @@ -1776,6 +1951,7 @@ def jalviewjsCallCore(FileCollection list, String prefixFile, String suffixFile, javaexec { classpath = files(["${jalviewDir}/tools/closure_compiler.jar"]) args = [ "--js", jsfile, "--js_output_file", zjsfile ] + maxHeapSize = "2g" msg = "\nRunning '"+commandLine.join(' ')+"'\n" println(msg) @@ -1807,11 +1983,15 @@ def jalviewjsCallCore(FileCollection list, String prefixFile, String suffixFile, } -task jalviewjsNoTranspileBuildAllCores { - dependsOn jalviewjsSitePath +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" @@ -1832,17 +2012,17 @@ task jalviewjsNoTranspileBuildAllCores { } // _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" ] + //classlistFiles += [ 'file': file("${jalviewDir}/${jalviewjs_classlist_jmol}"), 'name': "_jvjmol" ] + classlistFiles += [ 'file': file("${jalviewDir}/${jalviewjs_classlist_jalview}"), 'name': jalviewjsJalviewCoreName ] - def classlists = [] + jalviewjsCoreClasslists = [] classlistFiles.each { hash -> def file = hash['file'] if (! file.exists()) { - println("...classlist file '"+file.getPath()+"' does not exist, skipping") + //println("...classlist file '"+file.getPath()+"' does not exist, skipping") return false // this is a "continue" in groovy .each closure } def name = hash['name'] @@ -1860,10 +2040,11 @@ task jalviewjsNoTranspileBuildAllCores { def jsfile = "${outputDir}/core${name}.js" def zjsfile = "${outputDir}/core${name}.z.js" - classlists += [ - 'jsfile': jsfile, - 'zjsfile': zjsfile, - 'list': list + jalviewjsCoreClasslists += [ + 'jsfile': jsfile, + 'zjsfile': zjsfile, + 'list': list, + 'name': name ] inputs.file(file) @@ -1873,77 +2054,118 @@ task jalviewjsNoTranspileBuildAllCores { } // _stevesoft core. add any cores without a classlist here (and the inputs and outputs) + def stevesoftClasslistName = "_stevesoft" def stevesoftClasslist = [ - 'jsfile': "${outputDir}/core_stevesoft.js", - 'zjsfile': "${outputDir}/core_stevesoft.z.js", - 'list': fileTree(dir: j2sDir, include: "com/stevesoft/pat/**/*.js") + 'jsfile': "${outputDir}/core${stevesoftClasslistName}.js", + 'zjsfile': "${outputDir}/core${stevesoftClasslistName}.z.js", + 'list': fileTree(dir: j2sDir, include: "com/stevesoft/pat/**/*.js"), + 'name': stevesoftClasslistName ] - classlists += stevesoftClasslist + 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")+" jalviewjsNoTranspileBuildAllCores\n----\n") + logOutFile.write(getDate("yyyy-MM-dd HH:mm:ss")+" jalviewjsBuildAllCores\n----\n") - classlists.each { - jalviewjsCallCore(it.list, prefixFile, suffixFile, it.jsfile, it.zjsfile, logOutFile, jalviewjs_j2s_to_console.equals("true")) + jalviewjsCoreClasslists.each { + jalviewjsCallCore(it.name, it.list, prefixFile, suffixFile, it.jsfile, it.zjsfile, logOutFile, jalviewjs_j2s_to_console.equals("true")) } } } -jalviewjsNoTranspileBuildAllCores.mustRunAfter jalviewjsTranspile - - -task jalviewjsBuildAllCores { - group "JalviewJS" - description "Build the core js lib closures listed in the classlists dir" - dependsOn jalviewjsTranspile - dependsOn jalviewjsNoTranspileBuildAllCores +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 jalviewjsPublishCoreTemplate(type: Sync) { - dependsOn jalviewjsSitePath +task jalviewjsPublishCoreTemplates { dependsOn jalviewjsBuildAllCores - -// clean this up - def inputFile = file("${jalviewDir}/${j2s_template_html}") + def inputFileName = "${jalviewDir}/${j2s_coretemplate_html}" + def inputFile = file(inputFileName) def outputDir = "${jalviewDir}/${jalviewjsTransferSiteCoreDir}" -// clean this up - def jalviewTemplateName = "JalviewJS" - def jalviewCoreName = "_jalview" - - from inputFile - into outputDir def outputFiles = [] - rename { filename -> - outputFiles += "${outputDir}/${filename}" - if (filename.equals(inputFile.getName())) { - return "${jalviewTemplateName}_${jalviewCoreName}.html" - } - return null + jalviewjsCoreClasslists.each { cl -> + def outputFile = "${outputDir}/${jalviewjsJalviewTemplateName}_${cl.name}.html" + cl['outputfile'] = outputFile + outputFiles += outputFile } - filter(ReplaceTokens, beginToken: '_', endToken: '_', tokens: ['MAIN': mainClass, 'CODE': "null", 'NAME': jalviewTemplateName]) - filter(ReplaceTokens, beginToken: '', endToken: '', tokens: ['NONE': jalviewCoreName]) - preserve { - include "**" + + doFirst { + jalviewjsCoreClasslists.each { cl -> + jalviewjsPublishCoreTemplate(cl.name, jalviewjsJalviewTemplateName, inputFile, cl.outputfile) + } } - outputs.files outputFiles - inputs.files inputFile + inputs.file(inputFile) + outputs.files(outputFiles) } -task jalviewjsNoTranspileSyncCore (type: Sync) { - dependsOn jalviewjsSitePath - dependsOn jalviewjsNoTranspileBuildAllCores - dependsOn jalviewjsPublishCoreTemplate +task jalviewjsSyncCore (type: Sync) { + dependsOn jalviewjsBuildAllCores + dependsOn jalviewjsPublishCoreTemplates def inputFiles = fileTree(dir: "${jalviewDir}/${jalviewjsTransferSiteCoreDir}") def outputDir = "${jalviewDir}/${jalviewjsSiteDir}" @@ -1962,13 +2184,6 @@ task jalviewjsNoTranspileSyncCore (type: Sync) { } -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 @@ -1978,7 +2193,7 @@ task jalviewjsCopyTransferSiteJs(type: Copy) { // 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}" @@ -1987,24 +2202,16 @@ task jalviewjsNoTranspileSyncTransferSiteJs(type: Sync) { } } + 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 { @@ -2026,12 +2233,19 @@ task jalviewjsBuildSite { } -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}" } } @@ -2061,7 +2275,6 @@ task jalviewjsServer { 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 { @@ -2070,26 +2283,35 @@ task jalviewjsServer { 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 = """ -

Jalview JS Test. <${url}>

-

Jalview JS Test with debug. <${url}?j2sdebug<

- """ - + println("For verbose: "+url+"?j2sverbose") } catch (Exception e) { port++; } } + def htmlText = """ +

JalviewJS Test. <${url}>

+

JalviewJS Test with debug. <${url}?j2sdebug>

+

JalviewJS Test with verbose. <${url}?j2sdebug>

+ """ + jalviewjsCoreClasslists.each { cl -> + def urlcore = jalviewjsServer.getResourceUrl(file(cl.outputfile).getName()) + htmlText += """ +

${jalviewjsJalviewTemplateName} [core ${cl.name}]. <${urlcore}>

+ """ + println("For core ${cl.name}: "+urlcore) + } + file(htmlFile).text = htmlText } outputs.file(htmlFile) @@ -2116,10 +2338,65 @@ task cleanJalviewjsAll { } +task jalviewjsIDE_checkJ2sPlugin { + group "00 JalviewJS in Eclipse" + description "Compare the swingjs/net.sf.j2s.core(-j11)?.jar file with the Eclipse IDE's plugin version (found in the 'dropins' dir)" -task jalviewjsIDE_CopyTransferSiteJs(type: Copy) { - from "${jalviewDir}/${jalviewjsTransferSiteJsDir}" - into "${jalviewDir}/${jalviewjsSiteDir}" + doFirst { + def j2sPlugin = string("${jalviewDir}/${jalviewjsJ2sPlugin}") + def j2sPluginFile = file(j2sPlugin) + def eclipseHome = System.properties["eclipse.home.location"] + 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 (could not find '${eclipseJ2sPlugin}')\nTry running task jalviewjsIDE_copyJ2sPlugin" + System.err.println(msg) + throw new StopExecutionException(msg) + } + + def digest = MessageDigest.getInstance("MD5") + + digest.update(j2sPluginFile.text.bytes) + def j2sPluginMd5 = new BigInteger(1, digest.digest()).toString(16).padLeft(32, '0') + + //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}'" + System.err.println(msg) + throw new StopExecutionException(msg) + } else { + def msg = "Eclipse J2S Plugin is the same as '${j2sPlugin}' (this is good)" + println(msg) + } + } +} + +task jalviewjsIDE_copyJ2sPlugin { + group "00 JalviewJS in Eclipse" + description "Copy the swingjs/net.sf.j2s.core(-j11)?.jar file into the Eclipse IDE's 'dropins' dir" + + doFirst { + def j2sPlugin = string("${jalviewDir}/${jalviewjsJ2sPlugin}") + def j2sPluginFile = file(j2sPlugin) + def eclipseHome = System.properties["eclipse.home.location"] + if (eclipseHome == null || ! IN_ECLIPSE) { + throw new StopExecutionException("Cannot find running Eclipse home from System.properties['eclipse.home.location']. NOT copying J2S Plugin.") + } + def eclipseJ2sPlugin = "${eclipseHome}/dropins/${j2sPluginFile.getName()}" + def eclipseJ2sPluginFile = file(eclipseJ2sPlugin) + def msg = "WARNING! Copying this commit's j2s plugin '${j2sPlugin}' to Eclipse J2S Plugin '${eclipseJ2sPlugin}'\n* May require an Eclipse restart" + System.err.println(msg) + copy { + from j2sPlugin + eclipseJ2sPluginFile.getParentFile().mkdirs() + into eclipseJ2sPluginFile.getParent() + } + } } @@ -2130,18 +2407,37 @@ task jalviewjsIDE_j2sFile { } -task jalviewjsIDE_BuildAllCores { +task jalviewjsIDE_SyncCore { group "00 JalviewJS in Eclipse" - description "Build the core js lib closures listed in the classlists dir" - dependsOn jalviewjsNoTranspileBuildAllCores + 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 } @@ -2159,17 +2455,22 @@ task jalviewjsIDE_Server { } -// 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 + //dependsOn jalviewjsIDE_checkJ2sPlugin + //dependsOn jalviewjsIDE_PrepareSite }