Changeset 23400 in osm for applications/editors
- Timestamp:
- 2010-09-29T22:28:10+02:00 (14 years ago)
- Location:
- applications/editors/josm/plugins/smed
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/smed/build.xml
r23260 r23400 41 41 --> 42 42 <property name="josm" location="../../core/dist/josm-custom.jar"/> 43 <property name="smed_ex" value="../dist/"/>44 43 <property name="plugin.build.dir" value="build/"/> 45 <property name="plugin.src.dir" value="src"/> 44 <property name="plugin.src.dir" value="src/"/> 45 <property name="smed.dist.dir" value="dist/"/> 46 46 <!-- this is the directory where the plugin jar is copied to --> 47 <property name="plugin.dist.dir" value="../../dist"/> 47 <property name="plugin.dist.dir" value="../../dist/"/> 48 <property name="smed_core.dist.dir" value="core/dist/"/> 48 49 <property name="ant.build.javac.target" value="1.5"/> 49 50 <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/> … … 56 57 <target name="init"> 57 58 <mkdir dir="${plugin.build.dir}"/> 58 <mkdir dir=" ../smed_about/smed_dist"/>59 <mkdir dir=" ../smed_ex/smed_dist"/>59 <mkdir dir="${smed_core.dist.dir}"/> 60 <mkdir dir="${smed.dist.dir}"/> 60 61 </target> 61 62 … … 93 94 </copy> 94 95 95 <delete>96 <fileset dir="${plugin.build.dir}">97 <include name="*smed_ex.jar"/>98 <include name="*smed_about.jar"/>99 </fileset>100 </delete>101 102 103 96 <copy todir="${plugin.build.dir}"> 104 <fileset dir="../smed_about/smed_dist"/>97 <fileset dir="${smed.dist.dir}"/> 105 98 </copy> 106 107 <copy todir="${plugin.build.dir}"> 108 <fileset dir="../smed_ex/smed_dist"/> 109 </copy> 110 99 111 100 <copy todir="${plugin.build.dir}"> 112 101 <fileset dir="."> … … 134 123 </manifest> 135 124 </jar> 125 126 <!-- install interface --> 127 <copy file="${plugin.jar}" todir="${smed_core.dist.dir}"/> 136 128 </target> 137 129 … … 160 152 <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/> 161 153 </target> 162 163 164 154 </project> -
applications/editors/josm/plugins/smed/plugs/oseam/build.xml
r23393 r23400 28 28 ** 29 29 --> 30 <project name=" OSeaM" default="dist" basedir=".">30 <project name="oseam" default="dist" basedir="."> 31 31 32 32 <!-- enter the SVN commit message --> … … 43 43 --> 44 44 <property name="josm" location="../../../../core/dist/josm-custom.jar"/> 45 <property name="smed" location="../../ ../../dist/smed.jar/"/>45 <property name="smed" location="../../core/dist/smed.jar"/> 46 46 <property name="plugin.build.dir" value="build"/> 47 47 <property name="plugin.src.dir" value="src"/> 48 48 <property name="smed.build.dir" value="../../../smed/build"/> 49 <property name=" smed.src.dir" value="../../../smed/src"/>49 <property name="delete_string" value="*${ant.project.name}.jar"/> 50 50 <!-- this is the directory where the plugin jar is copied to --> 51 <property name="plugin.dist.dir" value="../../ ../../dist"/>51 <property name="plugin.dist.dir" value="../../dist"/> 52 52 <property name="ant.build.javac.target" value="1.5"/> 53 53 <property name="plugin.jar" value="${plugin.dist.dir}/00_${DSTAMP}_${TSTAMP}_${ant.project.name}.jar"/> … … 60 60 <target name="init"> 61 61 <mkdir dir="${plugin.build.dir}"/> 62 </target> 63 64 <!-- 65 ********************************************************** 66 ** init_smed - initializes the build of smed 67 ********************************************************** 68 --> 69 <target name="init_smed"> 70 <mkdir dir="${smed.build.dir}"/> 71 </target> 72 73 <!-- 74 ********************************************************** 75 ** compile_smed - compiles the source tree of smed 76 ********************************************************** 77 --> 78 <target name="compile_smed" depends="init_smed"> 79 <echo message="compiling sources for smed.jar ... "/> 80 <javac srcdir="${smed.src.dir}" classpath="${josm}" debug="true" destdir="${smed.build.dir}"> 81 <compilerarg value="-Xlint:deprecation"/> 82 <compilerarg value="-Xlint:unchecked"/> 83 </javac> 62 <mkdir dir="${plugin.dist.dir}"/> 84 63 </target> 85 64 86 65 <!-- 87 66 ********************************************************** 88 ** dist_smed - creates smed.jar89 **********************************************************90 -->91 <target name="dist_smed" depends="compile_smed">92 <echo message="creating smed.jar ... "/>93 94 <copy todir="${smed.build.dir}/images">95 <fileset dir="${smed.src.dir}/images"/>96 </copy>97 98 <copy todir="${smed.build.dir}/images">99 <fileset dir="../../../smed/images"/>100 </copy>101 102 <copy todir="${smed.build.dir}/smed/msg">103 <fileset dir="${smed.src.dir}/smed/msg"/>104 </copy>105 106 <copy todir="${smed.build.dir}">107 <fileset dir="../../../smed">108 <include name="*.txt" />109 </fileset>110 </copy>111 112 <jar destfile="${smed}" basedir="${smed.build.dir}">113 <!--114 ************************************************115 ** configure these properties. Most of them will be copied to the plugins116 ** manifest file. Property values will also show up in the list available117 ** plugins: http://josm.openstreetmap.de/wiki/Plugins.118 **119 ************************************************120 -->121 <manifest>122 <attribute name="Author" value="Werner"/>123 <attribute name="Plugin-Class" value="smed.Smed"/>124 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>125 <attribute name="Plugin-Description" value="Create and edit seamaps for OpenSeaMap"/>126 <attribute name="Plugin-Icon" value="images/Smed.png"/>127 <attribute name="Plugin-Link" value="http://openseamap.org/"/>128 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>129 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>130 </manifest>131 </jar>132 </target>133 134 <!--135 **********************************************************136 67 ** compile - complies the source tree 137 68 ********************************************************** 138 69 --> 139 <target name="compile" depends="init ,dist_smed">70 <target name="compile" depends="init"> 140 71 <echo message="compiling sources for ${plugin.jar} ... "/> 141 72 <javac srcdir="src" classpath="${josm}:${smed}" debug="true" destdir="${plugin.build.dir}"> … … 161 92 <fileset dir="images"/> 162 93 </copy> 163 <copy todir="${plugin.build.dir}/ oseam/msg">164 <fileset dir="${plugin.src.dir}/ oseam/msg"/>94 <copy todir="${plugin.build.dir}/${ant.project.name}/msg"> 95 <fileset dir="${plugin.src.dir}/${ant.project.name}/msg"/> 165 96 </copy> 166 97 <copy todir="${plugin.build.dir}"> … … 173 104 <delete> 174 105 <fileset dir="${plugin.dist.dir}"> 175 <include name=" *OSeaM.jar"/>106 <include name="${delete_string}"/> 176 107 </fileset> 177 108 </delete> … … 196 127 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/> 197 128 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/> 198 <attribute name="Class-Path" value="./tplug/ifc.jar"/>199 129 </manifest> 200 130 </jar> … … 227 157 <target name="clean"> 228 158 <delete dir="${plugin.build.dir}"/> 229 <delete file="${plugin.jar}"/>230 159 <delete> 231 160 <fileset dir="${plugin.dist.dir}"> 232 <include name=" *OSeaM.jar"/>161 <include name="${delete_string}"/> 233 162 </fileset> 234 163 </delete> … … 238 167 ********************************************************** 239 168 ** install - install the plugin in your local JOSM installation 240 ********************************************************** 241 --> 242 <target name="install" depends="dist"> 169 ** for developing 170 ********************************************************** 171 --> 172 <target name="install-develop" depends="dist"> 243 173 <property environment="env"/> 244 174 <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins/splug" else="${user.home}/.josm/plugins/splug"> … … 250 180 <delete> 251 181 <fileset dir="${josm.plugins.dir}"> 252 <include name=" *OSeaM.jar"/>182 <include name="${delete_string}"/> 253 183 </fileset> 254 184 </delete> 255 185 256 186 <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/> 257 </target> 258 187 188 <delete file="${plugin.jar}"/> 189 190 </target> 259 191 260 192 <!-- … … 264 196 ** extracts the JOSM release for the JOSM version in ../core and saves it in the 265 197 ** property ${coreversion.info.entry.revision} 266 ** 267 --> 198 ** 199 --> 200 268 201 <target name="core-info"> 269 202 <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false"> … … 278 211 <delete file="core.info.xml" /> 279 212 </target> 280 213 281 214 <!-- 282 215 ** commits the source tree for this plugin … … 354 287 </target> 355 288 356 <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist"> 289 <target name="publish"> <!-- depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist" --> 290 <echo>No normal josm-plugin, publishing over smed !!! 291 1. ant - dist to each subplugin 292 2. ant publish to smed 293 </echo> 357 294 </target> 358 295 </project>
Note:
See TracChangeset
for help on using the changeset viewer.