JAL-3235 isolated the 'unsafe' override of entrySet to the saveProperties method...

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index f41e2b3..92d2021 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -821,6 +821,10 @@ task copyInstall4jTemplate(type: Copy) {
     rename (install4jTemplate, install4jConfFile)
     filter(ReplaceTokens, beginToken: '', endToken: '', tokens: ['9999999999': JAVA_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])
+    if (OSX_KEYPASS=="") {
+      filter(ReplaceTokens, beginToken: 'codeSigning macEnabled="', endToken: '"', tokens: ['true':'codeSigning macEnabled="false"'])
+      filter(ReplaceTokens, beginToken: 'runPostProcessor="true" ',endToken: 'Processor', tokens: ['post':'runPostProcessor="false" postProcessor'])
+    }
   }
   into install4jDir
   inputs.files("$install4jDir/$install4jTemplate")
@@ -834,9 +838,15 @@ task installers(type: com.install4j.gradle.Install4jTask) {
   dependsOn copyInstall4jTemplate
   projectFile = file(install4jConf)
   println("Using projectFile "+projectFile)
-  variables = [majorVersion: version.substring(2, 11), build: 001]
+  variables = [majorVersion: version.substring(2, 11), build: 001, OSX_KEYSTORE: OSX_KEYSTORE, JSIGN_SH: JSIGN_SH]
   destination = "$jalviewDir/$install4jBuildDir/$JAVA_VERSION"
   buildSelected = true
+
+  if (OSX_KEYPASS) {
+    macKeystorePassword=OSX_KEYPASS
+    
+  }
+  
   inputs.dir(project.ext.getdownWebsiteDir)
   inputs.file(install4jConf)
   inputs.dir(macosJavaVMDir)