Changeset 34045 in osm for applications/editors
- Timestamp:
- 2018-02-05T22:18:41+01:00 (7 years ago)
- Location:
- applications/editors/josm
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins
- Property svn:ignore
-
old new 16 16 osm-obj-info.git 17 17 tofix.git 18 atlas.git
-
- Property svn:ignore
-
applications/editors/josm/plugins/build-common.xml
r34039 r34045 23 23 <property name="plugin.test.dir" location="test"/> 24 24 <property name="plugin.src.dir" location="src"/> 25 <property name="plugin.doc.dir" location="javadoc"/> 25 26 <property name="plugin.lib.dir" location="lib"/> 26 27 <!-- this is the directory where the plugin jar is copied to --> … … 29 30 <property name="ant.build.javac.source" value="1.8"/> 30 31 <property name="plugin.jar" location="${plugin.dist.dir}/${ant.project.name}.jar"/> 32 <property name="plugin.sources.jar" location="${plugin.dist.dir}/${ant.project.name}-sources.jar"/> 33 <property name="plugin.javadoc.jar" location="${plugin.dist.dir}/${ant.project.name}-javadoc.jar"/> 31 34 <property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" /> 32 35 … … 120 123 <!-- 121 124 ********************************************************** 122 ** dist - creates the plugin jar 123 ********************************************************** 124 --> 125 <target name="dist" depends="compile, revision" unless="skip-dist">125 ** dist - creates the plugin jars 126 ********************************************************** 127 --> 128 <target name="dist" depends="compile,javadoc,revision" unless="skip-dist"> 126 129 <echo message="creating ${ant.project.name}.jar ... "/> 127 130 <antcall target="setup-dist" /> … … 183 186 </restrict> 184 187 </jar> 188 <jar destfile="${plugin.sources.jar}" basedir="${plugin.src.dir}"/> 189 <jar destfile="${plugin.javadoc.jar}" basedir="${plugin.doc.dir}"/> 185 190 <delete file="MANIFEST" failonerror="no"/> 186 191 <antcall target="post-dist" /> … … 211 216 </target> 212 217 <target name="javadoc"> 213 <javadoc destdir=" javadoc"218 <javadoc destdir="${plugin.doc.dir}" 214 219 sourcepath="${plugin.src.dir}" 215 220 encoding="UTF-8" … … 220 225 author="false"> 221 226 <classpath refid="plugin.classpath"/> 222 <link href="http ://docs.oracle.com/javase/8/docs/api"/>227 <link href="https://docs.oracle.com/javase/8/docs/api"/> 223 228 <link href="https://josm.openstreetmap.de/doc"/> 224 229 <doctitle><![CDATA[<h2>JOSM-${ant.project.name} - Javadoc</h2>]]></doctitle> … … 323 328 <target name="clean"> 324 329 <delete dir="${plugin.build.dir}"/> 330 <delete dir="${plugin.doc.dir}"/> 325 331 <delete dir="${checkstyle-build.dir}"/> 326 332 <delete file="${plugin.jar}"/> 333 <delete file="${plugin.sources.jar}"/> 334 <delete file="${plugin.javadoc.jar}"/> 327 335 </target> 328 336 <!-- … … 399 407 <arg value="up"/> 400 408 <arg value="../dist/${plugin.jar}"/> 409 <arg value="../dist/${plugin.javadoc.jar}"/> 410 <arg value="../dist/${plugin.sources.jar}"/> 401 411 </exec> 402 412 </target> … … 421 431 <arg value="commit"/> 422 432 <arg value="${plugin.jar}"/> 433 <arg value="${plugin.sources.jar}"/> 434 <arg value="${plugin.javadoc.jar}"/> 423 435 </exec> 424 436 </target>
Note:
See TracChangeset
for help on using the changeset viewer.