X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;fp=build.gradle;h=f9d2974cac558064c960d6add96ca680e1fb0f2c;hb=d7368218039692c3cb2ab5c1a83388f98b89c821;hp=c3e89e588dad6f3018c376655becd2a32d094b48;hpb=3426c60a0b8395025536021e2742162cd20ebe2b;p=jalview.git

diff --git a/build.gradle b/build.gradle
index c3e89e5..f9d2974 100644
--- a/build.gradle
+++ b/build.gradle
@@ -174,11 +174,17 @@ ext {
   buildDist = true
 
   // the following values might be overridden by the CHANNEL switch
+  channelPropertiesFile = string("${channel_properties_dir}/release_properties")
   getdownChannelName = CHANNEL.toLowerCase()
   getdownDir = string("${getdownChannelName}/${JAVA_VERSION}")
   getdownAppBase = string("${getdown_channel_base}/${getdownDir}")
   getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher}")
   getdownAppDistDir = getdown_app_dir_alt
+  buildProperties = string("${resourceDir}/${build_properties_file}")
+  getdownImagesDir = getdown_images_dir
+  getdownBgColour = "FFFFFF"
+  getdownFgColour = "000000"
+  getdownLightFgColour = "000066"
   reportRsyncCommand = false
   jvlChannelName = CHANNEL.toLowerCase()
   install4jSuffix = CHANNEL.substring(0, 1).toUpperCase() + CHANNEL.substring(1).toLowerCase(); // BUILD -> Build
@@ -187,6 +193,9 @@ ext {
   install4jInstallerName = "${jalview_name} Non-Release Installer"
   install4jExecutableName = jalview_name.replaceAll("[^\\w]+", "_").toLowerCase()
   install4jExtraScheme = "jalviewx"
+  install4jMacIconsFile = string("${install4j_utils_dir}/${install4j_mac_icons_file}")
+  install4jWindowsIconsFile = string("${install4j_utils_dir}/${install4j_windows_icons_file}")
+  install4jPngIconFile = string("${install4j_utils_dir}/${install4j_png_icon_file}")
   switch (CHANNEL) {
 
     case "BUILD":
@@ -1204,7 +1213,12 @@ task copyResources(type: Copy) {
   inputs.dir(inputDir)
   outputs.dir(outputDir)
 }
-
+task copyChannelProperties(type: Copy) {
+  def propsFile = file(channelPropertiesFile)
+  rename(propsFile.getName(), "channel_properties")
+  from channelPropertiesFile
+  into resourceDir
+}
 
 task createBuildProperties(type: WriteProperties) {
   dependsOn copyResources
@@ -1243,7 +1257,6 @@ task buildIndices(type: JavaExec) {
   outputs.file("${workingDir}/JavaHelpSearch/TMAP")
 }
 
-
 task prepare {
   dependsOn copyResources
   dependsOn copyDocs
@@ -1467,6 +1480,17 @@ task getdownWebsite() {
     if (getdownAltMultiJavaLocation != null && getdownAltMultiJavaLocation.length() > 0) {
       props.put("getdown_txt_multi_java_location", getdownAltMultiJavaLocation)
     }
+    if (getdownImagesDir != null && file(getdownImagesDir).exists()) {
+      props.put("getdown_txt_ui.background_image", "${getdownImagesDir}/${getdown_background_image}")
+      props.put("getdown_txt_ui.instant_background_image", "${getdownImagesDir}/${getdown_instant_background_image}")
+      props.put("getdown_txt_ui.error_background", "${getdownImagesDir}/${getdown_error_background}")
+      props.put("getdown_txt_ui.progress_image", "${getdownImagesDir}/${getdown_progress_image}")
+      props.put("getdown_txt_ui.icon", "${getdownImagesDir}/${getdown_icon}")
+      props.put("getdown_txt_ui.mac_dock_icon", "${getdownImagesDir}/${getdown_mac_dock_icon}")
+      props.put("getdown_txt_ui.background", getdownBgColour)
+      props.put("getdown_txt_ui.progress_text", getdownFgColour)
+      props.put("getdown_txt_ui.status_text", getdownLightFgColour)
+    }
 
     props.put("getdown_txt_title", jalview_name)
     props.put("getdown_txt_ui.name", install4jApplicationName)
@@ -1851,6 +1875,10 @@ task installers(type: com.install4j.gradle.Install4jTask) {
     'UNIX_APPLICATION_FOLDER': install4jUnixApplicationFolder,
     'EXECUTABLE_NAME': install4jExecutableName,
     'EXTRA_SCHEME': install4jExtraScheme,
+    'MAC_ICONS_FILE': install4jMacIconsFile,
+    'WINDOWS_ICONS_FILE': install4jWindowsIconsFile,
+    'PNG_ICON_FILE': install4jPngIconFile,
+
   ]
 
   //println("INSTALL4J VARIABLES:")