Changeset 35489 in osm for applications/editors


Ignore:
Timestamp:
2020-06-08T20:35:58+02:00 (4 years ago)
Author:
simon04
Message:

see #josm19334 - resolve error_prone using Ivy

File:
1 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/build-common.xml

    r35463 r35489  
    1818    <property name="josm.test.build.dir"    location="../../core/test/build"/>
    1919    <property name="jmockit.jar"            location="../00_core_test_lib/jmockit.jar"/>
    20     <property name="error_prone_core.jar"   location="../00_core_tools/error_prone_core.jar"/>
    21     <property name="error_prone_javac.jar"  location="../00_core_tools/error_prone_javac.jar"/>
    22     <property name="auto-value-annotations.jar" location="../00_core_tools/auto-value-annotations.jar"/>
    23     <property name="dataflow.jar"           location="../00_core_tools/dataflow-shaded.jar"/>
    24     <property name="javacutil.jar"          location="../00_core_tools/javacutil.jar"/>
    25     <property name="failureaccess.jar"      location="../00_core_tools/failureaccess.jar"/>
    2620    <property name="checkstyle-build.dir"   location="../00_core_tools/checkstyle/build"/>
    27     <property name="jformatstring.jar"      location="../00_core_tools/spotbugs/jFormatString-3.0.0.jar"/>
    2821    <property name="annotations.jar"        location="../00_core_tools/spotbugs/spotbugs-annotations.jar"/>
    2922    <property name="core.tools.ivy"         location="../00_core_tools/ivy.xml"/>
     
    8477    <fileset id="jaxb.jars" dir="${plugin.tools.dir}/jaxb-ri/lib" includes="**/*.jar"/>
    8578
    86     <path id="jdk8.boot.classpath">
    87         <pathelement location="${error_prone_javac.jar}"/>
    88         <fileset refid="jaxb.jars"/>
    89     </path>
    9079    <path id="plugin.classpath">
    9180        <pathelement location="${josm}"/>
     
    10190        <fileset refid="jaxb.jars"/>
    10291    </path>
    103     <path id="processor.path">
    104         <pathelement location="${error_prone_core.jar}"/>
    105         <pathelement location="${dataflow.jar}"/>
    106         <pathelement location="${javacutil.jar}"/>
    107         <pathelement location="${failureaccess.jar}"/>
    108         <pathelement location="${jformatstring.jar}"/>
    109         <pathelement location="${auto-value-annotations.jar}"/>
    110     </path>
    11192
    11293    <!--
     
    126107        <!-- to be overridden by plugins that need to perform additional tasks before compiling -->
    127108    </target>
    128     <target name="compile" depends="init, pre-compile" unless="skip-compile">
     109    <target name="compile" depends="init, pre-compile, resolve-tools" unless="skip-compile">
    129110        <echo message="compiling sources for ${plugin.jar} ..."/>
     111        <path id="jdk8.boot.classpath">
     112            <path refid="errorprone_javac.classpath"/>
     113            <fileset refid="jaxb.jars"/>
     114        </path>
    130115        <javac srcdir="${plugin.src.dir}" debug="true" destdir="${plugin.build.dir}" includeantruntime="false"
    131116            encoding="UTF-8" target="${java.lang.version}" source="${java.lang.version}" fork="yes">
     
    133118            <compilerarg line="-XDcompilePolicy=simple"/>
    134119            <compilerarg value="-processorpath"/>
    135             <compilerarg pathref="processor.path"/>
     120            <compilerarg pathref="errorprone.classpath"/>
    136121            <compilerarg value="-Xlint:deprecation"/>
    137122            <compilerarg value="-Xlint:unchecked"/>
     
    732717    <target name="resolve-tools" depends="init-ivy" description="Resolves tools using Apache Ivy">
    733718        <ivy:resolve file="${core.tools.ivy}"/>
     719        <ivy:cachepath file="${core.tools.ivy}" pathid="errorprone.classpath" conf="errorprone"/>
     720        <ivy:cachepath file="${core.tools.ivy}" pathid="errorprone_javac.classpath" conf="errorprone_javac"/>
    734721        <ivy:cachepath file="${core.tools.ivy}" pathid="checkstyle.classpath" conf="checkstyle"/>
    735722        <ivy:cachepath file="${core.tools.ivy}" pathid="spotbugs.classpath" conf="spotbugs"/>
Note: See TracChangeset for help on using the changeset viewer.