Linux Jre bundle bugfix

asciidocfx · Feb 18, 2015 · 85c790a · 85c790a
1 parent cacea49
commit 85c790a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,14 +10,11 @@ before_script:
 - sudo apt-get install -y wget
 - wget http://download-aws.ej-technologies.com/install4j/install4j_unix_6_0_1.tar.gz
 - tar zxvf install4j_unix_6_0_1.tar.gz
-- wget -O /home/travis/build/asciidocfx/AsciidocFX/install4j6/jres/macosx-amd64-1.8.0_25.tar.gz
-  http://asciidocfx.com/jres/macosx-amd64-1.8.0_25.tar.gz
-- wget -O /home/travis/build/asciidocfx/AsciidocFX/install4j6/jres/windows-amd64-1.8.0_25.tar.gz
-  http://asciidocfx.com/jres/windows-amd64-1.8.0_25.tar.gz
-- wget -O /home/travis/build/asciidocfx/AsciidocFX/install4j6/jres/windows-x86-1.8.0_25.tar.gz
-  http://asciidocfx.com/jres/windows-x86-1.8.0_25.tar.gz
-- wget -O /home/travis/build/asciidocfx/AsciidocFX/install4j6/jres/macosx-amd64-1.8.0_25_unpacked.tar.gz
-  http://asciidocfx.com/jres/macosx-amd64-1.8.0_25_unpacked.tar.gz
+- wget -O /home/travis/build/asciidocfx/AsciidocFX/install4j6/jres/linux-amd64-1.8.0_31.tar.gz http://asciidocfx.com/jres/linux-amd64-1.8.0_31.tar.gz
+- wget -O /home/travis/build/asciidocfx/AsciidocFX/install4j6/jres/macosx-amd64-1.8.0_25.tar.gz http://asciidocfx.com/jres/macosx-amd64-1.8.0_25.tar.gz
+- wget -O /home/travis/build/asciidocfx/AsciidocFX/install4j6/jres/windows-amd64-1.8.0_25.tar.gz http://asciidocfx.com/jres/windows-amd64-1.8.0_25.tar.gz
+- wget -O /home/travis/build/asciidocfx/AsciidocFX/install4j6/jres/windows-x86-1.8.0_25.tar.gz http://asciidocfx.com/jres/windows-x86-1.8.0_25.tar.gz
+- wget -O /home/travis/build/asciidocfx/AsciidocFX/install4j6/jres/macosx-amd64-1.8.0_25_unpacked.tar.gz http://asciidocfx.com/jres/macosx-amd64-1.8.0_25_unpacked.tar.gz
 - mvn clean
 - mvn install4j:install-license
 deploy:

diff --git a/asciidocfx.install4j b/asciidocfx.install4j
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="6.0.1" transformSequenceNumber="5">
   <directoryPresets config="outputs" />
-  <application name="AsciidocFX" distributionSourceDir="" applicationId="7853-9376-5862-1224" mediaDir="target" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="9" lzmaCompression="true" pack200Compression="true" excludeSignedFromPacking="false" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="AsciidocFX" publisher="AsciidocFX" publisherWeb="http://asciidocfx.com" version="1.3.3" allPathsRelative="false" backupOnSave="false" autoSave="false" convertDotsToUnderscores="true" macSignature="????" macVolumeId="b98c377570068f5e" javaMinVersion="1.8" javaMaxVersion="" allowBetaVM="false" jdkMode="runtimeJre" jdkName="">
+  <application name="AsciidocFX" distributionSourceDir="" applicationId="7853-9376-5862-1224" mediaDir="target" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="9" lzmaCompression="true" pack200Compression="true" excludeSignedFromPacking="false" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="AsciidocFX" publisher="AsciidocFX" publisherWeb="http://asciidocfx.com" version="1.3.3" allPathsRelative="false" backupOnSave="false" autoSave="false" convertDotsToUnderscores="true" macSignature="????" macVolumeId="b98c377570068f5e" javaMinVersion="1.8" javaMaxVersion="" allowBetaVM="true" jdkMode="runtimeJre" jdkName="">
     <languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="false">
       <principalLanguage id="en" customLocalizationFile="" />
       <additionalLanguages />
@@ -61,7 +61,7 @@
       </iconImageFiles>
     </launcher>
   </launchers>
-  <installerGui installerType="1" addOnAppId="" suggestPreviousLocations="true" autoUpdateDescriptorUrl="https://s3.amazonaws.com/asciidoc-fx/updates.xml" useAutoUpdateBaseUrl="false" autoUpdateBaseUrl="https://s3.amazonaws.com/asciidoc-fx/">
+  <installerGui installerType="1" addOnAppId="" suggestPreviousLocations="true" autoUpdateDescriptorUrl="https://s3.amazonaws.com/asciidoc-fx/updates.xml" useAutoUpdateBaseUrl="true" autoUpdateBaseUrl="https://s3.amazonaws.com/asciidoc-fx/">
     <staticMembers script="" />
     <customCode />
     <autoUpdate useMinUpdatableVersion="false" minUpdatableVersion="" useMaxUpdatableVersion="false" maxUpdatableVersion="">
@@ -1378,7 +1378,7 @@ return true;</string>
       <excludedComponents />
       <includedDownloadableComponents />
     </windows>
-    <macos name="Mac OS X Single Bundle" id="108" customizedId="" mediaFileName="AsciidocFX_Mac" installDir="${compiler:sys.fullName}" overridePrincipalLanguage="false" jreBitType="all" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" includedJRE="macosx-amd64-1.8.0_25_unpacked" manualJREEntry="false" bundleType="1" jreURL="" jreShared="false" directDownload="false" installOnlyIfNecessary="false" appleJre="false" requiredVmIdPrefix="" customInstallBaseDir="" contentFilesType="1" downloadURL="" installerName="${i18n:InstallerName(${compiler:sys.fullName})}" volumeName="${compiler:sys.shortName}" compressDmg="false" launcherId="24">
+    <macos name="Mac OS X Single Bundle" id="108" customizedId="" mediaFileName="AsciidocFX_Mac" installDir="${compiler:sys.fullName}" overridePrincipalLanguage="false" jreBitType="all" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" includedJRE="macosx-amd64-1.8.0_25" manualJREEntry="false" bundleType="1" jreURL="" jreShared="false" directDownload="false" installOnlyIfNecessary="false" appleJre="false" requiredVmIdPrefix="" customInstallBaseDir="" contentFilesType="1" downloadURL="" installerName="${i18n:InstallerName(${compiler:sys.fullName})}" volumeName="${compiler:sys.shortName}" compressDmg="false" launcherId="24">
       <excludedBeans />
       <overriddenPrincipalLanguage id="en" customLocalizationFile="" />
       <exclude />
@@ -1402,7 +1402,7 @@ return true;</string>
         <customAttributes />
       </autoUpdate>
     </windowsArchive>
-    <unixArchive name="Unix Archive" id="224" customizedId="" mediaFileName="AsciidocFX_Linux" installDir="${compiler:sys.shortName}" overridePrincipalLanguage="false" jreBitType="all" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" includedJRE="macosx-amd64-1.8.0_25_unpacked" manualJREEntry="false">
+    <unixArchive name="Unix Archive" id="224" customizedId="" mediaFileName="AsciidocFX_Linux" installDir="${compiler:sys.shortName}" overridePrincipalLanguage="false" jreBitType="all" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" includedJRE="linux-amd64-1.8.0_31" manualJREEntry="false">
       <excludedLaunchers />
       <excludedBeans />
       <overriddenPrincipalLanguage id="en" customLocalizationFile="" />
@@ -1449,6 +1449,8 @@ return true;</string>
       </autoUpdate>
     </windowsArchive>
   </mediaSets>
-  <buildIds buildAll="true" />
+  <buildIds buildAll="true">
+    <mediaSet refId="224" />
+  </buildIds>
   <buildOptions verbose="false" faster="false" disableSigning="false" disableJreBundling="false" debug="false" />
 </install4j>