JAL-3449 Fixed Info.plist file insertion. Simplified install4j conf filename

diff --git a/.gitignore b/.gitignore
index d16c201..8601715 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ TESTNG
 /getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Build.java
 /getdown/src/getdown/launcher/dependency-reduced-pom.xml
 /utils/install4j/jalview-installers-*.install4j
+/utils/install4j/jalview-install4j-conf.install4j
 *.swp
 /bin
 /doc/building.html

diff --git a/build.gradle b/build.gradle
index 1e2c719..a6a3cec 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -1283,7 +1283,6 @@ task installers(type: com.install4j.gradle.Install4jTask) {
   install4jTemplateMd5 += filesMd5
   install4jTemplateMd5 += "_${gitHash}"
   def install4jTemplateVersion = "${JALVIEW_VERSION}_${install4jTemplateMd5}"
-  def infoPlistFileAssociations = file("${install4jDir}/${install4j_info_plist_file_associations}").text
 
   variables = [
     'OSX_KEYSTORE': OSX_KEYSTORE,
@@ -1306,7 +1305,7 @@ task installers(type: com.install4j.gradle.Install4jTask) {
     'GETDOWN_DIST_DIR': getdown_app_dir,
     'GETDOWN_ALT_DIR': getdown_app_dir_alt,
     'GETDOWN_INSTALL_DIR': getdown_install_dir,
-    'INFO_PLIST_FILE_ASSOCIATIONS': infoPlistFileAssociations
+    'INFO_PLIST_FILE_ASSOCIATIONS_FILE': "${install4j_info_plist_file_associations}",
   ]
   destination = "${jalviewDir}/${install4j_build_dir}/${JAVA_VERSION}"
   buildSelected = true

diff --git a/utils/install4j/install4j8_template.install4j b/utils/install4j/install4j8_template.install4j
index bd504f3..f9d5c8f 100644 (file)
--- a/utils/install4j/install4j8_template.install4j
+++ b/utils/install4j/install4j8_template.install4j
@@ -29,7 +29,7 @@
       <variable name="GETDOWN_DIST_DIR" />
       <variable name="GETDOWN_ALT_DIR" />
       <variable name="GETDOWN_INSTALL_DIR" />
-      <variable name="INFO_PLIST_FILE_ASSOCIATIONS" />
+      <variable name="INFO_PLIST_FILE_ASSOCIATIONS_FILE" />
     </variables>
     <codeSigning macEnabled="true" macPkcs12File="${compiler:OSX_KEYSTORE}" />
   </application>
@@ -115,7 +115,7 @@
         </classPath>
       </java>
       <macStaticAssociationActions mode="selected" />
-      <infoPlist>${compiler:INFO_PLIST_FILE_ASSOCIATIONS}</infoPlist>
+      <infoPlist>${compiler:file("${compiler:INFO_PLIST_FILE_ASSOCIATIONS_FILE}")}</infoPlist>
       <iconImageFiles>
         <file path="../../resources/images/JalviewLogo_Huge.png" />
       </iconImageFiles>
@@ -137,7 +137,7 @@
         </classPath>
       </java>
       <macStaticAssociationActions mode="selected" />
-      <infoPlist>${compiler:INFO_PLIST_FILE_ASSOCIATIONS}</infoPlist>
+      <infoPlist>${compiler:file("${compiler:INFO_PLIST_FILE_ASSOCIATIONS_FILE}")}</infoPlist>
       <iconImageFiles>
         <file path="../../resources/images/JalviewLogo_Huge.png" />
       </iconImageFiles>
@@ -150,7 +150,7 @@
         </classPath>
       </java>
       <macStaticAssociationActions mode="selected" />
-      <infoPlist>${compiler:INFO_PLIST_FILE_ASSOCIATIONS}</infoPlist>
+      <infoPlist>${compiler:file("${compiler:INFO_PLIST_FILE_ASSOCIATIONS_FILE}")}</infoPlist>
       <iconImageFiles>
         <file path="../../resources/images/JalviewLogo_Huge.png" />
       </iconImageFiles>