From: Jalview Build Box Date: Thu, 25 Apr 2019 17:26:31 +0000 (+0100) Subject: JAL-3234 allow gradle builds to run without having to specify keysigning variables... X-Git-Tag: Release_2_11_0~17^2~6 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=31245062876ba32c239a8000f475101625e3c581;p=jalview.git JAL-3234 allow gradle builds to run without having to specify keysigning variables by rewriting install4j flags --- diff --git a/build.gradle b/build.gradle index 66bc5c3..c5416e1 100644 --- a/build.gradle +++ b/build.gradle @@ -821,6 +821,11 @@ 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=="") { + println "Empty '"+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") diff --git a/gradle.properties b/gradle.properties index 45a45f4..f79dac5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -99,5 +99,8 @@ install4jResourceDir = utils/install4j install4jTemplate = install4j_template.install4j install4jBuildDir = build/install4j install4jMediaTypes = windows,macosArchive,linuxRPM,linuxDeb +OSX_KEYSTORE = +OSX_KEYPASS = +JSIGN_SH = echo eclipse_extra_jdt_prefs_file = .settings/org.eclipse.jdt.core.jalview.prefs