Changeset 34225 in osm for applications/editors/josm


Ignore:
Timestamp:
2018-05-29T21:34:54+02:00 (6 years ago)
Author:
holgermappt
Message:

Do not distribute plugin-sources.jar and plugin-javadoc.jar. This reverts some of the changes introduced in r34045.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/build-common.xml

    r34224 r34225  
    3030    <property name="ant.build.javac.source" value="1.8"/>
    3131    <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"/>
    3432    <property name="javac.compiler"         value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
    3533
    … …  
    123121    <!--
    124122    **********************************************************
    125     ** dist - creates the plugin jars
    126     **********************************************************
    127     -->
    128     <target name="dist" depends="compile,javadoc,revision" unless="skip-dist">
     123    ** dist - creates the plugin jar
     124    **********************************************************
     125    -->
     126    <target name="dist" depends="compile,revision" unless="skip-dist">
    129127        <echo message="creating ${ant.project.name}.jar ... "/>
    130128        <antcall target="setup-dist" />
    … …  
    186184            </restrict>
    187185        </jar>
    188         <jar destfile="${plugin.sources.jar}" basedir="${plugin.src.dir}"/>
    189         <jar destfile="${plugin.javadoc.jar}" basedir="${plugin.doc.dir}"/>
    190186        <delete file="MANIFEST" failonerror="no"/>
    191187        <antcall target="post-dist" />
    … …  
    331327        <delete dir="${checkstyle-build.dir}"/>
    332328        <delete file="${plugin.jar}"/>
    333         <delete file="${plugin.sources.jar}"/>
    334         <delete file="${plugin.javadoc.jar}"/>
    335329    </target>
    336330    <!--
    … …  
    407401            <arg value="up"/>
    408402            <arg value="${plugin.jar}"/>
    409             <arg value="${plugin.javadoc.jar}"/>
    410             <arg value="${plugin.sources.jar}"/>
    411403        </exec>
    412404    </target>
    … …  
    431423            <arg value="commit"/>
    432424            <arg value="${plugin.jar}"/>
    433             <arg value="${plugin.sources.jar}"/>
    434             <arg value="${plugin.javadoc.jar}"/>
    435425        </exec>
    436426    </target>
Note: See TracChangeset for help on using the changeset viewer.