From 412083711c08f7449213d55f81656071fa8c0630 Mon Sep 17 00:00:00 2001
From: Wolfgang Meier <wolfgangmm@gmail.com>
Date: Mon, 23 Sep 2013 11:48:52 +0200
Subject: [PATCH] Update macosx launcher scripts to use Oracle's appbundler for
 Java 7. Apple's bundler supports Java 6 only.

---
 build/scripts/installer.xml                   |  36 ++++++---
 build/scripts/macosx.xml                      |  74 ++++++++++++------
 installer/install.xml.tmpl                    |   8 +-
 .../eXist-db.mac/Contents/Info.plist.tmpl     |  39 ---------
 .../Contents/MacOS/JavaApplicationStub        | Bin 35072 -> 0 bytes
 .../scripts/eXist-db.mac/Contents/PkgInfo     |   1 -
 .../Contents/Resources => }/icon.icns         | Bin
 7 files changed, 81 insertions(+), 77 deletions(-)
 delete mode 100644 installer/scripts/eXist-db.mac/Contents/Info.plist.tmpl
 delete mode 100755 installer/scripts/eXist-db.mac/Contents/MacOS/JavaApplicationStub
 delete mode 100644 installer/scripts/eXist-db.mac/Contents/PkgInfo
 rename installer/scripts/{eXist-db.mac/Contents/Resources => }/icon.icns (100%)

diff --git a/build/scripts/installer.xml b/build/scripts/installer.xml
index d1cc15e6dd0..27b7ea52af8 100644
--- a/build/scripts/installer.xml
+++ b/build/scripts/installer.xml
@@ -9,7 +9,8 @@
 
 	<!-- import common targets -->
 	<import file="../../build.xml"/>
-	
+	<import file="../../build/scripts/macosx.xml"/>
+    
     <taskdef resource="net/sf/antcontrib/antcontrib.properties">
         <classpath>
             <pathelement location="tools/ant/lib/ant-contrib-1.0b3.jar"/>
@@ -17,13 +18,34 @@
     </taskdef>
     
 	<property name="apps.dir" value="installer/apps"/>
+    <property name="installer.scripts" value="installer/scripts"/>
+    <property name="installer.mac.icon" value="${installer.scripts}/icon.icns"/>
+        
     <property file="installer/apps.properties"/>
     
 	<target name="commandline-installer">
         <!--ant antfile="build.xml" dir="tools/izpack"/-->
     </target>
 
-    <target depends="all,samples,xars,copy_scripts" name="prepare-installer">
+    <target name="macosx" depends="install-appbundler">
+        <taskdef 
+            name="bundleapp" 
+            classname="com.oracle.appbundler.AppBundlerTask" 
+            classpath="${appbundler.jar}" />
+        <bundleapp
+            outputdirectory="${installer.scripts}"
+            name="eXist-db"
+            displayname="eXist-db"
+            identifier="org.exist.start.Main"
+            mainclassname="org.exist.start.Main"
+            shortversion="${project.version.numeric}"
+            icon="${installer.mac.icon}">
+            <classpath file="start.jar"/>
+            <option value="-Dexist.home=$APP_ROOT/.."/>
+        </bundleapp>
+    </target>
+    
+    <target depends="all,samples,xars,copy_scripts,macosx" name="prepare-installer">
 	    <path id="izpackdeps">
 	        <fileset dir="${izpack.dir}/lib/">
 	            <include name="*.jar"/>
@@ -38,14 +60,6 @@
         <delete dir="${jetty.dir}/work/Jetty__8080__exist"/>
         <touch file="webapp/WEB-INF/logs/exist.log"/>
         <touch file="webapp/WEB-INF/logs/xmldb.log"/>
-        <copy file="installer/scripts/eXist-db.mac/Contents/Info.plist.tmpl"
-              tofile="installer/scripts/eXist-db.mac/Contents/Info.plist" filtering="true"
-              overwrite="true">
-            <filterset>
-                <filter token="vmoptions" value=""/>
-                <filter token="classpath" value="$APP_PACKAGE/.."/>
-            </filterset>
-        </copy>
     </target>
 
     <target name="clean-installer-xars-dir" description="Remove installer apps.dir directory">
@@ -131,6 +145,8 @@
         <izpack input="installer/install.xml"
             output="${inst-jar}"
             basedir="." izPackDir="${izpack.dir}"
+            compression="bzip2"
+            compressionlevel="9"
             installerType="standard"/>
         
         <!--mkdir dir="installer/temp"/>
diff --git a/build/scripts/macosx.xml b/build/scripts/macosx.xml
index 54672398f71..cb715d582af 100644
--- a/build/scripts/macosx.xml
+++ b/build/scripts/macosx.xml
@@ -4,7 +4,7 @@
 <!-- Call target "dmg" to create dmg file                                    -->
 <!-- ======================================================================= -->
 <!-- $Id$ -->
-<project basedir="../.." default="dmg" name="Mac OS App">
+<project basedir="../.." default="all" name="Mac OS App">
     
     <description>Build installer</description>
     
@@ -15,31 +15,51 @@
     <property name="app.dir" value="${dist}/eXist-db.app"/>
     <property name="app.resources" value="${app.dir}/Contents/Resources"/>
     <property name="app.exist" value="${app.resources}/eXist-db"/>
+    <property name="app.icon" value="installer/scripts/icon.icns"/>
+    <property name="codesign.identity" value="Lars Windauer"/>
+    <property name="appbundler.jar" value="${tools.ant}/lib/appbundler-1.0.jar"/>
+    <property name="appbundler.url" value="http://java.net/downloads/appbundler/appbundler-1.0.jar"/>
 
-    <target name="package" depends="jar,create-skeleton,copy-all"/>
+    <available property="appbundler.available" file="${appbundler.jar}"/>
+    
+    <target name="app" description="Build Mac OS X dmg (unsigned)" depends="bundle,copy-all,dmg"/>
+    
+    <target name="app-signed" description="Build Mac OS X dmg (signed)" depends="bundle,copy-all,codesign,dmg"/>
+    
+    <target name="install-appbundler" unless="appbundler.available">
+        <taskdef name="fetch" classname="nl.ow.dilemma.ant.fetch.FetchTask">
+            <classpath>
+                <pathelement location="${tools.ant}/lib/asocat-exist.jar"/>
+            </classpath>
+        </taskdef>
+        
+        <fetch dest="${tools.ant}/lib" url="${appbundler.url}"
+            failonerror="false" maxtime="120"/>
+    </target>
+    
+    <target name="bundle" depends="prepare">
+        <taskdef 
+            name="bundleapp" 
+            classname="com.oracle.appbundler.AppBundlerTask" 
+            classpath="${appbundler.jar}" />
+        <bundleapp
+            outputdirectory="${dist}"
+            name="eXist-db"
+            displayname="eXist-db"
+            identifier="org.exist.start.Main"
+            mainclassname="org.exist.start.Main"
+            shortversion="${project.version.numeric}"
+            icon="${app.icon}">
+            <classpath file="start.jar"/>
+            <option value="-Dexist.home=$APP_ROOT/Contents/Resources/eXist-db"/>
+        </bundleapp>
+    </target>
 
-    <target name="prepare" depends="xars">
+    <target name="prepare" depends="install-appbundler,xars">
         <delete failonerror="false" dir="${app.dir}"/>
         <mkdir dir="${dist}"/>
     </target>
 
-    <target name="create-skeleton" depends="prepare">
-        <copy todir="${app.dir}">
-            <fileset dir="installer/scripts/eXist-db.mac">
-                <exclude name=".svn"/>
-                <exclude name="Info.plist.tmpl"/>
-            </fileset>
-        </copy>
-        <copy file="installer/scripts/eXist-db.mac/Contents/Info.plist.tmpl"
-              tofile="${app.dir}/Contents/Info.plist" filtering="true" overwrite="true">
-            <filterset>
-                <filter token="vmoptions" value="-Dexist.home=$APP_PACKAGE/Contents/Resources/eXist-db"/>
-                <filter token="classpath" value="$APP_PACKAGE/Contents/Resources/eXist-db"/>
-            </filterset>
-        </copy>
-        <mkdir dir="${app.exist}"/>
-    </target>
-
     <target name="copy-apps">
         <copy todir="${app.exist}/autodeploy">
             <fileset dir="${basedir}/installer/apps">
@@ -73,7 +93,6 @@
                 <include name="exist-modules.jar"/>
                 <include name="exist-fluent.jar"/>
                 <include name="start.jar"/>
-                <include name="start.exe"/>
                 <include name="examples.jar"/>
                 <include name="mime-types.xml.tmpl"/>
                 <include name="mime-types.xml"/>
@@ -124,7 +143,7 @@
                 <exclude name="jetty/tmp/*"/>
                 <exclude name="jetty/work/*"/>
                 <exclude name="ircbot/**"/>
-                <include name="aspectj/**"/>
+                <exclude name="aspectj/**"/>
                 <exclude name="izpack/**"/>
                 <exclude name="ant/lib/svnkit*.jar"/>
                 <include name="jmx/**"/>
@@ -163,8 +182,17 @@
         </chmod>
     </target>
 
+    <target name="codesign" description="Codesign .app">
+        <exec executable="/usr/bin/codesign" os="Mac OS X" failonerror="true">
+            <arg value="-f"/>
+            <arg value="-s"/>
+            <arg value="${codesign.identity}"/>
+            <arg value="${app.dir}"/>
+        </exec>
+    </target>
+
     <!-- Create a DMG - This only works on MacOSX (requires hdiutil) -->
-    <target name="dmg" depends="package" description="Create a DMG package for MacOSX (only works on MacOSX)">
+    <target name="dmg" description="Create a DMG package for MacOSX (only works on MacOSX)">
 
         <!-- Set this property value to your application name -->
         <property name="app.name" value="${project.name}"/>
diff --git a/installer/install.xml.tmpl b/installer/install.xml.tmpl
index 9f7f307ae4a..69703113f91 100644
--- a/installer/install.xml.tmpl
+++ b/installer/install.xml.tmpl
@@ -7,7 +7,7 @@
 		<requiresjdk>no</requiresjdk>
         <run-privileged condition="izpack.windowsinstall.vista|izpack.windowsinstall.7"/>
 		<uninstaller name="uninstall.jar" path="$INSTALL_PATH"/>
-        <!--pack200/-->
+        <pack200/>
     </info>
 
     <guiprefs height="510" resizable="yes" width="680">
@@ -150,7 +150,7 @@
                 <exclude name="ant/lib/javasvn*.jar"/>
                 <include name="jetty/**"/>
                 <exclude name="jetty/logs/*"/>
-                <exclude name="jetty/tmp/*"/>
+                <exclude name="jetty/tmp/**"/>
                 <exclude name="jetty/work/*"/>
                 <exclude name="ircbot/**"/>
                 <exclude name="ant/lib/svnkit*.jar"/>
@@ -200,10 +200,10 @@
                 <include name="backup.bat"/>
             </fileset>
 
-            <fileset dir="installer/scripts/eXist-db.mac" targetdir="$INSTALL_PATH/eXist-db.app">
+            <fileset dir="installer/scripts/eXist-db.app" targetdir="$INSTALL_PATH/eXist-db.app">
                 <exclude name="**/.svn/"/>
             </fileset>
-            <executable targetfile="$INSTALL_PATH/eXist-db.app/Contents/MacOS/JavaApplicationStub"
+            <executable targetfile="$INSTALL_PATH/eXist-db.app/Contents/MacOS/JavaAppLauncher"
                 stage="never" os="unix"/>
 
             <fileset dir="bin/functions.d" targetdir="$INSTALL_PATH/bin/functions.d">
diff --git a/installer/scripts/eXist-db.mac/Contents/Info.plist.tmpl b/installer/scripts/eXist-db.mac/Contents/Info.plist.tmpl
deleted file mode 100644
index 10e246a7680..00000000000
--- a/installer/scripts/eXist-db.mac/Contents/Info.plist.tmpl
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
-<dict>
-	<key>CFBundleName</key>
-	<string>eXist-db</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.exist.start.Main</string>
-	<key>CFBundleVersion</key>
-	<string>100.0</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>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleIconFile</key>
-	<string>icon.icns</string>
-	<key>Java</key>
-	<dict>
-	    <key>VMOptions</key>
-        <string>@vmoptions@</string>
-		<key>MainClass</key>
-		<string>org.exist.start.Main</string>
-		<key>JVMVersion</key>
-		<string>1.6+</string>
-		<key>ClassPath</key>
-		<string>@classpath@/start.jar</string>
-	</dict>
-	<key>NSHighResolutionCapable</key>
-    <true/>
-</dict>
-</plist>
diff --git a/installer/scripts/eXist-db.mac/Contents/MacOS/JavaApplicationStub b/installer/scripts/eXist-db.mac/Contents/MacOS/JavaApplicationStub
deleted file mode 100755
index 73994852797b8e123c6ab378c21a6fffb7ebd720..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 35072
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

diff --git a/installer/scripts/eXist-db.mac/Contents/PkgInfo b/installer/scripts/eXist-db.mac/Contents/PkgInfo
deleted file mode 100644
index bd04210fb49..00000000000
--- a/installer/scripts/eXist-db.mac/Contents/PkgInfo
+++ /dev/null
@@ -1 +0,0 @@
-APPL????
\ No newline at end of file
diff --git a/installer/scripts/eXist-db.mac/Contents/Resources/icon.icns b/installer/scripts/icon.icns
similarity index 100%
rename from installer/scripts/eXist-db.mac/Contents/Resources/icon.icns
rename to installer/scripts/icon.icns