JAL-4421 Python script for customising DS_Store. Separate out more names for DMG...

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 012d61e..2396e7d 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -43,6 +43,7 @@ buildscript {
     classpath "com.vladsch.flexmark:flexmark-all:0.62.0"
     classpath "org.jsoup:jsoup:1.14.3"
     classpath "com.eowise:gradle-imagemagick:0.5.1"
+    classpath 'ru.vyarus:gradle-use-python-plugin:4.0.0'
   }
 }
 
@@ -56,6 +57,7 @@ plugins {
   id 'com.install4j.gradle' version '10.0.3'
   id 'com.dorongold.task-tree' version '2.1.1' // only needed to display task dependency tree with  gradle task1 [task2 ...] taskTree
   id 'com.palantir.git-version' version '0.13.0' apply false
+  id 'ru.vyarus.use-python' version '4.0.0'
 }
 
 repositories {
@@ -236,7 +238,7 @@ ext {
   install4jDMGBackgroundImageDir = "${install4j_images_dir}"
   install4jDMGBackgroundImageBuildDir = "build/imagemagick/install4j"
   install4jDMGBackgroundImageFile = "${install4j_dmg_background}"
-  install4jInstallerName = "${jalview_name} Non-Release Installer"
+  install4jmacOSArchiveName = "${jalview_name} Non-Release ${JALVIEW_VERSION} Installer"
   install4jExecutableName = install4j_executable_name
   install4jExtraScheme = "jalviewextra"
   install4jMacIconsFile = string("${install4j_images_dir}/${install4j_mac_icons_file}")
@@ -244,6 +246,7 @@ ext {
   install4jPngIconFile = string("${install4j_images_dir}/${install4j_png_icon_file}")
   install4jBackground = string("${install4j_images_dir}/${install4j_background}")
   install4jBuildDir = "${install4j_build_dir}/${JAVA_VERSION}"
+  install4jDMGFixedDSStore = "${install4jBuildDir}/${install4j_dmg_ds_store}"
   install4jCheckSums = true
 
   applicationName = "${jalview_name}"
@@ -268,7 +271,7 @@ ext {
     getdownSetAppBaseProperty = true
     reportRsyncCommand = true
     install4jSuffix = ""
-    install4jInstallerName = "${jalview_name} Installer"
+    install4jmacOSArchiveName = "Install ${jalview_name} ${JALVIEW_VERSION}"
     install4jExtraScheme = (CHANNEL=="RELEASE")?"jalviewx":"jalviewjs"
     break
 
@@ -311,7 +314,7 @@ ext {
     JALVIEW_VERSION=JALVIEW_VERSION+"-d${suffix}-${buildDate}"
     install4jSuffix = "Develop ${suffix}"
     install4jExtraScheme = "jalviewd"
-    install4jInstallerName = "${jalview_name} Develop ${suffix} Installer"
+    install4jmacOSArchiveName = "Install ${jalview_name} Develop ${suffix} ${JALVIEW_VERSION}"
     getdownChannelName = string("develop-${suffix}")
     getdownChannelDir = string("${getdown_website_dir}/${getdownChannelName}")
     getdownAppBaseDir = string("${jalviewDir}/${getdownChannelDir}/${JAVA_VERSION}")
@@ -329,7 +332,7 @@ ext {
     
     install4jSuffix = "Develop"
     install4jExtraScheme = "jalviewd"
-    install4jInstallerName = "${jalview_name} Develop Installer"
+    install4jmacOSArchiveName = "Install ${jalview_name} Develop ${JALVIEW_VERSION}"
     backgroundImageText = true
     break
 
@@ -344,7 +347,7 @@ ext {
     JALVIEW_VERSION = JALVIEW_VERSION+"-test"
     install4jSuffix = "Test"
     install4jExtraScheme = "jalviewt"
-    install4jInstallerName = "${jalview_name} Test Installer"
+    install4jmacOSArchiveName = "Install ${jalview_name} Test ${JALVIEW_VERSION}"
     backgroundImageText = true
     break
 
@@ -368,7 +371,7 @@ ext {
     JALVIEW_VERSION = "TEST"
     install4jSuffix = "Test-Local"
     install4jExtraScheme = "jalviewt"
-    install4jInstallerName = "${jalview_name} Test Installer"
+    install4jmacOSArchiveName = "Install ${jalview_name} Test ${JALVIEW_VERSION}"
     backgroundImageText = true
     break
 
@@ -434,6 +437,8 @@ ext {
                                     .replaceAll("_+", "_") // collapse __
                                     .replaceAll("_*-_*", "-") // collapse _-_
                                     .toLowerCase()
+  install4jmacOSArchiveX86Name = "${install4jmacOSArchiveName} (Intel)"
+  install4jmacOSArchiveAarch64Name = "${install4jmacOSArchiveName} (Apple Silicon)"
 
   getdownWrapperLink = install4jUnixApplicationFolder // e.g. "jalview_local"
   getdownAppDir = string("${getdownAppBaseDir}/${getdownAppDistDir}")
@@ -2829,8 +2834,14 @@ task install4jDMGBackgroundImageProcess {
   }
 }
 
-task install4jDMGBackgroundImage {
+task install4jDMGDS_Store {
+  //install4jDMGDS_Store
+  //install4jDMGFixedDSStore
+}
+
+task install4jDMGProcesses {
   dependsOn install4jDMGBackgroundImageProcess
+  dependsOn install4jDMGDS_Store
 }
 
 task installerFiles(type: com.install4j.gradle.Install4jTask) {
@@ -2839,7 +2850,7 @@ task installerFiles(type: com.install4j.gradle.Install4jTask) {
   dependsOn getdown
   dependsOn copyInstall4jTemplate
   dependsOn cleanInstallersDataFiles
-  dependsOn install4jDMGBackgroundImage
+  dependsOn install4jDMGProcesses
 
   projectFile = install4jConfFile
 
@@ -2880,12 +2891,14 @@ task installerFiles(type: com.install4j.gradle.Install4jTask) {
     'WINDOWS_APPLICATION_ID': install4jWinApplicationId,
     'MACOS_DMG_DS_STORE': install4jDMGDSStore,
     'MACOS_DMG_BG_IMAGE': "${install4jDMGBackgroundImageBuildDir}/${install4jDMGBackgroundImageFile}",
+    'MACOS_DMG_BG_FILENAME': install4j_dmg_background_filename,
     'WRAPPER_LINK': getdownWrapperLink,
     'BASH_WRAPPER_SCRIPT': getdown_bash_wrapper_script,
     'POWERSHELL_WRAPPER_SCRIPT': getdown_powershell_wrapper_script,
     'BATCH_WRAPPER_SCRIPT': getdown_batch_wrapper_script,
     'WRAPPER_SCRIPT_BIN_DIR': getdown_wrapper_script_dir,
-    'INSTALLER_NAME': install4jInstallerName,
+    'MACOSARCHIVE_X86_NAME': install4jmacOSArchiveX86Name,
+    'MACOSARCHIVE_AARCH64_NAME': install4jmacOSArchiveAarch64Name,
     'INSTALL4J_UTILS_DIR': install4j_utils_dir,
     'GETDOWN_CHANNEL_DIR': getdownChannelDir,
     'GETDOWN_FILES_DIR': getdown_files_dir,