From: Jim Procter Date: Mon, 22 Apr 2019 12:53:58 +0000 (+0100) Subject: JAL-3224 JAL-3196 still trying to specify projectFile property for install4j X-Git-Tag: Release_2_11_0~17^2~7^2~16 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=26996cec0d0f2fe4ebafee173b6a03cdfc143b4e;p=jalview.git JAL-3224 JAL-3196 still trying to specify projectFile property for install4j --- diff --git a/build.gradle b/build.gradle index a2bcfb7..3495877 100644 --- a/build.gradle +++ b/build.gradle @@ -640,9 +640,11 @@ install4j { def install4jConf def macosJavaVMDir def windowsJavaVMDir +def install4jDir = "$jalviewDir/$install4jResourceDir" +def install4jConfFile = "jalview-installers-java"+JAVA_VERSION+".install4j" +install4jConf = "$install4jDir/$install4jConfFile" + task copyInstall4jTemplate(type: Copy) { - def install4jDir = "$jalviewDir/$install4jResourceDir" - def install4jConfFile = "jalview-installers-java"+JAVA_VERSION+".install4j" macosJavaVMDir = System.env.HOME+"/buildtools/jre/openjdk-java_vm/macos-jre"+JAVA_VERSION+"/java_vm" windowsJavaVMDir = System.env.HOME+"/buildtools/jre/openjdk-java_vm/windows-jre"+JAVA_VERSION+"/java_vm" from (install4jDir) { @@ -652,7 +654,6 @@ task copyInstall4jTemplate(type: Copy) { filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['VERSION': JALVIEW_VERSION, 'MACOS_JAVA_VM_DIR': macosJavaVMDir, 'WINDOWS_JAVA_VM_DIR': windowsJavaVMDir]) } into install4jDir - install4jConf = "$install4jDir/$install4jConfFile" inputs.files("$install4jDir/$install4jTemplate") outputs.files(install4jConf) }