From: Ben Soares <bsoares@dundee.ac.uk>
Date: Fri, 26 Apr 2019 16:25:20 +0000 (+0100)
Subject: Added a unixInstaller and unixArchive media-type to the install4j template.  unixArch... 
X-Git-Tag: Release_2_11_0~16^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=403bf43ead5bc97f6bb12af221fc8509cd9bd437;p=jalview.git

Added a unixInstaller and unixArchive media-type to the install4j template.  unixArchive is now specified in the gradle.properties (unixInstaller can be added).
---

diff --git a/doc/building.html b/doc/building-OLD.html
similarity index 100%
rename from doc/building.html
rename to doc/building-OLD.html
diff --git a/gradle.properties b/gradle.properties
index b9aa082..ce21a65 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -97,7 +97,7 @@ j11modules = com.sun.istack.runtime,com.sun.xml.bind,com.sun.xml.fastinfoset,com
 install4jResourceDir = utils/install4j
 install4jTemplate = install4j_template.install4j
 install4jBuildDir = build/install4j
-install4jMediaTypes = windows,macosArchive,linuxRPM,linuxDeb
+install4jMediaTypes = windows,macosArchive,linuxRPM,linuxDeb,unixArchive
 OSX_KEYSTORE =
 OSX_KEYPASS =
 JSIGN_SH = echo
diff --git a/utils/install4j/install4j_template.install4j b/utils/install4j/install4j_template.install4j
index 95017f9..de1f6af 100644
--- a/utils/install4j/install4j_template.install4j
+++ b/utils/install4j/install4j_template.install4j
@@ -1735,14 +1735,46 @@ return console.askYesNo(message, true);
         <symlink name="Jalview.app/Contents/Resources/app/jre/Contents/MacOS/libjli.dylib" target="../Home/lib/jli/libjli.dylib" />
       </topLevelFiles>
     </macosArchive>
+    <unixInstaller name="Unix Installer" id="1595" customizedId="" mediaFileName="${compiler:sys.shortName}-OFFLINE_${compiler:sys.platform}_installer_${compiler:sys.version}-j$$JAVA_INTEGER_VERSION$$" installDir="${compiler:sys.shortName}" overridePrincipalLanguage="false" jreBitType="all" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="false" includedJRE="" manualJREEntry="false" bundleType="1" jreURL="" jreShared="false" directDownload="false" installOnlyIfNecessary="false" customInstallBaseDir="" contentFilesType="1">
+      <excludedComponents />
+      <includedDownloadableComponents />
+      <excludedLaunchers />
+      <excludedBeans />
+      <overriddenPrincipalLanguage id="en" customLocalizationFile="" />
+      <exclude>
+        <entry location=".i4j_fileset_734" fileType="regular" />
+        <entry location=".i4j_fileset_880" fileType="regular" />
+        <entry location=".i4j_fileset_882" fileType="regular" />
+      </exclude>
+      <variables />
+      <autoUpdate useMinUpdatableVersion="false" minUpdatableVersion="" useMaxUpdatableVersion="false" maxUpdatableVersion="">
+        <commentFiles />
+        <customAttributes />
+      </autoUpdate>
+      <installerScript mode="1" file="">
+        <content />
+      </installerScript>
+    </unixInstaller>
+    <unixArchive name="Unix Archive" id="1596" customizedId="" mediaFileName="${compiler:sys.shortName}-OFFLINE_${compiler:sys.platform}_archive_${compiler:sys.version}-j$$JAVA_INTEGER_VERSION$$" installDir="${compiler:sys.shortName}" overridePrincipalLanguage="false" jreBitType="all" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="true" includedJRE="" manualJREEntry="false">
+      <excludedComponents>
+        <component id="1031" />
+        <component id="1155" />
+        <component id="1156" />
+      </excludedComponents>
+      <includedDownloadableComponents />
+      <excludedLaunchers />
+      <excludedBeans />
+      <overriddenPrincipalLanguage id="en" customLocalizationFile="" />
+      <exclude />
+      <variables />
+      <autoUpdate useMinUpdatableVersion="false" minUpdatableVersion="" useMaxUpdatableVersion="false" maxUpdatableVersion="">
+        <commentFiles />
+        <customAttributes />
+      </autoUpdate>
+    </unixArchive>
   </mediaSets>
-  <buildIds buildAll="false">
-    <mediaSet refId="153" />
-    <mediaSet refId="570" />
-    <mediaSet refId="743" />
-    <mediaSet refId="878" />
-    <mediaSet refId="1272" />
-    <mediaSet refId="1274" />
+  <buildIds buildAll="true">
+    <mediaSet refId="1595" />
   </buildIds>
-  <buildOptions verbose="false" faster="false" disableSigning="false" disableJreBundling="true" debug="false" />
+  <buildOptions verbose="false" faster="false" disableSigning="false" disableJreBundling="false" debug="false" />
 </install4j>