Changeset 6216 in josm


Ignore:
Timestamp:
2013-09-04T01:23:00+02:00 (6 years ago)
Author:
Don-vip
Message:

see #8654 - New target distmac7 to build Mac OS X package for Oracle Java 7

Location:
trunk
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/README

    r5545 r6216  
    1717You need JRE Version 1.6 (also called Java 6), or later.
    1818
    19 Microsoft Windows users should visit http://www.java.com
    20 and download the latest Java executable for Windows systems.
     19Microsoft Windows and Apple Mac OS X users should visit http://www.java.com
     20and download the latest Java executable for their system.
    2121
    2222Linux users should visit http://www.oracle.com/technetwork/java/index.html
     
    102102    - potlatch2/README      infos on how to update the Potlatch 2 style from upstream sources
    103103- test/                     automated software tests
     104    - data/                 resources used for some tests
    104105    - functional/           functional tests (source code)
    105106    - lib/                  libraries needed for (some of) the tests
     107    - performance/          performance tests (source code)
    106108    - unit/                 unit tests (source code)
    107109- tools/                    libraries and tools that help in the development process
    108     - animal-sniffer-ant-tasks-1.7.jar
     110    - animal-sniffer-ant-tasks-1.8.jar
    109111                            TODO: what is this?
     112    - appbundler-1.0ea.jar  used to build Mac OS X package for Oracle Java 7
    110113    - findbugs/             libs and config files for findbugs (automatically detects common bugs and potential
    111114                            problems in source code); can be launched as an ant target in build.xml
     115    - jacocoant.jar         used to include coverage data into JUnit test reports
    112116    - javacc.jar            used in the build process to generate some .java files from a javacc source file
    113117                            (src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj)
  • trunk/build.xml

    r6208 r6216  
    103103        </jar>
    104104    </target>
     105        <!-- Compatibility Mac OS X target for Java 6 (incompatible with new on for Java 7, see #8654, #9035) -->
    105106    <target name="distmac" depends="dist">
    106107        <!-- modify MacOS X Info.plist file to hold the SVN version number -->
     
    116117        </zip>
    117118    </target>
     119        <!-- New Mac OS X target for Java 7 -->
     120    <target name="distmac7" depends="dist">
     121        <!-- Using https://bitbucket.org/infinitekind/appbundler to create mac application bundle -->
     122        <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="tools/appbundler-1.0ea.jar"/>
     123        <!-- create MacOS X application bundle -->
     124        <bundleapp outputdirectory="dist" name="JOSM" displayname="JOSM" executablename="JOSM" identifier="org.openstreetmap.josm"
     125                   mainclassname="org.openstreetmap.josm.gui.MainApplication"
     126                   applicationCategory="public.app-category.utilities"
     127                   shortversion="${version.entry.commit.revision} SVN"
     128                   version="${version.entry.commit.revision} SVN"
     129                   icon="macosx/JOSM.app/Contents/Resources/JOSM.icns"
     130                   highResolutionCapable="false">
     131
     132            <arch name="x86_64"/>
     133            <arch name="i386"/>
     134
     135            <classpath file="dist/josm-custom.jar"/>
     136
     137            <option value="-Xmx512m"/>
     138
     139            <option value="-Xdock:icon=Contents/Resources/JOSM.icns"/>
     140            <option value="-Xdock:name=JOSM"/>
     141
     142            <!-- OSX specific options, optional -->
     143            <option value="-Dapple.laf.useScreenMenuBar=true"/>
     144            <option value="-Dcom.apple.macos.use-file-dialog-packages=true"/>
     145            <option value="-Dcom.apple.macos.useScreenMenuBar=true"/>
     146            <option value="-Dcom.apple.mrj.application.apple.menu.about.name=JOSM"/>
     147            <option value="-Dcom.apple.smallTabs=true"/>
     148        </bundleapp>
     149
     150        <!-- create ZIP file with MacOS X application bundle -->
     151        <zip destfile="dist/josm-custom-macosx-java7.zip" update="true">
     152            <zipfileset dir="build" includes="CONTRIBUTION README LICENSE"/>
     153            <zipfileset dir="dist" includes="JOSM.app/**/*" filemode="755" />
     154        </zip>
     155        </target>
    118156    <target name="javacc" depends="init" unless="javacc.notRequired">
    119157        <mkdir dir="${mapcss.dir}/parsergen"/>
Note: See TracChangeset for help on using the changeset viewer.