JAL-3247 Note in launcher.log when using a JVL file

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 66bc5c3..2f50c3d 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -722,7 +722,9 @@ task getdownWebsite() {
      }
      */
 
-    getdownTextString += "code = " + file(getdownLauncher).getName() + "\n"
+    // getdown-launcher.jar should not be in main application class path so the main application can move it when updated.  Listed as a resource so it gets updated.
+    //getdownTextString += "class = " + file(getdownLauncher).getName() + "\n"
+    getdownTextString += "resource = " + file(getdownLauncher).getName() + "\n"
     getdownTextString += "class = " + mainClass + "\n"
 
     def getdown_txt = file(project.ext.getdownWebsiteDir + "/getdown.txt")
@@ -771,6 +773,7 @@ task getdownDigest(type: JavaExec) {
   classpath file(jalviewDir + '/' + getdown_lib1)
   main = "com.threerings.getdown.tools.Digester"
   args project.ext.getdownWebsiteDir
+  inputs.dir(project.ext.getdownWebsiteDir)
   outputs.file(project.ext.getdownWebsiteDir + '/' + "digest2.txt")
 }
 
@@ -821,6 +824,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")