[jsword-svn] r2329 - in trunk/bibledesktop: . etc/installer/macosx etc/installer/macosx/Bible Desktop.app/Contents etc/installer/macosx/Bible Desktop.app/Contents/MacOS etc/installer/macosx/Bible Desktop.app/Contents/Resources etc/installer/macosx/Bible Desktop.app/Contents/Resources/de.lproj etc/installer/macosx/Bible Desktop.app/Contents/Resources/en.lproj etc/installer/macosx/Bible Desktop.app/Contents/Resources/fr.lproj
dmsmith at crosswire.org
dmsmith at crosswire.org
Sat Mar 19 09:22:27 MST 2016
Author: dmsmith
Date: 2016-03-19 09:22:27 -0700 (Sat, 19 Mar 2016)
New Revision: 2329
Added:
trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/
trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Info.plist
trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Java/
trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/MacOS/JavaAppLauncher
trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/de.lproj/
trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/de.lproj/Localizable.strings
trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/en.lproj/
trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/en.lproj/Localizable.strings
trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/fr.lproj/
trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/fr.lproj/Localizable.strings
Removed:
trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Info.plist
Modified:
trunk/bibledesktop/build.xml
trunk/bibledesktop/etc/installer/macosx/readme.txt
Log:
Update MacOSX app for Java 7 and above. Source is still Java 5 compatible.
Modified: trunk/bibledesktop/build.xml
===================================================================
--- trunk/bibledesktop/build.xml 2016-01-23 16:54:30 UTC (rev 2328)
+++ trunk/bibledesktop/build.xml 2016-03-19 16:22:27 UTC (rev 2329)
@@ -50,7 +50,7 @@
<!--=======================================================================-->
<target name="package.extra"
- depends="package.webstart, package.macosx, package.windows"/>
+ depends="package.macosx, package.windows"/> <!-- package.webstart, -->
<!-- Package the command-line distribution -->
<target name="package.bin">
@@ -126,7 +126,7 @@
<target name="package.macosx">
<mkdir dir="${package.bd.dir}"/>
<copy verbose="${verbose.copy}"
- file="${etc.dir}/installer/macosx/BibleDesktop.app/Contents/Info.plist"
+ file="${etc.dir}/installer/macosx/Bible Desktop.app/Contents/Info.plist"
toFile="${package.bd.dir}/Info.plist"
preservelastmodified="true">
<filterset>
@@ -134,28 +134,28 @@
</filterset>
</copy>
- <zip destfile="${package.bd.dir}/BibleDesktop.app.zip" update="true">
+ <zip destfile="${package.bd.dir}/Bible Desktop.app.zip" update="true">
<!-- Copy everything but the executable (zip will not preserve permissions)
== And Info.plist, which needs to be filtered.
-->
<zipfileset
- prefix="BibleDesktop.app"
- dir="${etc.dir}/installer/macosx/BibleDesktop.app">
- <exclude name="**/*JavaApplicationStub*"/>
+ prefix="Bible Desktop.app"
+ dir="${etc.dir}/installer/macosx/Bible Desktop.app">
+ <exclude name="**/*JavaAppLauncher*"/>
<exclude name="**/*Info.plist"/>
</zipfileset>
<!-- Copy the executable and set the right permissions -->
<zipfileset
- prefix="BibleDesktop.app/Contents/MacOS"
+ prefix="Bible Desktop.app/Contents/MacOS"
filemode="755"
- file="${etc.dir}/installer/macosx/BibleDesktop.app/Contents/MacOS/JavaApplicationStub"/>
+ file="${etc.dir}/installer/macosx/Bible Desktop.app/Contents/MacOS/JavaAppLauncher"/>
<!-- Copy the filtered Info.plist file -->
<zipfileset
- prefix="BibleDesktop.app/Contents"
+ prefix="Bible Desktop.app/Contents"
file="${package.bd.dir}/Info.plist"/>
<!-- Add in all the unsigned jars -->
<zipfileset
- prefix="BibleDesktop.app/Contents/Resources/Java"
+ prefix="Bible Desktop.app/Contents/Java"
dir="${lib.dir}">
<patternset refid="patternset.runtime"/>
</zipfileset>
@@ -163,6 +163,36 @@
<delete file="${package.bd.dir}/Info.plist"/>
</target>
+ <target name="package.macosx.bundler"
+ depends="appbundler.task"
+ if="appbundler.available">
+ <mkdir dir="${package.bd.dir}"/>
+ <bundleapp
+ jrepreferred="true"
+ outputdirectory="${package.bd.dir}"
+ name="Bible Desktop"
+ displayname="Bible Desktop"
+ identifier="org.crosswire.jsword"
+ mainclassname="org.crosswire.bibledesktop.desktop.Desktop"
+ icon="${etc.dir}/installer/macosx/Bible Desktop.app/Contents/Resources/BibleDesktop.icns"
+ shortversion="@release.version@"
+ version="@release.version@"
+ copyright="Bible Desktop v at release.version@ (c) 2016"
+ >
+ <classpath dir="${lib.dir}">
+ <patternset refid="patternset.runtime"/>
+ </classpath>
+ <option value="-Xdock:name=Bible Desktop"/>
+ <option value="-Dapple.laf.useScreenMenuBar=true"/>
+ <option value="-Dcom.apple.macos.use-file-dialog-packages=true"/>
+ <option value="-Dcom.apple.macos.useScreenMenuBar=true"/>
+ <option value="-Dcom.apple.mrj.application.apple.menu.about.name=Bible Desktop"/>
+ <option value="-Dcom.apple.smallTabs=true"/>
+ <option value="-Dfile.encoding=UTF-8"/>
+ <option value="-Xmx1024M" name="Xmx"/>
+ </bundleapp>
+ </target>
+
<!-- Build the Windows installers -->
<target name="package.windows"
depends="nsis.task"
Deleted: trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Info.plist
===================================================================
--- trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist 2016-01-18 21:13:49 UTC (rev 2325)
+++ trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Info.plist 2016-03-19 16:22:27 UTC (rev 2329)
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleName</key>
- <string>Bible Desktop</string>
- <key>CFBundleIdentifier</key>
- <string>org.crosswire.jsword</string>
- <key>CFBundleVersion</key>
- <string>@release.version@</string>
- <key>CFBundleAllowMixedLocalizations</key>
- <string>true</string>
- <key>CFBundleExecutable</key>
- <string>JavaApplicationStub</string>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleGetInfoString</key>
- <string>Bible Desktop v at release.version@ (c) 2015</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleIconFile</key>
- <string>BibleDesktop.icns</string>
- <key>Java</key>
- <dict>
- <key>WorkingDirectory</key>
- <string>$APP_PACKAGE/Contents/Resources/Java</string>
- <key>VMOptions</key>
- <string>-Xmx512Mm</string>
- <key>MainClass</key>
- <string>org.crosswire.bibledesktop.desktop.Desktop</string>
- <key>JVMVersion</key>
- <string>1.6</string>
- <key>ClassPath</key>
- <array>
- <string>$JAVAROOT/bibledesktop- at release.version@.jar</string>
- <string>$JAVAROOT/jsword- at release.version@.jar</string>
- <string>$JAVAROOT/jsword-common-aqua-1.0.6.jar</string>
- <string>$JAVAROOT/lucene-core-3.0.3.jar</string>
- <string>$JAVAROOT/lucene-snowball-3.0.3.jar</string>
- <string>$JAVAROOT/lucene-analyzers-3.0.3.jar</string>
- <string>$JAVAROOT/lucene-smartcn-3.0.3.jar</string>
- <string>$JAVAROOT/jdom2-2.0.6.jar</string>
- <string>$JAVAROOT/icu4j-54.1.1.jar</string>
- <string>$JAVAROOT/commons-codec-1.10.jar</string>
- <string>$JAVAROOT/commons-collections4-4.0.jar</string>
- <string>$JAVAROOT/commons-compress-1.9.jar</string>
- <string>$JAVAROOT/commons-configuration-1.10.jar</string>
- <string>$JAVAROOT/commons-net-3.3.jar</string>
- <string>$JAVAROOT/httpcore-4.4.jar</string>
- <string>$JAVAROOT/httpclient-4.4.jar</string>
- <string>$JAVAROOT/slf4j-api-1.7.6.jar</string>
- <string>$JAVAROOT/slf4j-jdk14-1.7.6.jar</string>
- <string>$JAVAROOT/jcl-over-slf4j-1.7.6.jar</string>
- <string>$JAVAROOT/xz-1.4.jar</string>
- <string>$JAVAROOT/jlfgr-1_0.jar</string>
- </array>
- <key>Properties</key>
- <dict>
- <key>apple.laf.useScreenMenuBar</key>
- <string>true</string>
- </dict>
- </dict>
-</dict>
-</plist>
Copied: trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Info.plist (from rev 2326, trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist)
===================================================================
--- trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Info.plist (rev 0)
+++ trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Info.plist 2016-03-19 16:22:27 UTC (rev 2329)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>JavaAppLauncher</string>
+ <key>CFBundleIconFile</key>
+ <string>BibleDesktop.icns</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.crosswire.jsword</string>
+ <key>CFBundleDisplayName</key>
+ <string>Bible Desktop</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>Bible Desktop</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>@release.version@</string>
+ <key>CFBundleVersion</key>
+ <string>@release.version@</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>NSHumanReadableCopyright</key>
+ <string>Bible Desktop v at release.version@ (c) 2016</string>
+ <key>NSHighResolutionCapable</key>
+ <true/>
+ <key>NSSupportsAutomaticGraphicsSwitching</key>
+ <true/>
+ <key>JVMVersion</key>
+ <string>1.7</string>
+ <key>JREPreferred</key>
+ <true/>
+ <key>JVMMainClassName</key>
+ <string>org.crosswire.bibledesktop.desktop.Desktop</string>
+ <key>CFBundleDocumentTypes</key>
+ <array/>
+ <key>LSArchitecturePriority</key>
+ <array/>
+ <key>LSEnvironment</key>
+ <dict>
+ <key>LC_CTYPE</key>
+ <string>UTF-8</string>
+ </dict>
+ <key>JVMOptions</key>
+ <array>
+ <string>-Xdock:name=Bible Desktop</string>
+ <string>-Dapple.laf.useScreenMenuBar=true</string>
+ <string>-Dcom.apple.macos.use-file-dialog-packages=true</string>
+ <string>-Dcom.apple.macos.useScreenMenuBar=true</string>
+ <string>-Dcom.apple.mrj.application.apple.menu.about.name=Bible Desktop</string>
+ <string>-Dcom.apple.smallTabs=true</string>
+ <string>-Dfile.encoding=UTF-8</string>
+ </array>
+ <key>JVMDefaultOptions</key>
+ <dict>
+ <key>Xmx</key>
+ <string>-Xmx1024M</string>
+ </dict>
+ <key>JVMArguments</key>
+ <array/>
+</dict>
+</plist>
Added: trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/MacOS/JavaAppLauncher
===================================================================
(Binary files differ)
Property changes on: trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/MacOS/JavaAppLauncher
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/de.lproj/Localizable.strings
===================================================================
--- trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/de.lproj/Localizable.strings (rev 0)
+++ trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/de.lproj/Localizable.strings 2016-03-19 16:22:27 UTC (rev 2329)
@@ -0,0 +1,7 @@
+"JRELoadError" = "Die Java Laufzeitumgebung konnte nicht geladen werden.";
+"JRExLoadError" = "Die Java %d Laufzeitumgebung konnte nicht geladen werden.";
+"JRExLoadFullError" = "Diese Anwendung benötigt die Java %d Laufzeitumgebung oder höher auf Ihrem Computer installiert sein. Bitte installieren Sie die neueste Version von Java von www.java.com und erneut versuchen.";
+"JDKxLoadFullError" = "Diese Anwendung benötigt die Java %d Laufzeitumgebung oder höher auf Ihrem Computer installiert sein. Bitte installieren Sie die neueste JDK von Oracle.com und erneut versuchen.";
+"MainClassNameRequired" = "Hauptklassenname ist erforderlich.";
+"JavaDirectoryNotFound" = "Das Java Verzeichnis ist nicht vorhanden.";
+"BundlePathContainsColon" = "Kann nicht vom einem Ordner aus starten, der \"/\" in seinem Namen enthält.";
Added: trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/en.lproj/Localizable.strings
===================================================================
--- trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/en.lproj/Localizable.strings (rev 0)
+++ trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/en.lproj/Localizable.strings 2016-03-19 16:22:27 UTC (rev 2329)
@@ -0,0 +1,7 @@
+"JRELoadError" = "Unable to load Java Runtime Environment.";
+"JRExLoadError" = "Unable to load a Java %d Runtime Environment.";
+"JRExLoadFullError" = "This application requires that Java %d or later be installed on your computer. Please download and install the latest version of Java from www.java.com and try again.";
+"JDKxLoadFullError" = "This application requires that a Java %d JDK or later be installed on your computer. Please download and install the latest Java JDK from Oracle.com and try again.";
+"MainClassNameRequired" = "Main class name is required.";
+"JavaDirectoryNotFound" = "Unable to enumerate Java directory contents.";
+"BundlePathContainsColon" = "Cannot launch from folder that contains a \"/\" in its name.";
Added: trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/fr.lproj/Localizable.strings
===================================================================
--- trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/fr.lproj/Localizable.strings (rev 0)
+++ trunk/bibledesktop/etc/installer/macosx/Bible Desktop.app/Contents/Resources/fr.lproj/Localizable.strings 2016-03-19 16:22:27 UTC (rev 2329)
@@ -0,0 +1,7 @@
+"JRELoadError" = "Impossible d'utiliser un environnement Java.";
+"JRExLoadError" = "Impossible d'utiliser un environnement Java %d.";
+"JRExLoadFullError" = "Ce logiciel nécessite que Java %d ou plus récent être installés sur votre ordinateur. S'il vous plaît télécharger et installer la dernière version de Java à partir de www.java.com et essayez à nouveau.";
+"JDKxLoadFullError" = "Ce logiciel nécessite que Java %d JDK ou plus récent être installés sur votre ordinateur. S'il vous plaît télécharger et installer le JDK plus récente de Oracle.com et essayez à nouveau.";
+"MainClassNameRequired" = "Principal nom de classe est nécessaire.";
+"JavaDirectoryNotFound" = "Impossible d'énumérer répertoire Java contenu.";
+"BundlePathContainsColon" = "Pas de commencer à partir d'un dossier qui contient un \"/\" dans son nom.";
\ No newline at end of file
Modified: trunk/bibledesktop/etc/installer/macosx/readme.txt
===================================================================
--- trunk/bibledesktop/etc/installer/macosx/readme.txt 2016-01-23 16:54:30 UTC (rev 2328)
+++ trunk/bibledesktop/etc/installer/macosx/readme.txt 2016-03-19 16:22:27 UTC (rev 2329)
@@ -5,11 +5,11 @@
Instructions:
Building the App:
-Info.plist is the "app" control file. When 3rd party jar names change, it needs to change.
+Info.plist is the "app" control file.
Use Ant to build the "app" into the installation target directory.
This does two things:
1) It updates the release version number for the BibleDesktop and JSword jars.
-2) It puts the jars in BibleDesktop.app/Contents/Resources/Java
+2) It puts the jars in BibleDesktop.app/Contents/Java
Building the Distribution:
DMG is a Mac Disk Image that can only be built on the Mac.
More information about the jsword-svn
mailing list