JAL-4111 Added commit and date text to splashscreens of all channels

diff --git a/build.gradle b/build.gradle
index 43f03ee..70c5e86 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" ]:

diff --git a/gradle.properties b/gradle.properties
index e84802f..129e0a5 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -162,6 +162,7 @@ OSX_APPLEID =
 OSX_ALTOOLPASS =
 
 CHANNEL=LOCAL
+BACKGROUNDIMAGETEXT=false
 getdown_channel_base = https://www.jalview.org/getdown
 getdown_archive_base = https://www.jalview.org/old
 getdown_app_dir_release = release

diff --git a/utils/channels/default/channel_gradle.properties b/utils/channels/default/channel_gradle.properties
index a83ee8b..0f13784 100644 (file)
--- a/utils/channels/default/channel_gradle.properties
+++ b/utils/channels/default/channel_gradle.properties
@@ -20,3 +20,15 @@ install4j_background = jalview_logo_background_fade-640x480.png
 install4j_dmg_background = jalview_default_dmg_background-72dpi.png
 install4j_dmg_ds_store = jalview_default_dmg_DS_Store
 
+getdown_background_image_text_font = utils/fonts/Roboto.ttf
+getdown_background_image_text_colour = #b4b4b4
+getdown_background_image_text_suffix_cmd = font-size 44 text 408,145 '%s'
+getdown_background_image_text_commit_cmd = text 488,18 '%s'
+getdown_background_image_text_date_cmd = text 488,38 '%s'
+
+install4j_background_image_text_font = utils/fonts/Roboto.ttf
+install4j_background_image_text_colour = #b4b4b4
+install4j_background_image_text_suffix_cmd = font-size 30 text 194,218 '%s'
+install4j_background_image_text_commit_cmd = text 18,170 '%s'
+install4j_background_image_text_date_cmd = text 18,190 '%s'
+

diff --git a/utils/channels/develop-SUFFIX/channel_gradle.properties b/utils/channels/develop-SUFFIX/channel_gradle.properties
index 8216304..0ba0373 100644 (file)
--- a/utils/channels/develop-SUFFIX/channel_gradle.properties
+++ b/utils/channels/develop-SUFFIX/channel_gradle.properties
@@ -34,8 +34,8 @@ install4j_dmg_ds_store = jalview_develop_dmg_DS_Store
 getdown_background_image_text_font = utils/fonts/Roboto.ttf
 getdown_background_image_text_colour = #b4b4b4
 getdown_background_image_text_suffix_cmd = font-size 44 text 408,145 '%s'
-getdown_background_image_text_commit_cmd = text 408,168 '%s'
-getdown_background_image_text_date_cmd = text 408,188 '%s'
+getdown_background_image_text_commit_cmd = text 488,18 '%s'
+getdown_background_image_text_date_cmd = text 488,38 '%s'
 
 install4j_background_image_text_font = utils/fonts/Roboto.ttf
 install4j_background_image_text_colour = #b4b4b4

diff --git a/utils/channels/develop/channel_gradle.properties b/utils/channels/develop/channel_gradle.properties
index 8917c6c..50d1d3c 100644 (file)
--- a/utils/channels/develop/channel_gradle.properties
+++ b/utils/channels/develop/channel_gradle.properties
@@ -30,3 +30,16 @@ install4j_png_icon_file = jalview_develop_logo.png
 install4j_background = jalview_develop_logo_background_fade-640x480.png
 install4j_dmg_background = jalview_develop_dmg_background-72dpi.png
 install4j_dmg_ds_store = jalview_develop_dmg_DS_Store
+
+getdown_background_image_text_font = utils/fonts/Roboto.ttf
+getdown_background_image_text_colour = #b4b4b4
+getdown_background_image_text_suffix_cmd = font-size 44 text 408,145 '%s'
+getdown_background_image_text_commit_cmd = text 488,18 '%s'
+getdown_background_image_text_date_cmd = text 488,38 '%s'
+
+install4j_background_image_text_font = utils/fonts/Roboto.ttf
+install4j_background_image_text_colour = #b4b4b4
+install4j_background_image_text_suffix_cmd = font-size 30 text 194,218 '%s'
+install4j_background_image_text_commit_cmd = text 18,250 '%s'
+install4j_background_image_text_date_cmd = text 18,270 '%s'
+

diff --git a/utils/channels/jalviewjs/channel_gradle.properties b/utils/channels/jalviewjs/channel_gradle.properties
index 38dcf09..6f3991b 100644 (file)
--- a/utils/channels/jalviewjs/channel_gradle.properties
+++ b/utils/channels/jalviewjs/channel_gradle.properties
@@ -20,3 +20,15 @@ install4j_background = jalview_logo_background_fade-640x480.png
 install4j_dmg_background = jalview_default_dmg_background-72dpi.png
 install4j_dmg_ds_store = jalview_default_dmg_DS_Store
 
+getdown_background_image_text_font = utils/fonts/Roboto.ttf
+getdown_background_image_text_colour = #b4b4b4
+getdown_background_image_text_suffix_cmd = font-size 44 text 408,145 '%s'
+getdown_background_image_text_commit_cmd = text 488,18 '%s'
+getdown_background_image_text_date_cmd = text 488,38 '%s'
+
+install4j_background_image_text_font = utils/fonts/Roboto.ttf
+install4j_background_image_text_colour = #b4b4b4
+install4j_background_image_text_suffix_cmd = font-size 30 text 194,218 '%s'
+install4j_background_image_text_commit_cmd = text 18,170 '%s'
+install4j_background_image_text_date_cmd = text 18,190 '%s'
+

diff --git a/utils/channels/jalviewjs/images/jalview_default_dmg_background-72dpi.png b/utils/channels/jalviewjs/images/jalview_default_dmg_background-72dpi.png
new file mode 100644 (file)
index 0000000..89c6a04
Binary files /dev/null and b/utils/channels/jalviewjs/images/jalview_default_dmg_background-72dpi.png differ

diff --git a/utils/channels/release/channel_gradle.properties b/utils/channels/release/channel_gradle.properties
index 382732e..fb8a62f 100644 (file)
--- a/utils/channels/release/channel_gradle.properties
+++ b/utils/channels/release/channel_gradle.properties
@@ -20,3 +20,15 @@ install4j_background = jalview_logo_background_fade-640x480.png
 install4j_dmg_background = jalview_dmg_background-72dpi.png
 install4j_dmg_ds_store = jalview_dmg_DS_Store
 
+getdown_background_image_text_font = utils/fonts/Roboto.ttf
+getdown_background_image_text_colour = #b4b4b4
+getdown_background_image_text_suffix_cmd = font-size 44 text 408,145 '%s'
+getdown_background_image_text_commit_cmd = text 488,18 '%s'
+getdown_background_image_text_date_cmd = text 488,38 '%s'
+
+install4j_background_image_text_font = utils/fonts/Roboto.ttf
+install4j_background_image_text_colour = #b4b4b4
+install4j_background_image_text_suffix_cmd = font-size 30 text 194,218 '%s'
+install4j_background_image_text_commit_cmd = text 18,250 '%s'
+install4j_background_image_text_date_cmd = text 18,270 '%s'
+

diff --git a/utils/channels/test-release/channel_gradle.properties b/utils/channels/test-release/channel_gradle.properties
index 8247729..1775200 100644 (file)
--- a/utils/channels/test-release/channel_gradle.properties
+++ b/utils/channels/test-release/channel_gradle.properties
@@ -20,3 +20,15 @@ install4j_background = jalview_logo_background_fade-640x480.png
 install4j_dmg_background = jalview_test-release_dmg_background-72dpi.png
 install4j_dmg_ds_store = jalview_test-release_dmg_DS_Store
 
+getdown_background_image_text_font = utils/fonts/Roboto.ttf
+getdown_background_image_text_colour = #b4b4b4
+getdown_background_image_text_suffix_cmd = font-size 44 text 408,145 '%s'
+getdown_background_image_text_commit_cmd = text 488,18 '%s'
+getdown_background_image_text_date_cmd = text 488,38 '%s'
+
+install4j_background_image_text_font = utils/fonts/Roboto.ttf
+install4j_background_image_text_colour = #b4b4b4
+install4j_background_image_text_suffix_cmd = font-size 30 text 194,218 '%s'
+install4j_background_image_text_commit_cmd = text 18,250 '%s'
+install4j_background_image_text_date_cmd = text 18,270 '%s'
+