From: Ben Soares <bsoares@dundee.ac.uk>
Date: Fri, 6 Dec 2019 17:42:49 +0000 (+0000)
Subject: JAL-3394 disableSigning=true when DEV
X-Git-Tag: Develop-2_11_2_0-d20201215~80^2~28^2~21
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c0035f21de87fd0f2b04dadc8baf3aa0e2e78f14;p=jalview.git

JAL-3394 disableSigning=true when DEV
---

diff --git a/build.gradle b/build.gradle
index cdea714..37f1ad3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1208,9 +1208,6 @@ install4j {
   installDir(file(install4jHomeDir))
 
   mediaTypes = Arrays.asList(install4j_media_types.split(","))
-  if (install4j_faster.equals("true") || CHANNEL.startsWith("DEVELOP") || CHANNEL.startsWith("LOCAL")) {
-    faster = true
-  }
 }
 
 
@@ -1238,38 +1235,7 @@ task copyInstall4jTemplate(type: Copy) {
   from (install4jDir) {
     include install4j_template
     rename (install4j_template, install4jConfFileName)
-    /*
-    filter(ReplaceTokens,
-      beginToken: '',
-      endToken: '',
-      tokens: [
-        '0000000000': JAVA_MIN_VERSION,
-        '9999999999': JAVA_MAX_VERSION
-      ]
-    )
-
-    filter(ReplaceTokens,
-      beginToken: '$$',
-      endToken: '$$',
-      tokens: [
-        'JAVA_VERSION': JAVA_VERSION,
-        'JAVA_INTEGER_VERSION': JAVA_INTEGER_VERSION,
-        'VERSION': JALVIEW_VERSION,
-        'MACOS_JAVA_VM_DIR': macosJavaVMDir,
-        'MACOS_JAVA_VM_TGZ': macosJavaVMTgz,
-        'WINDOWS_JAVA_VM_DIR': windowsJavaVMDir,
-        'WINDOWS_JAVA_VM_TGZ': windowsJavaVMTgz,
-        'INSTALL4JINFOPLISTFILEASSOCIATIONS': install4j_info_plist_file_associations,
-        'INSTALLER_TEMPLATE_MD5': install4jTemplateMd5,
-        'COPYRIGHT_MESSAGE': install4j_copyright_message,
-        'MACOS_BUNDLE_ID': install4j_macOS_bundle_id,
-        'GETDOWN_RESOURCE_DIR': getdown_resource_dir,
-        'GETDOWN_DIST_DIR': getdown_app_dir,
-        'GETDOWN_ALT_DIR': getdown_app_dir_alt,
-        'GETDOWN_INSTALL_DIR': getdown_install_dir
-      ]
-    )
-    */
+    // TODO change these ReplaceTokens to something better.  Possibly ${compiler:variables} but also the ant.replaceregexp below, or perhaps a proper xmldom parse
     if (OSX_KEYPASS == "") {
       filter(ReplaceTokens,
         beginToken: 'codeSigning macEnabled="',
@@ -1367,6 +1333,12 @@ task installers(type: com.install4j.gradle.Install4jTask) {
   destination = "${jalviewDir}/${install4j_build_dir}/${JAVA_VERSION}"
   buildSelected = true
 
+  if (install4j_faster.equals("true") || CHANNEL.startsWith("DEVELOP") || CHANNEL.startsWith("LOCAL")) {
+    // this doesn't seem to work
+    faster = true
+    disableSigning = true
+  }
+
   if (OSX_KEYPASS) {
     macKeystorePassword=OSX_KEYPASS
   }