Index: build.xml
===================================================================
--- build.xml	(revision 897)
+++ build.xml	(working copy)
@@ -2,14 +2,14 @@
 
 	<!-- All jar files necessary to run only JOSM (no tests) -->
 	<fileset id="josm_required_libs" dir="lib">
-		<include name="gettext-commons-0.9.2.jar"/>
-		<include name="metadata-extractor-2.3.1-nosun.jar"/>
+		<include name="gettext-commons-0.9.2.jar" />
+		<include name="metadata-extractor-2.3.1-nosun.jar" />
 	</fileset>
 
 	<!-- Java classpath addition (all jar files to compile tests with this) -->
 	<path id="classpath">
 		<fileset dir="lib">
-			<include name="**/*.jar"/>
+			<include name="**/*.jar" />
 		</fileset>
 	</path>
 
@@ -33,18 +33,31 @@
 		<copy file="styles/standard/elemstyles.xml" todir="build/styles/standard"/>
 
 		<!-- create josm-custom.jar -->
-		<delete file="dist/josm-custom.jar"/>
+		<delete file="dist/josm-custom.jar" />
 		<jar destfile="dist/josm-custom.jar" basedir="build">
 			<manifest>
 				<attribute name="Main-class" value="org.openstreetmap.josm.gui.MainApplication" />
 			</manifest>
 		</jar>
+		<!-- Create Mac Os X bundle -->
+		<exec dir="." os="Mac OS X" executable="/bin/sh">
+		    <arg value="-c" />
+		    <arg value="./osx/mkbundle.sh" />
+		</exec>
 	</target>
 
+    <target name="release" depends="dist">
+		<!-- Create dmg for Mac OS X -->
+		<exec dir="." os="Mac OS X" executable="/bin/sh">
+		    <arg value="-c" />
+		    <arg value="./osx/mkdmg.sh" />
+		</exec>    
+    </target>
+
 	<target name="compile" depends="init">
 		<javac srcdir="src" classpathref="classpath" destdir="build"
 				target="1.5" source="1.5" debug="on" encoding="UTF-8">
-			<compilerarg value="-Xlint:deprecation"/>
+			<compilerarg value="-Xlint:deprecation" />
 		</javac>
 	</target>
 
Index: osx/josm.icns
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: osx/josm.icns
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: osx/Info.plist
===================================================================
--- osx/Info.plist	(revision 0)
+++ osx/Info.plist	(revision 0)
@@ -0,0 +1,39 @@
+<?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>JOSM</string>
+	<key>CFBundleVersion</key>
+	<string>897</string>
+	<key>CFBundleAllowMixedLocalizations</key>
+	<string>false</string>
+	<key>CFBundleExecutable</key>
+	<string>JavaApplicationStub</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>897</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleGetInfoString</key>
+	<string>JOSM 897</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleIconFile</key>
+	<string>josm.icns</string>
+	<key>Java</key>
+	<dict>
+		<key>VMOptions</key>
+		<string>-Dsun.java2d.opengl=True</string>
+		<key>MainClass</key>
+		<string>org.openstreetmap.josm.gui.MainApplication</string>
+		<key>JVMVersion</key>
+		<string>1.5+</string>
+		<key>ClassPath</key>
+			<string>$JAVAROOT/josm.jar</string>
+	</dict>
+</dict>
+</plist>
Index: osx/mkdmg.sh
===================================================================
--- osx/mkdmg.sh	(revision 0)
+++ osx/mkdmg.sh	(revision 0)
@@ -0,0 +1,16 @@
+#!/bin/sh
+#Remove old dmg if it already exists
+rm ./dist/JOSM.dmg
+
+#first we prepare all files we want in our disk image in a new folder
+mkdir ./dist/dmg/
+cp -r ./dist/JOSM.app ./dist/dmg/JOSM.app
+SetFile -a B ./dist/dmg/JOSM.app
+
+#Create the dmg, reduce it size to the minimum requiered, compress it and clean up
+hdiutil create -size 100m -fs HFS+ -layout NONE -format UDIF -volname JOSM -srcfolder ./dist/dmg/ -noanyowners ./dist/TEMP
+hdiutil convert -format UDBZ ./dist/TEMP.dmg -o ./dist/JOSM.dmg
+hdiutil internet-enable -yes ./dist/JOSM.dmg
+
+rm -r ./dist/dmg
+rm ./dist/TEMP.dmg
\ No newline at end of file

Property changes on: osx/mkdmg.sh
___________________________________________________________________
Name: svn:executable
   + *

Index: osx/mkbundle.sh
===================================================================
--- osx/mkbundle.sh	(revision 0)
+++ osx/mkbundle.sh	(revision 0)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+#Creates a Mac OS X Bundle for JOSM
+
+#Create he requiered folders
+mkdir ./dist/JOSM.app
+mkdir ./dist/JOSM.app/Contents
+mkdir ./dist/JOSM.app/Contents/MacOS
+mkdir ./dist/JOSM.app/Contents/Resources
+mkdir ./dist/JOSM.app/Contents/Resources/Java
+
+#Copy the exectubale from the system framework into the bundle
+cp /System/Library/Frameworks/JavaVM.framework/Versions/Current/Resources/MacOS/JavaApplicationStub ./dist/JOSM.app/Contents/MacOS/JavaApplicationStub
+
+#Copy OSX specific files into the bundle
+cp ./osx/PkgInfo ./dist/JOSM.app/Contents/PkgInfo
+cp ./osx/Info.plist ./dist/JOSM.app/Contents/Info.plist
+cp ./osx/josm.icns ./dist/JOSM.app/Contents/Resources/josm.icns
+
+#Copy the jar into the bundle
+cp ./dist/josm-custom.jar ./dist/JOSM.app/Contents/Resources/Java/josm.jar
+
+#And finally tell Mac OS that this is a Bundle
+SetFile -a B ./dist/JOSM.app
\ No newline at end of file

Property changes on: osx/mkbundle.sh
___________________________________________________________________
Name: svn:executable
   + *

Index: osx/PkgInfo
===================================================================
--- osx/PkgInfo	(revision 0)
+++ osx/PkgInfo	(revision 0)
@@ -0,0 +1 @@
+APPL????
\ No newline at end of file