build Mac bundle using appbundler

Makefile

@@ -131,6 +131,7 @@ M1.%: clean $(EXE) cubes release/Magarena/mods/felt_theme.zip
 	-rm -rf Magarena-1.$*.app
 	-rm Magarena-1.$*.zip
 	-rm Magarena-1.$*.app.zip
+	echo "preparing Lin/Win dist"
 	mkdir -p Magarena-1.$*/Magarena/mods
 	cp -r \
 			release/gpl-3.0.html \
@@ -151,9 +152,12 @@ M1.%: clean $(EXE) cubes release/Magarena/mods/felt_theme.zip
 			release/Magarena/mods/*.txt \
 			Magarena-1.$*/Magarena/mods
 	-zip -r Magarena-1.$*.zip Magarena-1.$*
-	cp -r Magarena.app Magarena-1.$*.app
-	cd Magarena-1.$*.app/Contents/Resources; ln -s ../../../Magarena-1.$* Java
-	chmod a+x Magarena-1.$*.app/Contents/MacOS/JavaApplicationStub
+	echo "preparing Mac dist"
+	cp -r Magarena.app.oracle Magarena-1.$*.app
+	cp -r Magarena-1.$*/* Magarena-1.$*.app/Contents/Java
+	rm Magarena-1.$*.app/Contents/Java/Magarena.exe
+	cp release/Magarena.jar Magarena-1.$*.app/Contents/Java
+	chmod a+x Magarena-1.$*.app/Contents/MacOS/JavaAppLauncher
 	-zip -r Magarena-1.$*.app.zip Magarena-1.$*.app
 
 $(MAG): $(SRC)

build.xml

@@ -15,6 +15,10 @@
       </fileset>
   </path>
 
+  <taskdef name="bundleapp"
+           classname="com.oracle.appbundler.AppBundlerTask"   
+           classpath="lib/appbundler-1.0.jar" />
+
   <!-- deps - Download dependencies -->
   <target name="deps" unless="skip.download">
       <echo message="downloading groovy to ${lib}"/>
@@ -59,6 +63,19 @@
     </jar>
   </target>
 
+  <target name="bundle-magarena">
+    <bundleapp outputdirectory="dist"
+               name="Magarena"
+               displayname="Magarena"
+               shortversion="1.42"
+               signature="Maga"
+               icon="arena.icns"
+               identifier="magic.MagicMain"
+               mainclassname="magic.MagicMain">
+      <option value="-Dapple.laf.useScreenMenuBar=true -Xms256M -Xmx256M"></option>
+    </bundleapp>
+  </target>
+
   <!-- javadoc -  Generate Javadoc -->
   <target name="javadoc">
     <javadoc sourcepath="src" destdir="javadoc" />