Changeset 30287 in osm
- Timestamp:
- 2014-02-18T18:19:15+01:00 (11 years ago)
- Location:
- applications/editors/josm/plugins/smed
- Files:
-
- 2 edited
-
build.xml (modified) (2 diffs)
-
src/seamarks/SeaMark.java (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/smed/build.xml
r29896 r30287 1 1 <?xml version="1.0" encoding="utf-8"?> 2 <!--3 ** This is a template build file for a JOSM plugin.4 **5 ** Maintaining versions6 ** ====================7 ** see README.template8 **9 ** Usage10 ** =====11 ** To build it run12 **13 ** > ant dist14 **15 ** To install the generated plugin locally (in you default plugin directory) run16 **17 ** > ant install18 **19 ** The generated plugin jar is not automatically available in JOSMs plugin configuration20 ** dialog. You have to check it in first.21 **22 ** Use the ant target 'publish' to check in the plugin and make it available to other23 ** JOSM users:24 ** set the properties commit.message and plugin.main.version25 ** and run26 ** > ant publish27 **28 **29 -->30 2 <project name="SeaMapEditor" default="dist" basedir="."> 31 3 <!-- enter the SVN commit message --> … … 33 5 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 6 <property name="plugin.main.version" value="4394"/> 35 <!-- should not be necessary to change the following properties --> 36 <property name="josm" location="../../core/dist/josm-custom.jar"/> 37 <property name="plugin.build.dir" value="build"/> 38 <property name="plugin.src.dir" value="src"/> 39 <!-- this is the directory where the plugin jar is copied to --> 40 <property name="plugin.dist.dir" value="../../dist"/> 41 <property name="ant.build.javac.target" value="1.5"/> 42 <property name="plugin.dist.dir" value="../../dist"/> 43 <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/> 44 <!-- 45 ********************************************************** 46 ** init - initializes the build 47 ********************************************************** 7 8 <!-- Configure these properties (replace "..." accordingly). 9 See http://josm.openstreetmap.de/wiki/DevelopersGuide/DevelopingPlugins 48 10 --> 49 <target name="init"> 50 <mkdir dir="${plugin.build.dir}"/> 51 </target> 52 <!-- 53 ********************************************************** 54 ** compile - complies the source tree 55 ********************************************************** 56 --> 57 <target name="compile" depends="init"> 58 <echo message="compiling sources for ${plugin.jar} ... "/> 59 <javac srcdir="src" classpath="${josm}" debug="true" destdir="${plugin.build.dir}"> 60 <compilerarg value="-Xlint:deprecation"/> 61 <compilerarg value="-Xlint:unchecked"/> 62 </javac> 63 </target> 64 <!-- 65 ********************************************************** 66 ** dist - creates the plugin jar 67 ********************************************************** 68 --> 69 <target name="dist" depends="compile,revision"> 70 <echo message="creating ${ant.project.name}.jar ... "/> 71 <copy todir="${plugin.build.dir}/resources"> 72 <fileset dir="resources"/> 73 </copy> 74 <copy todir="${plugin.build.dir}/images"> 75 <fileset dir="${plugin.src.dir}/images"/> 76 </copy> 77 <copy todir="${plugin.build.dir}/images"> 78 <fileset dir="images"/> 79 </copy> 80 <copy todir="${plugin.build.dir}/msg"> 81 <fileset dir="${plugin.src.dir}/messages/msg"/> 82 </copy> 83 <copy todir="${plugin.build.dir}/data"> 84 <fileset dir="data"/> 85 </copy> 86 <copy todir="${plugin.build.dir}"> 87 <fileset dir="."> 88 <include name="README"/> 89 <include name="LICENSE"/> 90 </fileset> 91 </copy> 92 <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}"> 93 <!-- 94 ************************************************ 95 ** configure these properties. Most of them will be copied to the plugins 96 ** manifest file. Property values will also show up in the list available 97 ** plugins: http://josm.openstreetmap.de/wiki/Plugins. 98 ** 99 ************************************************ 100 --> 101 <manifest> 102 <attribute name="Author" value="Malcolm Herring"/> 103 <attribute name="Plugin-Class" value="smed.Smed"/> 104 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/> 105 <attribute name="Plugin-Description" value="Edit features for OpenSeaMap"/> 106 <attribute name="Plugin-Icon" value="images/Smed.png"/> 107 <attribute name="Plugin-Link" value="http://openseamap.org/"/> 108 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/> 109 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/> 110 </manifest> 111 </jar> 112 </target> 113 <!-- 114 ********************************************************** 115 ** revision - extracts the current revision number for the 116 ** file build.number and stores it in the XML property 117 ** version.* 118 ********************************************************** 119 --> 120 <target name="revision"> 121 <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false"> 122 <env key="LANG" value="C"/> 123 <arg value="info"/> 124 <arg value="--xml"/> 125 <arg value="."/> 126 </exec> 127 <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/> 128 <delete file="REVISION"/> 129 </target> 130 <!-- 131 ********************************************************** 132 ** clean - clean up the build environment 133 ********************************************************** 134 --> 135 <target name="clean"> 136 <delete dir="${plugin.build.dir}"/> 137 <delete file="${plugin.jar}"/> 138 </target> 139 <!-- 140 ********************************************************** 141 ** install - install the plugin in your local JOSM installation 142 ********************************************************** 143 --> 144 <target name="install" depends="dist"> 145 <property environment="env"/> 146 <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins"> 147 <and> 148 <os family="windows"/> 149 </and> 150 </condition> 151 <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/> 152 </target> 153 <!-- 154 ************************** Publishing the plugin *********************************** 155 --> 156 <!-- 157 ** extracts the JOSM release for the JOSM version in ../core and saves it in the 158 ** property ${coreversion.info.entry.revision} 159 --> 160 <target name="core-info"> 161 <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false"> 162 <env key="LANG" value="C"/> 163 <arg value="info"/> 164 <arg value="--xml"/> 165 <arg value="../../core"/> 166 </exec> 167 <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/> 168 <echo>Building against core revision ${coreversion.info.entry.revision}.</echo> 169 <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo> 170 <delete file="core.info.xml"/> 171 </target> 172 <!-- commits the source tree for this plugin --> 173 <target name="commit-current"> 174 <echo>Commiting the plugin source with message '${commit.message}' ...</echo> 175 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 176 <env key="LANG" value="C"/> 177 <arg value="commit"/> 178 <arg value="-m '${commit.message}'"/> 179 <arg value="."/> 180 </exec> 181 </target> 182 <!-- updates (svn up) the source tree for this plugin --> 183 <target name="update-current"> 184 <echo>Updating plugin source ...</echo> 185 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 186 <env key="LANG" value="C"/> 187 <arg value="up"/> 188 <arg value="."/> 189 </exec> 190 <echo>Updating ${plugin.jar} ...</echo> 191 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 192 <env key="LANG" value="C"/> 193 <arg value="up"/> 194 <arg value="../dist/${plugin.jar}"/> 195 </exec> 196 </target> 197 <!-- commits the plugin.jar --> 198 <target name="commit-dist"> 199 <echo> 200 ***** Properties of published ${plugin.jar} ***** 201 Commit message : '${commit.message}' 202 Plugin-Mainversion: ${plugin.main.version} 203 JOSM build version: ${coreversion.info.entry.revision} 204 Plugin-Version : ${version.entry.commit.revision} 205 ***** / Properties of published ${plugin.jar} ***** 206 207 Now commiting ${plugin.jar} ... 208 </echo> 209 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 210 <env key="LANG" value="C"/> 211 <arg value="-m '${commit.message}'"/> 212 <arg value="commit"/> 213 <arg value="${plugin.jar}"/> 214 </exec> 215 </target> 216 <!-- make sure svn is present as a command line tool --> 217 <target name="ensure-svn-present"> 218 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false" failonerror="false" resultproperty="svn.exit.code"> 219 <env key="LANG" value="C"/> 220 <arg value="--version"/> 221 </exec> 222 <fail message="Fatal: command 'svn --version' failed. Please make sure svn is installed on your system."> 223 <!-- return code not set at all? Most likely svn isn't installed --> 224 <condition> 225 <not> 226 <isset property="svn.exit.code"/> 227 </not> 228 </condition> 229 </fail> 230 <fail message="Fatal: command 'svn --version' failed. Please make sure a working copy of svn is installed on your system."> 231 <!-- error code from SVN? Most likely svn is not what we are looking on this system --> 232 <condition> 233 <isfailure code="${svn.exit.code}"/> 234 </condition> 235 </fail> 236 </target> 237 <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist"> 238 </target> 11 <property name="plugin.author" value="Malcolm Herring"/> 12 <property name="plugin.class" value="smed.Smed"/> 13 <property name="plugin.description" value="Edit features for OpenSeaMap"/> 14 <property name="plugin.icon" value="images/Smed.png"/> 15 <property name="plugin.link" value="http://openseamap.org/"/> 16 17 <!-- ** include targets that all plugins have in common ** --> 18 <import file="../build-common.xml"/> 19 239 20 </project> -
applications/editors/josm/plugins/smed/src/seamarks/SeaMark.java
r29895 r30287 246 246 CatSTR.put(Cat.SPM_OFAL, "outfall"); 247 247 CatSTR.put(Cat.SPM_ODAS, "odas"); 248 CatSTR.put(Cat.SPM_RECN, "recreation al");248 CatSTR.put(Cat.SPM_RECN, "recreation_zone"); 249 249 CatSTR.put(Cat.SPM_MOOR, "mooring"); 250 250 CatSTR.put(Cat.SPM_LNBY, "lanby"); … … 252 252 CatSTR.put(Cat.SPM_NOTC, "notice"); 253 253 CatSTR.put(Cat.SPM_TSS, "tss"); 254 CatSTR.put(Cat.SPM_FOUL, "foul ");254 CatSTR.put(Cat.SPM_FOUL, "foul_ground"); 255 255 CatSTR.put(Cat.SPM_DIVE, "diving"); 256 CatSTR.put(Cat.SPM_FRRY, "ferry ");256 CatSTR.put(Cat.SPM_FRRY, "ferry_crossing"); 257 257 CatSTR.put(Cat.SPM_ANCH, "anchorage"); 258 258 CatSTR.put(Cat.MOR_DLPN, "dolphin");
Note:
See TracChangeset
for help on using the changeset viewer.
