Changeset 6217 in josm


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

see #8654 - Make Mac OS X Java 7 package closer to former package

Location:
trunk
Files:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r6216 r6217  
    103103        </jar>
    104104    </target>
    105         <!-- Compatibility Mac OS X target for Java 6 (incompatible with new on for Java 7, see #8654, #9035) -->
     105    <!-- Compatibility Mac OS X target for Java 6 (incompatible with new on for Java 7, see #8654, #9035) -->
    106106    <target name="distmac" depends="dist">
    107107        <!-- modify MacOS X Info.plist file to hold the SVN version number -->
     
    117117        </zip>
    118118    </target>
    119         <!-- New Mac OS X target for Java 7 -->
     119    <!-- New Mac OS X target for Java 7 -->
    120120    <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 -->
     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 -->
    124124        <bundleapp outputdirectory="dist" name="JOSM" displayname="JOSM" executablename="JOSM" identifier="org.openstreetmap.josm"
    125125                   mainclassname="org.openstreetmap.josm.gui.MainApplication"
     126                   copyright="JOSM, and all its integral parts, are released under the GNU General Public License v2 or later"
    126127                   applicationCategory="public.app-category.utilities"
    127128                   shortversion="${version.entry.commit.revision} SVN"
    128129                   version="${version.entry.commit.revision} SVN"
    129130                   icon="macosx/JOSM.app/Contents/Resources/JOSM.icns"
    130                    highResolutionCapable="false">
     131                   highResolutionCapable="true">
    131132
    132133            <arch name="x86_64"/>
     
    147148            <option value="-Dcom.apple.smallTabs=true"/>
    148149        </bundleapp>
    149 
     150       
     151        <!-- appbundler lacks the possibility of defining our own keys or using a template, so update the .plist manually -->
     152        <taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask" classpath="tools/xmltask.jar"/>
     153       
     154        <xmltask source="dist/JOSM.app/Contents/Info.plist" dest="dist/JOSM.app/Contents/Info.plist" indent="false">
     155            <insert position="before" path="/plist/dict/key[1]"><![CDATA[<key>CFBundleAllowMixedLocalizations</key>
     156<string>true</string>
     157]]></insert>
     158        </xmltask>
     159       
    150160        <!-- create ZIP file with MacOS X application bundle -->
    151161        <zip destfile="dist/josm-custom-macosx-java7.zip" update="true">
     
    153163            <zipfileset dir="dist" includes="JOSM.app/**/*" filemode="755" />
    154164        </zip>
    155         </target>
     165    </target>
    156166    <target name="javacc" depends="init" unless="javacc.notRequired">
    157167        <mkdir dir="${mapcss.dir}/parsergen"/>
Note: See TracChangeset for help on using the changeset viewer.