Changeset 6945 in josm

Timestamp:

2014-03-29T17:30:04+01:00 (10 years ago)

Author:

Don-vip

Message:

see #8654 - refactor Mac OSX packaging ant task

File:

• trunk/build.xml (modified) (4 diffs)

trunk/build.xml

@@ -146 +146 @@
     </target>
     <!-- New Mac OS X target for Java 7 -->
-    <target name="distmac7" depends="dist">
+    <target name="mac7">
         <!-- 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"
+        <bundleapp outputdirectory="${bundle.outdir}" name="JOSM" displayname="JOSM" executablename="JOSM" identifier="org.openstreetmap.josm"
                    mainclassname="org.openstreetmap.josm.gui.MainApplication"
                    copyright="JOSM, and all its integral parts, are released under the GNU General Public License v2 or later"
@@ -162 +162 @@
             <arch name="i386"/>
 
-            <classpath file="dist/josm-custom.jar"/>
+            <classpath file="${bundle.jar}"/>
 
             <option value="-Xmx512m"/>
@@ -180 +180 @@
         <taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask" classpath="tools/xmltask.jar"/>
         
-        <xmltask source="dist/JOSM.app/Contents/Info.plist" dest="dist/JOSM.app/Contents/Info.plist" indent="false">
+        <xmltask source="${bundle.outdir}/JOSM.app/Contents/Info.plist" dest="${bundle.outdir}/JOSM.app/Contents/Info.plist" indent="false">
             <insert position="before" path="/plist/dict/key[1]"><![CDATA[<key>CFBundleAllowMixedLocalizations</key>
 <string>true</string>
@@ -187 +187 @@
         
         <!-- 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 destfile="${bundle.outdir}/josm-custom-macosx-java7.zip" update="true">
+            <zipfileset dir="." includes="CONTRIBUTION README LICENSE"/>
+            <zipfileset dir="${bundle.outdir}" includes="JOSM.app/**/*" filemode="755" />
         </zip>
+    </target>
+    <target name="distmac7" depends="dist">
+        <antcall target="mac7">
+            <param name="bundle.outdir" value="dist"/>
+            <param name="bundle.jar" value="dist/josm-custom.jar"/>
+        </antcall>
     </target>
     <target name="javacc" depends="init" unless="javacc.notRequired">