Index: core/build.xml
===================================================================
--- core/build.xml	(revision 6209)
+++ core/build.xml	(working copy)
@@ -102,6 +102,7 @@
             <!-- <zipfileset src="lib/signpost-core-1.2.1.1.jar"/> -->
         </jar>
     </target>
+	<!-- Compatibility Mac OS X target for Java 6 (incompatible with new on for Java 7, see #8654, #9035) -->
     <target name="distmac" depends="dist">
         <!-- modify MacOS X Info.plist file to hold the SVN version number -->
         <copy file="macosx/JOSM.app/Contents/Info.plist" todir="build"/>
@@ -115,6 +116,45 @@
             <zipfileset dir="macosx" includes="JOSM.app/Contents/MacOS/JOSM" filemode="755"/>
         </zip>
     </target>
+	<!-- New Mac OS X target for Java 7 -->
+    <target name="distmac7" depends="dist">
+    	<!-- Using https://bitbucket.org/infinitekind/appbundler to create mac application bundle -->
+    	<taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="tools/appbundler-1.0ea.jar"/>
+    	<!-- create MacOS X application bundle -->
+        <bundleapp outputdirectory="dist" name="JOSM" displayname="JOSM" executablename="JOSM" identifier="org.openstreetmap.josm"
+                   mainclassname="org.openstreetmap.josm.gui.MainApplication"
+                   applicationCategory="public.app-category.utilities"
+                   shortversion="${version.entry.commit.revision} SVN"
+                   version="${version.entry.commit.revision} SVN"
+                   icon="macosx/JOSM.app/Contents/Resources/JOSM.icns"
+                   highResolutionCapable="false">
+
+            <!--<runtime dir="${env.JAVA_HOME}" />-->
+
+            <arch name="x86_64"/>
+            <arch name="i386"/>
+
+            <classpath file="dist/josm-custom.jar"/>
+
+            <option value="-Xmx512m"/>
+
+            <option value="-Xdock:icon=Contents/Resources/JOSM.icns"/>
+            <option value="-Xdock:name=JOSM"/>
+
+            <!-- OSX specific options, optional -->
+            <option value="-Dapple.laf.useScreenMenuBar=true"/>
+            <option value="-Dcom.apple.macos.use-file-dialog-packages=true"/>
+            <option value="-Dcom.apple.macos.useScreenMenuBar=true"/>
+            <option value="-Dcom.apple.mrj.application.apple.menu.about.name=JOSM"/>
+            <option value="-Dcom.apple.smallTabs=true"/>
+        </bundleapp>
+
+        <!-- create ZIP file with MacOS X application bundle -->
+        <zip destfile="dist/josm-custom-macosx-java7.zip" update="true">
+            <zipfileset dir="build" includes="CONTRIBUTION README LICENSE"/>
+            <zipfileset dir="dist" includes="JOSM.app/**/*" filemode="755" />
+        </zip>
+	</target>
     <target name="javacc" depends="init" unless="javacc.notRequired">
         <mkdir dir="${mapcss.dir}/parsergen"/>
         <exec append="false" executable="java" failifexecutionfails="true">
Index: core/tools/appbundler-1.0ea.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: core/tools/appbundler-1.0ea.jar
===================================================================
--- core/tools/appbundler-1.0ea.jar	(revision 0)
+++ core/tools/appbundler-1.0ea.jar	(working copy)

Property changes on: core\tools\appbundler-1.0ea.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream