Index: /trunk/README
===================================================================
--- /trunk/README	(revision 6215)
+++ /trunk/README	(revision 6216)
@@ -17,6 +17,6 @@
 You need JRE Version 1.6 (also called Java 6), or later.
 
-Microsoft Windows users should visit http://www.java.com
-and download the latest Java executable for Windows systems.
+Microsoft Windows and Apple Mac OS X users should visit http://www.java.com
+and download the latest Java executable for their system.
 
 Linux users should visit http://www.oracle.com/technetwork/java/index.html
@@ -102,12 +102,16 @@
     - potlatch2/README      infos on how to update the Potlatch 2 style from upstream sources
 - test/                     automated software tests
+    - data/                 resources used for some tests
     - functional/           functional tests (source code)
     - lib/                  libraries needed for (some of) the tests
+    - performance/          performance tests (source code)
     - unit/                 unit tests (source code)
 - tools/                    libraries and tools that help in the development process
-    - animal-sniffer-ant-tasks-1.7.jar
+    - animal-sniffer-ant-tasks-1.8.jar
                             TODO: what is this?
+    - appbundler-1.0ea.jar  used to build Mac OS X package for Oracle Java 7
     - findbugs/             libs and config files for findbugs (automatically detects common bugs and potential
                             problems in source code); can be launched as an ant target in build.xml
+    - jacocoant.jar         used to include coverage data into JUnit test reports 
     - javacc.jar            used in the build process to generate some .java files from a javacc source file
                             (src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj)
Index: /trunk/build.xml
===================================================================
--- /trunk/build.xml	(revision 6215)
+++ /trunk/build.xml	(revision 6216)
@@ -103,4 +103,5 @@
         </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 -->
@@ -116,4 +117,41 @@
         </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">
+
+            <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"/>