JAL-3577 First attempt at new folder names

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 58d2764..b651ab1 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -136,8 +136,9 @@ ext {
   getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher}")
   getdownAppDistDir = getdown_app_dir_alt
   buildProperties = string("${classesDir}/${build_properties_file}")
-  reportRsyncCmd = false
+  reportRsyncCommand = false
   jvlChannelName = CHANNEL.toLowerCase()
+  install4jSuffix = CHANNEL.substring(0, 1).toUpperCase() + CHANNEL.substring(1).toLowerCase(); // BUILD -> Build
   switch (CHANNEL) {
 
     case "BUILD":
@@ -155,6 +156,7 @@ ext {
     case "RELEASE":
     getdownAppDistDir = getdown_app_dir_release
     reportRsyncCommand = true
+    install4jSuffix = ""
     break
 
     case "ARCHIVE":
@@ -184,6 +186,7 @@ ext {
     }
     reportRsyncCommand = true
     getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}")
+    install4jSuffix = "Archive"
     break
 
     case "DEVELOP":
@@ -192,6 +195,8 @@ ext {
 
     case "TEST-RELEASE":
     reportRsyncCommand = true
+    install4jSuffix = "Test"
+    JALVIEW_VERSION = "TEST"
     break
 
     case ~/^SCRATCH(|-[-\w]*)$/:
@@ -199,6 +204,7 @@ ext {
     getdownDir = string("${getdownChannelName}/${JAVA_VERSION}")
     getdownAppBase = string("${getdown_channel_base}/${getdownDir}")
     reportRsyncCommand = true
+    install4jSuffix = "Scratch"
     break
 
     case "TEST-LOCAL":
@@ -208,6 +214,8 @@ ext {
       getdownAppBase = file(file("${LOCALDIR}").getAbsolutePath()).toURI().toString()
       getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}")
     }
+    install4jSuffix = "Test-Local"
+    JALVIEW_VERSION = "TEST"
     break
 
     case "LOCAL":
@@ -226,7 +234,19 @@ ext {
     println("Overriding getdown appbase with '${getdownAppBase}'")
   }
   // sanitise file name for jalview launcher file for this channel
-  jvlChannelName = jvlChannelName.replaceAll(/[^\w\-]/,"_")
+  jvlChannelName = jvlChannelName.replaceAll("[^\\w\\-]", "_")
+  // install4j application and folder names
+  if (install4jSuffix == "") {
+    install4jApplicationName = "${getdown_txt_title}"
+    install4jApplicationFolder = "${getdown_txt_title}"
+    install4jUnixApplicationFolder = install4jApplicationFolder.toLowerCase()
+  } else {
+    install4jApplicationName = "${getdown_txt_title} ${install4jSuffix}"
+    install4jApplicationFolder = "${getdown_txt_title} ${install4jSuffix}"
+    // sanitise folder names
+    install4jApplicationFolder = install4jApplicationFolder.replaceAll("[\"'~\\.]", "_")
+    install4jUnixApplicationFolder = install4jApplicationFolder.toLowerCase().replaceAll(" ","-")
+  }
 
   getdownAppDir = string("${getdownWebsiteDir}/${getdownAppDistDir}")
   //getdownJ11libDir = "${getdownWebsiteDir}/${getdown_j11lib_dir}"
@@ -1359,7 +1379,7 @@ task installers(type: com.install4j.gradle.Install4jTask) {
   def install4jBuildDir = "${install4j_build_dir}/${JAVA_VERSION}"
 
   variables = [
-    'JALVIEW_NAME': getdown_txt_title,
+    'JALVIEW_NAME': install4jApplicationName,
     'JALVIEW_DIR': "../..",
     'OSX_KEYSTORE': OSX_KEYSTORE,
     'JSIGN_SH': JSIGN_SH,
@@ -1390,6 +1410,8 @@ task installers(type: com.install4j.gradle.Install4jTask) {
     'INFO_PLIST_FILE_ASSOCIATIONS_FILE': install4j_info_plist_file_associations,
     'BUILD_DIR': install4jBuildDir,
     'UNIX_DESKTOP_ADDITIONS': install4j_unix_desktop_additions,
+    'APPLICATION_FOLDER': install4jApplicationFolder,
+    'UNIX_APPLICATION_FOLDER': install4jUnixApplicationFolder,
   ]
 
   destination = "${jalviewDir}/${install4jBuildDir}"