Merge branch 'mmw/bug/JAL-4241-annotation-alignment-fix-slivka' into development...

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 43f03ee..1142388 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -205,7 +205,7 @@ ext {
   testClassesDir = useClover ? cloverTestClassesDir : "${jalviewDir}/${test_output_dir}"
 
   channelSuffix = ""
-  backgroundImageText = false
+  backgroundImageText = BACKGROUNDIMAGETEXT
   getdownChannelDir = string("${getdown_website_dir}/${propertiesChannelName}")
   getdownAppBaseDir = string("${jalviewDir}/${getdownChannelDir}/${JAVA_VERSION}")
   getdownArchiveDir = string("${jalviewDir}/${getdown_archive_dir}")
@@ -256,6 +256,7 @@ ext {
       testng_excluded_groups = "Not-bamboo"
     }
     install4jExtraScheme = "jalviewb"
+    backgroundImageText = true
     break
 
     case [ "RELEASE", "JALVIEWJS-RELEASE" ]:
@@ -286,7 +287,7 @@ ext {
     getdownDir = string("${getdownChannelName}/${JAVA_VERSION}")
     getdownAppBase = file(getdownAppBaseDir).toURI().toString()
     if (!file("${ARCHIVEDIR}/${package_dir}").exists()) {
-      throw new GradleException("Must provide an ARCHIVEDIR value to produce an archive distribution")
+      throw new GradleException("Must provide an ARCHIVEDIR value to produce an archive distribution [did not find '${ARCHIVEDIR}/${package_dir}']")
     } else {
       package_dir = string("${ARCHIVEDIR}/${package_dir}")
       buildProperties = string("${ARCHIVEDIR}/${classes_dir}/${build_properties_file}")
@@ -324,6 +325,7 @@ ext {
     install4jSuffix = "Develop"
     install4jExtraScheme = "jalviewd"
     install4jInstallerName = "${jalview_name} Develop Installer"
+    backgroundImageText = true
     break
 
     case "TEST-RELEASE":
@@ -338,6 +340,7 @@ ext {
     install4jSuffix = "Test"
     install4jExtraScheme = "jalviewt"
     install4jInstallerName = "${jalview_name} Test Installer"
+    backgroundImageText = true
     break
 
     case ~/^SCRATCH(|-[-\w]*)$/:
@@ -361,6 +364,7 @@ ext {
     install4jSuffix = "Test-Local"
     install4jExtraScheme = "jalviewt"
     install4jInstallerName = "${jalview_name} Test Installer"
+    backgroundImageText = true
     break
 
     case [ "LOCAL", "JALVIEWJS" ]:
@@ -437,7 +441,6 @@ ext {
   modules_compileClasspath = fileTree(dir: "${jalviewDir}/${j11modDir}", include: ["*.jar"])
   modules_runtimeClasspath = modules_compileClasspath
   */
-
   gitHash = "SOURCE"
   gitBranch = "Source"
   try {
@@ -1442,8 +1445,6 @@ def getMdSections(String content) {
   }
   return sections
 }
-
-
 task copyHelp(type: Copy) {
   def inputDir = helpSourceDir
   def outputDir = "${helpBuildDir}/${help_dir}"
@@ -1614,8 +1615,6 @@ task releasesTemplates {
   outputs.file(releasesHtmlFile)
   outputs.file(whatsnewHtmlFile)
 }
-
-
 task copyResources(type: Copy) {
   group = "build"
   description = "Copy (and make text substitutions in) the resources dir to the build area"
@@ -1752,6 +1751,8 @@ test {
     excludeGroups testng_excluded_groups
     preserveOrder true
     useDefaultListeners=true
+    // Uncomment to show stdout and stderr for tests in gradle build output
+    // testLogging.showStandardStreams = true
   }
 
   maxHeapSize = "1024m"
@@ -2355,7 +2356,6 @@ task getdownArchive() {
   dependsOn getdownArchiveBuild
   dependsOn getdownArchiveDigest
 }
-
 tasks.withType(JavaCompile) {
        options.encoding = 'UTF-8'
 }
@@ -2410,7 +2410,6 @@ task copyInstall4jTemplate {
       macosArchive.attributes().remove('executeSetupApp')
       macosArchive.attributes().remove('setupAppId')
     }
-
     // turn off checksum creation for LOCAL channel
     def e = install4jConfigXml.application[0]
     e.'@createChecksums' = string(install4jCheckSums)
@@ -2714,7 +2713,6 @@ task installers {
   dependsOn installerFiles
 }
 
-
 spotless {
   java {
     eclipse().configFile(eclipse_codestyle_file)
@@ -2889,7 +2887,6 @@ task dataInstallersJson {
 task helppages {
   group "help"
   description "Copies all help pages to build dir. Runs ant task 'pubhtmlhelp'."
-
   dependsOn copyHelp
   dependsOn pubhtmlhelp