Changeset 1492 in josm


Ignore:
Timestamp:
2009-03-16T13:35:20+01:00 (10 years ago)
Author:
stoecker
Message:

added MacOS support in build. patch by Thilo Hannemann

Location:
trunk
Files:
10 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r1141 r1492  
    6666        </target>
    6767
     68        <target name="distmac" depends="dist">
     69                <!-- modify MacOS X Info.plist file to hold the SVN version number -->
     70                <copy file="macosx/JOSM.app/Contents/Info.plist" todir="build"/>
     71                <replace file="build/Info.plist" token="@SVNVersion@" value="${version.entry.commit.revision}"/>
     72                <!-- create ZIP file with MacOS X application bundle -->
     73                <zip destfile="dist/josm-custom-macosx.zip" update="true">
     74                        <zipfileset dir="build" includes="CONTRIBUTION README LICENSE"/>
     75                        <zipfileset dir="macosx" includes="JOSM.app/Contents JOSM.app/Contents/MacOS JOSM.app/Contents/Resources JOSM.app/Contents/Resources/Java JOSM.app/Contents/PkgInfo JOSM.app/Contents/Resources/JOSM.icns"/>
     76                        <zipfileset dir="build" includes="Info.plist" prefix="JOSM.app/Contents"/>
     77                        <zipfileset dir="dist" includes="josm-custom.jar" prefix="JOSM.app/Contents/Resources/Java"/>
     78                        <zipfileset dir="macosx" includes="JOSM.app/Contents/MacOS/JOSM" filemode="755"/>
     79                </zip>
     80        </target>
     81
    6882        <target name="compile" depends="init">
    6983                <javac srcdir="src" classpathref="classpath" destdir="build"
  • trunk/presets/presets.xml

    r1491 r1492  
    18081808            <combo key="sport" text="sport" values="multi,archery,athletics,australian_football,baseball,basketball,boules,bowls,canoe,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby,shooting,skateboard,skating,skiing,soccer,swimming,table_tennis,tennis" default="" delete_if_empty="true" />
    18091809        </item>
    1810         <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway.relation">
     1810        <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway,relation">
    18111811            <label text="Edit Racetrack" />
    18121812            <key key="leisure" value="track" />
  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

    r1474 r1492  
    452452     */
    453453    public void setIcon(String iconName) {
    454         String s = Main.pref.get("taggingpreset.iconpaths");
    455         ImageIcon icon = ImageProvider.getIfAvailable((s != null ? s.split(";") : null), "presets", null, iconName);
     454        Collection<String> s = Main.pref.getCollection("taggingpreset.iconpaths", null);
     455        ImageIcon icon = ImageProvider.getIfAvailable(s, "presets", null, iconName);
    456456        if (icon == null)
    457457        {
Note: See TracChangeset for help on using the changeset viewer.