From 62796f8131afc22f3916a15c67dcc06a3ac4ea7c Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Tue, 1 Nov 2022 14:22:21 +0000 Subject: [PATCH] JAL-4064 tidying build.gradle --- build.gradle | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 8c3f168..f25088b 100644 --- a/build.gradle +++ b/build.gradle @@ -2405,7 +2405,6 @@ task installerFiles(type: com.install4j.gradle.Install4jTask) { 'JAVA_VERSION': JAVA_VERSION, 'JAVA_INTEGER_VERSION': JAVA_INTEGER_VERSION, 'VERSION': JALVIEW_VERSION, - 'COPYRIGHT_MESSAGE': install4j_copyright_message, 'BUNDLE_ID': install4jBundleId, 'INTERNAL_ID': install4jInternalId, @@ -2436,14 +2435,6 @@ task installerFiles(type: com.install4j.gradle.Install4jTask) { 'PNG_ICON_FILE': install4jPngIconFile, 'BACKGROUND': install4jBackground, ] - - - //macosJavaVMDir = string("${jreInstallsDir}/jre-${JAVA_INTEGER_VERSION}-mac-x64/jre") - //windowsJavaVMDir = string("${jreInstallsDir}/jre-${JAVA_INTEGER_VERSION}-windows-x64/jre") - //linuxJavaVMDir = string("${jreInstallsDir}/jre-${JAVA_INTEGER_VERSION}-linux-x64/jre") - //macosJavaVMTgz = string("${jreInstallsDir}/tgz/jre_${JAVA_INTEGER_VERSION}_mac_x64.tar.gz") - //windowsJavaVMTgz = string("${jreInstallsDir}/tgz/jre_${JAVA_INTEGER_VERSION}_windows_x64.tar.gz") - //linuxJavaVMTgz = string("${jreInstallsDir}/tgz/jre_${JAVA_INTEGER_VERSION}_linux_x64.tar.gz") def varNameMap = [ 'mac': 'MACOS', @@ -2467,8 +2458,8 @@ task installerFiles(type: com.install4j.gradle.Install4jTask) { variables[ sprintf("%s_%s_JAVA_VM_TGZ", varNameMap[os], arch.toUpperCase(Locale.ROOT)) ] = sprintf("%s/tgz/jre_%s_%s_%s.tar.gz", jreInstallsDir, JAVA_INTEGER_VERSION, os, arch) } - println("INSTALL4J VARIABLES:") - variables.each{k,v->println("${k}=${v}")} + //println("INSTALL4J VARIABLES:") + //variables.each{k,v->println("${k}=${v}")} destination = "${jalviewDir}/${install4jBuildDir}" buildSelected = true -- 1.7.10.2