From fda6e03d9e8af9eda62701cd8288f613abae3143 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Sun, 25 Jan 2015 22:23:38 +0000
Subject: [PATCH] OSX: refactor OSX package based on
 universalJavaApplicationStub

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2329 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 build.xml                                  |  72 ++++---------------
 src/osx-java7/Info.plist                   |  73 -------------------
 src/osx-java7/JavaAppLauncher              | Bin 18604 -> 0 bytes
 src/osx-java7/en.lproj/Localizable.strings |   3 -
 src/osx/Info.plist                         |  36 ++++++++++
 src/osx/davmail                            |  80 +++++++--------------
 6 files changed, 78 insertions(+), 186 deletions(-)
 delete mode 100644 src/osx-java7/Info.plist
 delete mode 100644 src/osx-java7/JavaAppLauncher
 delete mode 100644 src/osx-java7/en.lproj/Localizable.strings
 create mode 100644 src/osx/Info.plist

diff --git a/build.xml b/build.xml
index 1afb0526..2006b14f 100644
--- a/build.xml
+++ b/build.xml
@@ -93,75 +93,33 @@
     </target>
 
     <target name="dist-osx">
-        <taskdef name="jarbundler"
-                 classname="net.sourceforge.jarbundler.JarBundler">
-            <classpath location="lib/jarbundler-2.1.0.jar"/>
-        </taskdef>
-        <jarbundler dir="dist"
-                    shortname="DavMail"
-                    name="DavMail"
-                    mainclass="davmail.DavGateway"
-                    build="${release}"
-                    icon="src/osx/tray.icns"
-                    infostring="DavMail Gateway ${release}"
-                    jvmversion="1.5+"
-                    version="${release}"
-                    vmoptions="-Dsun.net.inetaddr.ttl=60 -Xmx512m"
-                    workingdirectory="$APP_PACKAGE"
-                    stubfile="src/osx/davmail">
-            <jarfileset dir="dist">
+        <!-- move jar files to new location -->
+        <copy todir="dist/DavMail.app/Contents/Java">
+            <fileset dir="dist">
                 <include name="*.jar"/>
-            </jarfileset>
-            <jarfileset dir="dist/lib">
+            </fileset>
+            <fileset dir="dist/lib">
                 <include name="*.jar"/>
                 <include name="*.jnilib"/>
                 <exclude name="swt*.jar"/>
                 <exclude name="junit-*.jar"/>
                 <exclude name="winrun4j-*.jar"/>
-            </jarfileset>
-        </jarbundler>
-        <!-- prepare hide from dock option -->
-        <replaceregexp file="dist/DavMail.app/Contents/Info.plist" match="&lt;key>CFBundleName&lt;/key>"
-                       replace="&lt;key>LSUIElement&lt;/key>&lt;string>0&lt;/string>&lt;key>CFBundleName&lt;/key>"/>
-        <!-- Retina display support -->
-        <replaceregexp file="dist/DavMail.app/Contents/Info.plist" match="&lt;key>CFBundleName&lt;/key>"
-                       replace="&lt;key>NSHighResolutionCapable&lt;/key>&lt;true/>&lt;key>CFBundleName&lt;/key>"/>
-        <zip file="dist/DavMail-MacOSX-${release-name}.app.zip" comment="In order to run DavMail on OSX Mountain Lion, you will need to disable Gatekeeper temporarily, see http://davmail.sourceforge.net/macosxsetup.html">
-            <zipfileset dir="dist">
-                <include name="DavMail.app/**/*"/>
-                <exclude name="DavMail.app/Contents/MacOS/davmail"/>
-            </zipfileset>
-            <zipfileset dir="dist" filemode="755">
-                <include name="DavMail.app/Contents/MacOS/davmail"/>
-            </zipfileset>
-        </zip>
-        <!--delete dir="dist/DavMail.app"/-->
-    </target>
-
-    <target name="dist-osx-java7" depends="dist-osx">
-        <!-- move jar files to new location -->
-        <move todir="dist/DavMail.app/Contents/Java">
-            <fileset dir="dist/DavMail.app/Contents/Resources/Java"/>
-        </move>
-        <!-- move libgrowl to library path -->
-        <move todir="dist/DavMail.app/Contents/MacOS">
-            <fileset file="dist/DavMail.app/Contents/Java/libgrowl.jnilib"/>
-        </move>
-        <!-- use Java7 app launcher -->
-        <copy file="src/osx-java7/JavaAppLauncher" tofile="dist/DavMail.app/Contents/MacOS/davmail" overwrite="true"/>
-        <!-- include Java7 labels -->
-        <copy todir="dist/DavMail.app/Contents/Resources">
-            <fileset dir="src/osx-java7">
-                <include name="en.lproj/**"/>
             </fileset>
         </copy>
+        <!-- move libgrowl to library path -->
+        <copy todir="dist/DavMail.app/Contents/MacOS">
+            <fileset file="lib/libgrowl.jnilib"/>
+        </copy>
+        <copy file="src/osx/tray.icns" todir="dist/DavMail.app/Contents/Resources" overwrite="true"/>
+        <!-- use generic app launcher -->
+        <copy file="src/osx/davmail" todir="dist/DavMail.app/Contents/MacOS" overwrite="true"/>
         <!-- template plist -->
-        <copy file="src/osx-java7/Info.plist" todir="dist/DavMail.app/Contents" overwrite="true">
+        <copy file="src/osx/Info.plist" todir="dist/DavMail.app/Contents" overwrite="true">
             <filterchain>
                 <expandproperties/>
             </filterchain>
         </copy>
-        <zip file="dist/DavMail-MacOSX-Java7-${release-name}.app.zip" comment="In order to run DavMail on OSX Mountain Lion, you will need to disable Gatekeeper temporarily, see http://davmail.sourceforge.net/macosxsetup.html">
+        <zip file="dist/DavMail-MacOSX-${release-name}.app.zip" comment="In order to run DavMail on OSX Mountain Lion or later, you will need to disable Gatekeeper temporarily, see http://davmail.sourceforge.net/macosxsetup.html">
             <zipfileset dir="dist">
                 <include name="DavMail.app/**/*"/>
                 <exclude name="DavMail.app/Contents/MacOS/davmail"/>
@@ -424,7 +382,7 @@
         <antcall target="dist-nsis"/>
         <antcall target="dist-deb"/>
         <!--antcall target="dist-rpm"/-->
-        <antcall target="dist-osx-java7"/>
+        <antcall target="dist-osx"/>
         <!-- source with binary deps package -->
         <tar tarfile="dist/davmail-src-${release-name}.tgz" compression="gzip" longfile="gnu">
             <tarfileset prefix="davmail-src-${release-name}" dir=".">
diff --git a/src/osx-java7/Info.plist b/src/osx-java7/Info.plist
deleted file mode 100644
index 69090c84..00000000
--- a/src/osx-java7/Info.plist
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<plist version="1.0">
-  <dict>
-    <key>LSUIElement</key><string>0</string>
-    <key>NSHighResolutionCapable</key>
-    <true/>
-    <key>CFBundleName</key>
-    <string>DavMail</string>
-    <key>CFBundleShortVersionString</key>
-    <string>${release}</string>
-    <key>CFBundleGetInfoString</key>
-    <string>DavMail Gateway ${release-name}</string>
-    <key>CFBundleAllowMixedLocalizations</key>
-    <string>false</string>
-    <key>CFBundleInfoDictionaryVersion</key>
-    <string>6.0</string>
-    <key>CFBundleExecutable</key>
-    <string>davmail</string>
-    <key>CFBundleDevelopmentRegion</key>
-    <string>English</string>
-    <key>CFBundlePackageType</key>
-    <string>APPL</string>
-    <key>CFBundleSignature</key>
-    <string>????</string>
-    <key>CFBundleVersion</key>
-    <string>${release}</string>
-    <key>CFBundleIconFile</key>
-    <string>tray.icns</string>
-    <key>Java</key>
-    <dict>
-      <key>MainClass</key>
-      <string>davmail.DavGateway</string>
-      <key>JVMVersion</key>
-      <string>1.5+</string>
-      <key>ClassPath</key>
-      <array>
-        <string>$JAVAROOT/davmail.jar</string>
-        <string>$JAVAROOT/activation-1.1.1.jar</string>
-        <string>$JAVAROOT/appbundler-1.0.jar</string>
-        <string>$JAVAROOT/checkstyle-all-5.0.jar</string>
-        <string>$JAVAROOT/commons-codec-1.3.jar</string>
-        <string>$JAVAROOT/commons-collections-3.1.jar</string>
-        <string>$JAVAROOT/commons-httpclient-3.1.jar</string>
-        <string>$JAVAROOT/commons-logging-1.0.4.jar</string>
-        <string>$JAVAROOT/htmlcleaner-2.2.jar</string>
-        <string>$JAVAROOT/jackrabbit-webdav-2.4.3.jar</string>
-        <string>$JAVAROOT/jcharset-1.3.jar</string>
-        <string>$JAVAROOT/jcifs-1.3.14.jar</string>
-        <string>$JAVAROOT/jdom-1.0.jar</string>
-        <string>$JAVAROOT/libgrowl-0.2.jar</string>
-        <string>$JAVAROOT/libgrowl.jnilib</string>
-        <string>$JAVAROOT/log4j-1.2.16.jar</string>
-        <string>$JAVAROOT/mail-1.4.3.jar</string>
-        <string>$JAVAROOT/slf4j-api-1.3.1.jar</string>
-        <string>$JAVAROOT/slf4j-log4j12-1.3.1.jar</string>
-        <string>$JAVAROOT/stax-api-1.0.1.jar</string>
-        <string>$JAVAROOT/stax2-api-3.1.1.jar</string>
-        <string>$JAVAROOT/woodstox-core-asl-4.1.2.jar</string>
-        <string>$JAVAROOT/xercesImpl-2.8.1.jar</string>
-      </array>
-      <key>VMOptions</key>
-      <string>-Dsun.net.inetaddr.ttl=60 -Xmx512m</string>
-      <key>WorkingDirectory</key>
-      <string>$APP_PACKAGE</string>
-    </dict>
-    <key>JVMMainClassName</key>
-    <string>davmail.DavGateway</string>
-    <key>JVMOptions</key>
-    <array>
-    <string>-Dsun.net.inetaddr.ttl=60 -Xmx512m -Duser.dir=$APP_ROOT</string>
-    </array>
-  </dict>
-</plist>
diff --git a/src/osx-java7/JavaAppLauncher b/src/osx-java7/JavaAppLauncher
deleted file mode 100644
index 7bddebea273d591f2b2f1185583982ddafb5eee7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18604
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
G^7=21{e}$y

diff --git a/src/osx-java7/en.lproj/Localizable.strings b/src/osx-java7/en.lproj/Localizable.strings
deleted file mode 100644
index cfd612eb..00000000
--- a/src/osx-java7/en.lproj/Localizable.strings
+++ /dev/null
@@ -1,3 +0,0 @@
-"JRELoadError" = "Java 7 not available, please download and install from http://www.java.com";
-"MainClassNameRequired" = "Main class name is required.";
-"JavaDirectoryNotFound" = "Unable to enumerate Java directory contents.";
diff --git a/src/osx/Info.plist b/src/osx/Info.plist
new file mode 100644
index 00000000..f9fe33cc
--- /dev/null
+++ b/src/osx/Info.plist
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<plist version="1.0">
+  <dict>
+    <key>LSUIElement</key><string>0</string>
+    <key>NSHighResolutionCapable</key>
+    <true/>
+    <key>CFBundleName</key>
+    <string>DavMail</string>
+    <key>CFBundleShortVersionString</key>
+    <string>${release}</string>
+    <key>CFBundleGetInfoString</key>
+    <string>DavMail Gateway ${release-name}</string>
+    <key>CFBundleAllowMixedLocalizations</key>
+    <string>false</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleExecutable</key>
+    <string>davmail</string>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>English</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleVersion</key>
+    <string>${release}</string>
+    <key>CFBundleIconFile</key>
+    <string>tray.icns</string>
+    <key>JVMMainClassName</key>
+    <string>davmail.DavGateway</string>
+    <key>JVMOptions</key>
+    <array>
+    <string>-Dsun.net.inetaddr.ttl=60 -Xmx512m</string>
+    </array>
+  </dict>
+</plist>
diff --git a/src/osx/davmail b/src/osx/davmail
index 7a390494..8fa69526 100644
--- a/src/osx/davmail
+++ b/src/osx/davmail
@@ -183,7 +183,7 @@ else
 	# set Working Directory and Java and Resources folder
 	JavaFolder="${OracleJavaFolder}"
 	ResourcesFolder="${OracleResourcesFolder}"
-	WorkingDirectory="${OracleJavaFolder}"
+	WorkingDirectory="${AppPackageFolder}"
 
 	APP_ROOT="${AppPackageFolder}"
 
@@ -222,67 +222,41 @@ elif [ -x /usr/libexec/java_home ] && [ -d "`/usr/libexec/java_home 2> /dev/null
 	JAVACMD="`/usr/libexec/java_home 2> /dev/null`/bin/java"
 
 # otherwise check Java standard symlink (old Apple Java)
-elif [ -h /Library/Java/Home ]; then
+elif [ -x /Library/Java/Home/bin/java ]; then
 	JAVACMD="/Library/Java/Home/bin/java"
 
 # fallback: public JRE plugin (Oracle Java)
-else
+elif [ -x "/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java" ]; then
 	JAVACMD="/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java"
-fi
-
+else
 # fallback fallback: /usr/bin/java
-# but this would prompt to install deprecated Apple Java 6
-
-
-
+	JAVACMD="/usr/bin/java"
+fi
 
 #
-# execute JAVA commandline and do some pre-checks
+# execute JAVA commandline
 ####################################################
 
-# display error message if MainClassName is empty
-if [ -z ${JVMMainClass} ]; then
-	# display error message with applescript
-	osascript -e "tell application \"System Events\" to display dialog \"ERROR launching '${CFBundleName}'!\n\n'MainClass' isn't specified!\nJava application cannot be started!\" with title \"${CFBundleName}\" buttons {\" OK \"} default button 1 with icon path to resource \"${CFBundleIconFile}\" in bundle (path to me)"
-	# exit with error
-	exit 1
 
+# enable drag&drop to the dock icon
+export CFProcessPath="$0"
 
-# check whether $JAVACMD is a file and executable
-elif [ -f "$JAVACMD" ] && [ -x "$JAVACMD" ] ; then
+# change to Working Directory based upon Apple/Oracle Plist info
+cd "${WorkingDirectory}"
 
-	# enable drag&drop to the dock icon
-	export CFProcessPath="$0"
-
-	# change to Working Directory based upon Apple/Oracle Plist info
-	cd "${WorkingDirectory}"
-
-	# execute Java and set
-	#	- classpath
-	#	- dock icon
-	#	- application name
-	#	- JVM options
-	#	- JVM default options
-	#	- main class
-	#	- JVM arguments
-	exec "$JAVACMD" \
-			-cp "${JVMClassPath}" \
-			-Xdock:icon="${ResourcesFolder}/${CFBundleIconFile}" \
-			-Xdock:name="${CFBundleName}" \
-			${JVMOptions:+$JVMOptions }\
-			${JVMDefaultOptions:+$JVMDefaultOptions }\
-			${JVMMainClass}\
-			${JVMArguments:+ $JVMArguments}
-
-
-else
-
-	# display error message with applescript
-	osascript -e "tell application \"System Events\" to display dialog \"ERROR launching '${CFBundleName}'!\n\nYou need to have JAVA installed on your Mac!\nVisit http://java.com for more information...\" with title \"${CFBundleName}\" buttons {\" OK \"} default button 1 with icon path to resource \"${CFBundleIconFile}\" in bundle (path to me)"
-
-	# and open java.com
-	open http://java.com
-
-	# exit with error
-	exit 1
-fi
+# execute Java and set
+#	- classpath
+#	- dock icon
+#	- application name
+#	- JVM options
+#	- JVM default options
+#	- main class
+#	- JVM arguments
+exec "$JAVACMD" \
+		-cp "${JVMClassPath}" \
+		-Xdock:icon="${ResourcesFolder}/${CFBundleIconFile}" \
+		-Xdock:name="${CFBundleName}" \
+		${JVMOptions:+$JVMOptions }\
+		${JVMDefaultOptions:+$JVMDefaultOptions }\
+		${JVMMainClass}\
+		${JVMArguments:+ $JVMArguments}