Changeset 1492 in josm for trunk

Timestamp:

2009-03-16T13:35:20+01:00 (16 years ago)

Author:

stoecker

Message:

added MacOS support in build. patch by Thilo Hannemann

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• macosx (added)
• macosx/JOSM.app (added)
• macosx/JOSM.app/Contents (added)
• macosx/JOSM.app/Contents/Info.plist (added)
• macosx/JOSM.app/Contents/MacOS (added)
• macosx/JOSM.app/Contents/MacOS/JOSM (added)
• macosx/JOSM.app/Contents/PkgInfo (added)
• macosx/JOSM.app/Contents/Resources (added)
• macosx/JOSM.app/Contents/Resources/JOSM.icns (added)
• macosx/JOSM.app/Contents/Resources/Java (added)
• presets/presets.xml (modified) (1 diff)
• src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (1 diff)

trunk/build.xml

@@ -66 +66 @@
         </target>
 
+        <target name="distmac" depends="dist">
+                <!-- modify MacOS X Info.plist file to hold the SVN version number -->
+                <copy file="macosx/JOSM.app/Contents/Info.plist" todir="build"/>
+                <replace file="build/Info.plist" token="@SVNVersion@" value="${version.entry.commit.revision}"/>
+                <!-- create ZIP file with MacOS X application bundle -->
+                <zip destfile="dist/josm-custom-macosx.zip" update="true">
+                        <zipfileset dir="build" includes="CONTRIBUTION README LICENSE"/>
+                        <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"/>
+                        <zipfileset dir="build" includes="Info.plist" prefix="JOSM.app/Contents"/>
+                        <zipfileset dir="dist" includes="josm-custom.jar" prefix="JOSM.app/Contents/Resources/Java"/>
+                        <zipfileset dir="macosx" includes="JOSM.app/Contents/MacOS/JOSM" filemode="755"/>
+                </zip>
+        </target>
+
         <target name="compile" depends="init">
                 <javac srcdir="src" classpathref="classpath" destdir="build"

trunk/presets/presets.xml

@@ -1808 +1808 @@
             <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" />
         </item>
-        <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway.relation">
+        <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway,relation">
             <label text="Edit Racetrack" />
             <key key="leisure" value="track" />

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -452 +452 @@
      */
     public void setIcon(String iconName) {
-        String s = Main.pref.get("taggingpreset.iconpaths");
-        ImageIcon icon = ImageProvider.getIfAvailable((s != null ? s.split(";") : null), "presets", null, iconName);
+        Collection<String> s = Main.pref.getCollection("taggingpreset.iconpaths", null);
+        ImageIcon icon = ImageProvider.getIfAvailable(s, "presets", null, iconName);
         if (icon == null)
         {