From 5ca1ffcaa6fc78d2c3972f224b4a3ce0701dde7e Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Fri, 3 Apr 2020 17:04:30 +0100 Subject: [PATCH 1/1] JAL-3577 Added a jalviewt scheme ONLY to TEST-RELEASE and TEST-LOCAL channels so that a test jvl can be made to ONLY open in the Test installation --- build.gradle | 4 ++++ utils/install4j/install4j8_template.install4j | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/build.gradle b/build.gradle index d611f63..b47e420 100644 --- a/build.gradle +++ b/build.gradle @@ -143,6 +143,7 @@ ext { install4jDMGBackgroundImage = "jalview_dmg_background-NON-RELEASE.png" install4jInstallerName = "${jalview_name} Installer" install4jExecutableName = jalview_name.replaceAll("[^\\w]+", "_").toLowerCase() + install4jExtraScheme = "jalviewx" switch (CHANNEL) { case "BUILD": @@ -203,6 +204,7 @@ ext { reportRsyncCommand = true install4jSuffix = "Test" JALVIEW_VERSION = "TEST" + install4jExtraScheme = "jalviewt" break case ~/^SCRATCH(|-[-\w]*)$/: @@ -222,6 +224,7 @@ ext { } install4jSuffix = "Test-Local" JALVIEW_VERSION = "TEST" + install4jExtraScheme = "jalviewt" break case "LOCAL": @@ -1429,6 +1432,7 @@ task installers(type: com.install4j.gradle.Install4jTask) { 'APPLICATION_FOLDER': install4jApplicationFolder, 'UNIX_APPLICATION_FOLDER': install4jUnixApplicationFolder, 'EXECUTABLE_NAME': install4jExecutableName, + 'EXTRA_SCHEME': install4jExtraScheme, ] destination = "${jalviewDir}/${install4jBuildDir}" diff --git a/utils/install4j/install4j8_template.install4j b/utils/install4j/install4j8_template.install4j index 0e04ad2..8e9a22c 100644 --- a/utils/install4j/install4j8_template.install4j +++ b/utils/install4j/install4j8_template.install4j @@ -44,6 +44,7 @@ + @@ -457,6 +458,12 @@ return console.askOkCancel(message, true); jalviews + + + 737 + ${compiler:EXTRA_SCHEME} + + -- 1.7.10.2