git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3449 Fixed Info.plist file insertion. Simplified install4j conf filename
[jalview.git]
/
utils
/
install4j
/
install4j8_template.install4j
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="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>
</variables>
<codeSigning macEnabled="true" macPkcs12File="${compiler:OSX_KEYSTORE}" />
</application>
@@
-115,7
+115,7
@@
</classPath>
</java>
<macStaticAssociationActions mode="selected" />
</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>
<iconImageFiles>
<file path="../../resources/images/JalviewLogo_Huge.png" />
</iconImageFiles>
@@
-137,7
+137,7
@@
</classPath>
</java>
<macStaticAssociationActions mode="selected" />
</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>
<iconImageFiles>
<file path="../../resources/images/JalviewLogo_Huge.png" />
</iconImageFiles>
@@
-150,7
+150,7
@@
</classPath>
</java>
<macStaticAssociationActions mode="selected" />
</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>
<iconImageFiles>
<file path="../../resources/images/JalviewLogo_Huge.png" />
</iconImageFiles>