From: Ben Soares Date: Sat, 4 Apr 2020 00:01:39 +0000 (+0100) Subject: JAL-3577 Added DS_Store for Test release to look like proper installer X-Git-Tag: Develop-2_11_2_0-d20201215~53 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8f88ecf0e8a1cde5df1e5a2e81a2b03c61c370a8;p=jalview.git JAL-3577 Added DS_Store for Test release to look like proper installer --- diff --git a/build.gradle b/build.gradle index b47e420..69a7fb6 100644 --- a/build.gradle +++ b/build.gradle @@ -141,7 +141,7 @@ ext { 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} Installer" + install4jInstallerName = "${jalview_name} Non-Release Installer" install4jExecutableName = jalview_name.replaceAll("[^\\w]+", "_").toLowerCase() install4jExtraScheme = "jalviewx" switch (CHANNEL) { @@ -156,6 +156,7 @@ ext { if ("".equals(testngExcludedGroups)) { testngExcludedGroups = "Not-bamboo" } + install4jExtraScheme = "jalviewb" break case "RELEASE": @@ -164,6 +165,7 @@ ext { install4jSuffix = "" install4jDSStore = "DS_Store" install4jDMGBackgroundImage = "jalview_dmg_background.png" + install4jInstallerName = "${jalview_name} Installer" break case "ARCHIVE": @@ -178,6 +180,7 @@ ext { buildDist = false } reportRsyncCommand = true + install4jExtraScheme = "jalviewa" break case "ARCHIVELOCAL": @@ -194,17 +197,22 @@ ext { 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]*)$/: @@ -222,14 +230,18 @@ ext { 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 @@ -249,7 +261,6 @@ ext { install4jApplicationName = "${jalview_name}" } else { install4jApplicationName = "${jalview_name} ${install4jSuffix}" - install4jInstallerName = "${jalview_name} Non-Release Installer" } // sanitise folder names install4jApplicationFolder = install4jApplicationName diff --git a/utils/install4j/DS_Store-TEST-RELEASE b/utils/install4j/DS_Store-TEST-RELEASE new file mode 100644 index 0000000..164c584 Binary files /dev/null and b/utils/install4j/DS_Store-TEST-RELEASE differ