X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=fb311a4ebdcbfa798dc05aef1ad5639eaf65e15f;hb=74393b51f368cb9f58589472d432a433d9c4386d;hp=2e51f15b80a1196edf72259faddc802dc6d165b7;hpb=0bbf6c2ef8c0f28d909aa7921f9ea08d16954de6;p=jalview.git

diff --git a/build.gradle b/build.gradle
index 2e51f15..fb311a4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -800,7 +800,7 @@ install4j {
   }
   installDir = file(install4jHomeDir)
   mediaTypes = Arrays.asList(install4jMediaTypes.split(","))
-  if (dev.equals("true")) {
+  if (install4jFaster.equals("true")) {
     faster = true
   }
 }
@@ -846,15 +846,26 @@ task copyInstall4jTemplate(type: Copy) {
   outputs.files(install4jConf)
 
   doLast {
+    // include file associations in installer
     def installerFileAssociationsXml = file("$install4jDir/$install4jInstallerFileAssociations").text
     ant.replaceregexp(
       byline: false,
       flags: "s",
       match: '<action name="EXTENSIONS_REPLACED_BY_GRADLE".*?</action>',
-      //match: '<action.*?EXTENSIONS_REPLACED_BY_GRADLE.*?</action>',
       replace: installerFileAssociationsXml,
       file: install4jConf
     )
+    /*
+    // include uninstaller applescript app files in dmg
+    def installerDMGUninstallerXml = file("$install4jDir/$install4jDMGUninstallerAppFiles").text
+    ant.replaceregexp(
+      byline: false,
+      flags: "s",
+      match: '<file name="UNINSTALL_OLD_JALVIEW_APP_REPLACED_IN_GRADLE" file=.*?>',
+      replace: installerDMGUninstallerXml,
+      file: install4jConf
+    )
+    */
   }
 }