Changeset 6945 in josm for trunk/build.xml


Ignore:
Timestamp:
2014-03-29T17:30:04+01:00 (5 years ago)
Author:
Don-vip
Message:

see #8654 - refactor Mac OSX packaging ant task

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r6830 r6945  
    146146    </target>
    147147    <!-- New Mac OS X target for Java 7 -->
    148     <target name="distmac7" depends="dist">
     148    <target name="mac7">
    149149        <!-- Using https://bitbucket.org/infinitekind/appbundler to create mac application bundle -->
    150150        <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="tools/appbundler-1.0ea.jar"/>
    151151        <!-- create MacOS X application bundle -->
    152         <bundleapp outputdirectory="dist" name="JOSM" displayname="JOSM" executablename="JOSM" identifier="org.openstreetmap.josm"
     152        <bundleapp outputdirectory="${bundle.outdir}" name="JOSM" displayname="JOSM" executablename="JOSM" identifier="org.openstreetmap.josm"
    153153                   mainclassname="org.openstreetmap.josm.gui.MainApplication"
    154154                   copyright="JOSM, and all its integral parts, are released under the GNU General Public License v2 or later"
     
    162162            <arch name="i386"/>
    163163
    164             <classpath file="dist/josm-custom.jar"/>
     164            <classpath file="${bundle.jar}"/>
    165165
    166166            <option value="-Xmx512m"/>
     
    180180        <taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask" classpath="tools/xmltask.jar"/>
    181181       
    182         <xmltask source="dist/JOSM.app/Contents/Info.plist" dest="dist/JOSM.app/Contents/Info.plist" indent="false">
     182        <xmltask source="${bundle.outdir}/JOSM.app/Contents/Info.plist" dest="${bundle.outdir}/JOSM.app/Contents/Info.plist" indent="false">
    183183            <insert position="before" path="/plist/dict/key[1]"><![CDATA[<key>CFBundleAllowMixedLocalizations</key>
    184184<string>true</string>
     
    187187       
    188188        <!-- create ZIP file with MacOS X application bundle -->
    189         <zip destfile="dist/josm-custom-macosx-java7.zip" update="true">
    190             <zipfileset dir="build" includes="CONTRIBUTION README LICENSE"/>
    191             <zipfileset dir="dist" includes="JOSM.app/**/*" filemode="755" />
     189        <zip destfile="${bundle.outdir}/josm-custom-macosx-java7.zip" update="true">
     190            <zipfileset dir="." includes="CONTRIBUTION README LICENSE"/>
     191            <zipfileset dir="${bundle.outdir}" includes="JOSM.app/**/*" filemode="755" />
    192192        </zip>
     193    </target>
     194    <target name="distmac7" depends="dist">
     195        <antcall target="mac7">
     196            <param name="bundle.outdir" value="dist"/>
     197            <param name="bundle.jar" value="dist/josm-custom.jar"/>
     198        </antcall>
    193199    </target>
    194200    <target name="javacc" depends="init" unless="javacc.notRequired">
Note: See TracChangeset for help on using the changeset viewer.