reportRsyncCommand = false
jvlChannelName = CHANNEL.toLowerCase()
install4jSuffix = CHANNEL.substring(0, 1).toUpperCase() + CHANNEL.substring(1).toLowerCase(); // BUILD -> Build
+ install4jDSStore = "DS_Store-NON-RELEASE"
+ install4jDMGBackgroundImage = "jalview_dmg_background-NON-RELEASE.png"
+ install4jInstallerName = "${jalview_name} Non-Release Installer"
+ install4jExecutableName = jalview_name.replaceAll("[^\\w]+", "_").toLowerCase()
+ install4jExtraScheme = "jalviewx"
switch (CHANNEL) {
case "BUILD":
if ("".equals(testngExcludedGroups)) {
testngExcludedGroups = "Not-bamboo"
}
+ install4jExtraScheme = "jalviewb"
break
case "RELEASE":
getdownAppDistDir = getdown_app_dir_release
reportRsyncCommand = true
install4jSuffix = ""
+ install4jDSStore = "DS_Store"
+ install4jDMGBackgroundImage = "jalview_dmg_background.png"
+ install4jInstallerName = "${jalview_name} Installer"
break
case "ARCHIVE":
buildDist = false
}
reportRsyncCommand = true
+ install4jExtraScheme = "jalviewa"
break
case "ARCHIVELOCAL":
reportRsyncCommand = true
getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}")
install4jSuffix = "Archive"
+ install4jExtraScheme = "jalviewa"
break
case "DEVELOP":
reportRsyncCommand = true
+ install4jExtraScheme = "jalviewd"
break
case "TEST-RELEASE":
reportRsyncCommand = true
- install4jSuffix = "Test"
JALVIEW_VERSION = "TEST"
+ install4jSuffix = "Test"
+ install4jDSStore = "DS_Store-TEST-RELEASE"
+ install4jDMGBackgroundImage = "jalview_dmg_background.png"
+ install4jExtraScheme = "jalviewt"
+ install4jInstallerName = "${jalview_name} Test Installer"
break
case ~/^SCRATCH(|-[-\w]*)$/:
getdownAppBase = file(file("${LOCALDIR}").getAbsolutePath()).toURI().toString()
getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}")
}
- install4jSuffix = "Test-Local"
JALVIEW_VERSION = "TEST"
+ install4jSuffix = "Test-Local"
+ install4jDSStore = "DS_Store-TEST-RELEASE"
+ install4jDMGBackgroundImage = "jalview_dmg_background.png"
+ install4jExtraScheme = "jalviewt"
+ install4jInstallerName = "${jalview_name} Test Installer"
break
case "LOCAL":
getdownAppBase = file(getdownWebsiteDir).toURI().toString()
getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}")
+ install4jExtraScheme = "jalviewl"
break
default: // something wrong specified
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()
+ install4jApplicationName = "${jalview_name}"
+ install4jBundleId = "${install4j_bundle_id}"
} else {
- install4jApplicationName = "${getdown_txt_title} ${install4jSuffix}"
- install4jApplicationFolder = "${getdown_txt_title} ${install4jSuffix}"
- // sanitise folder names
- install4jApplicationFolder = install4jApplicationFolder.replaceAll("[\"'~\\.]", "_")
- install4jUnixApplicationFolder = install4jApplicationFolder.toLowerCase().replaceAll(" ","-")
- }
+ install4jApplicationName = "${jalview_name} ${install4jSuffix}"
+ install4jBundleId = "${install4j_bundle_id}-" + install4jSuffix.toLowerCase()
+ }
+ // sanitise folder and id names
+ // install4jApplicationFolder = e.g. "Jalview Build"
+ install4jApplicationFolder = install4jApplicationName
+ .replaceAll("[\"'~:/\\\\]", "_") // replace all awkward filename chars " ' ~ : / \
+ .replaceAll("_+", "_") // collapse __
+ install4jInternalId = install4jApplicationFolder
+ .replaceAll(" ","_")
+ .replaceAll("[^\\w\\-\\.]", "_") // replace other non [alphanumeric,_,-,.]
+ .replaceAll("_+", "_") // collapse __
+ .replaceAll("_*-_*", "-") // collapse _-_
+ install4jUnixApplicationFolder = install4jInternalId
+ .toLowerCase()
getdownAppDir = string("${getdownWebsiteDir}/${getdownAppDistDir}")
//getdownJ11libDir = "${getdownWebsiteDir}/${getdown_j11lib_dir}"
}
getdownWebsiteResourceFilenames += "${getdownAppDistDir}/${getdown_build_properties}"
- // go through properties looking for getdown_txt_...
+ // set some getdown_txt_ properties then go through all properties looking for getdown_txt_...
def props = project.properties.sort { it.key }
if (getdownAltJavaMinVersion != null && getdownAltJavaMinVersion.length() > 0) {
props.put("getdown_txt_java_min_version", getdownAltJavaMinVersion)
props.put("getdown_txt_multi_java_location", getdownAltMultiJavaLocation)
}
- props.put("getdown_txt_appbase", getdownAppBase)
+ props.put("getdown_txt_title", jalview_name)
+ props.put("getdown_txt_ui.name", install4jApplicationName)
+
+ // start with appbase
+ getdownTextString += "appbase = ${getdownAppBase}\n"
props.each{ prop, val ->
if (prop.startsWith("getdown_txt_") && val != null) {
if (prop.startsWith("getdown_txt_multi_")) {
def getdownLaunchJvl = getdown_launch_jvl_name + ( (jvlChannelName != null && jvlChannelName.length() > 0)?"-${jvlChannelName}":"" ) + ".jvl"
def launchJvl = file("${getdownWebsiteDir}/${getdownLaunchJvl}")
- launchJvl.write("appbase="+props.get("getdown_txt_appbase"))
+ launchJvl.write("appbase=${getdownAppBase}")
copy {
from getdownLauncher
def install4jBuildDir = "${install4j_build_dir}/${JAVA_VERSION}"
variables = [
- 'JALVIEW_NAME': install4jApplicationName,
+ 'JALVIEW_NAME': jalview_name,
+ 'JALVIEW_APPLICATION_NAME': install4jApplicationName,
'JALVIEW_DIR': "../..",
'OSX_KEYSTORE': OSX_KEYSTORE,
'JSIGN_SH': JSIGN_SH,
'WINDOWS_JAVA_VM_TGZ': windowsJavaVMTgz,
'LINUX_JAVA_VM_TGZ': linuxJavaVMTgz,
'COPYRIGHT_MESSAGE': install4j_copyright_message,
- 'MACOS_BUNDLE_ID': install4j_macOS_bundle_id,
- 'INSTALLER_NAME': install4j_installer_name,
+ 'BUNDLE_ID': install4jBundleId,
+ 'INTERNAL_ID': install4jInternalId,
+ 'MACOS_DS_STORE': install4jDSStore,
+ 'MACOS_DMG_BG_IMAGE': install4jDMGBackgroundImage,
+ 'INSTALLER_NAME': install4jInstallerName,
'INSTALL4J_UTILS_DIR': install4j_utils_dir,
'GETDOWN_WEBSITE_DIR': getdown_website_dir,
'GETDOWN_FILES_DIR': getdown_files_dir,
'UNIX_DESKTOP_ADDITIONS': install4j_unix_desktop_additions,
'APPLICATION_FOLDER': install4jApplicationFolder,
'UNIX_APPLICATION_FOLDER': install4jUnixApplicationFolder,
+ 'EXECUTABLE_NAME': install4jExecutableName,
+ 'EXTRA_SCHEME': install4jExtraScheme,
]
+ //println("INSTALL4J VARIABLES:")
+ //variables.each{k,v->println("${k}=${v}")}
+
destination = "${jalviewDir}/${install4jBuildDir}"
buildSelected = true