From: Ben Soares <bsoares@dundee.ac.uk>
Date: Fri, 3 Apr 2020 16:04:30 +0000 (+0100)
Subject: JAL-3577 Added a jalviewt scheme ONLY to TEST-RELEASE and TEST-LOCAL channels so... 
X-Git-Tag: Develop-2_11_2_0-d20201215~54
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5ca1ffcaa6fc78d2c3972f224b4a3ce0701dde7e;p=jalview.git

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
---

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 @@
       <variable name="APPLICATION_FOLDER" value="Jalview" />
       <variable name="UNIX_APPLICATION_FOLDER" value="jalview" />
       <variable name="EXECUTABLE_NAME" value="jalview" />
+      <variable name="EXTRA_SCHEME" value="jalviewx" />
     </variables>
     <codeSigning macEnabled="true" macPkcs12File="${compiler:OSX_KEYSTORE}" />
   </application>
@@ -457,6 +458,12 @@ return console.askOkCancel(message, true);
                   <property name="scheme" type="string">jalviews</property>
                 </serializedBean>
               </action>
+              <action id="2641" beanClass="com.install4j.runtime.beans.actions.desktop.UrlHandlerAction" actionElevationType="elevated" rollbackBarrierExitCode="0">
+                <serializedBean>
+                  <property name="launcherId" type="string">737</property>
+                  <property name="scheme" type="string">${compiler:EXTRA_SCHEME}</property>
+                </serializedBean>
+              </action>
             </actions>
             <formComponents>
               <formComponent id="16" beanClass="com.install4j.runtime.beans.formcomponents.ProgressComponent">