debugging mac build

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@4286 b35dd754-fafc-0310-a699-88a17e54d16e

build/build.xml

@@ -1206,14 +1206,17 @@
 		<mkdir dir="${mac.pkg.dir}/Install_resources"/>
 		<copy file="${basedir}/build/osx/postinstall" todir="${mac.pkg.dir}/Install_resources"/>
 		<mkdir dir="${mac.pkg.dir}/System/Library/LaunchDaemons"/>
-		<copy file="${basedir}/build/osx/org.jivesoftware.wildfire" todir="${mac.pkg.dir}/System/Library/LaunchDaemons"/>
+		<copy file="${basedir}/build/osx/org.jivesoftware.wildfire.plist" todir="${mac.pkg.dir}/System/Library/LaunchDaemons"/>
 		<mkdir dir="${mac.dmg.dir}"/>
 		<exec executable="chown">
-			<arg line="-R daemon:daemon ${mac.pkg.dir}/usr/local/wildfire"/>
-		</exec>
-		<exec executable="chown">
-			<arg line="-R root:wheel ${mac.pkg.dir}/System"/>
+			<arg line="-R root:wheel ${mac.pkg.dir}"/>
 		</exec>
+		<chmod perm="ug+x">
+			<fileset dir="${mac.pkg.dir}/usr/local/wildfire/bin">
+				<include name="wildfire.sh"/>
+				<include name="extra/launchd-wrapper.sh"/>
+			</fileset>
+		</chmod>
 	</target>
 	
 	<!-- create a mac os x installer -->

build/osx/org.jivesoftware.wildfire.plist

@@ -12,12 +12,12 @@
 			<string>/Library/Java/Home</string>
 		</dict>
 		<key>Label</key>
-		<string>com.jivesoftware.wildfire</string>
+		<string>org.jivesoftware.wildfire</string>
 		<key>OnDemand</key>
 		<false/>
 		<key>ProgramArguments</key>
 		<array>
-			<string>/bin/sh /usr/local/wildfire/bin/extra/launchd-wrapper.sh</string>
+			<string>/usr/local/wildfire/bin/extra/launchd-wrapper.sh</string>
 		</array>
 		<key>RunAtLoad</key>
 		<true/>

src/bin/extra/launchd-wrapper.sh

+#!/bin/bash
+
+export WILDFIRE_HOME=/usr/local/wildfire
+function shutdown() 
+{
+	date
+	echo "Shutting down Wildfire"
+	$WILDFIRE_HOME/bin/wildfire.sh stop
+}
+
+date 
+echo "Starting Wildfire"
+export CATALINA_PID=/tmp/$$
+
+# uncomment to increase Wildfire's maximum heap allocation
+# export JAVA_OPTS="-Xmx512M $JAVA_OPTS"
+
+$WILDFIRE_HOME/bin/wildfire.sh start
+
+# allow any signal which would kill a process to stop Wildfire
+trap shutdown HUP INT QUIT ABRT KILL ALRM TERM TSTP
+
+echo "Waiting for `cat $WILDFIRE_PID`"
+wait `cat $WILDFIRE_PID`
\ No newline at end of file