Changeset 16168 in josm


Ignore:
Timestamp:
2020-03-17T22:26:12+01:00 (14 months ago)
Author:
simon04
Message:

see #16860 - Resolve JavaCC using Apache Ivy

Location:
trunk
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/.settings/sf.eclipse.javacc.prefs

    r10850 r16168  
    88KEEP_DEL_FILES_IN_HISTORY=false
    99MARK_GEN_FILES_AS_DERIVED=true
    10 RUNTIME_JJJAR=${project_loc}/tools/javacc.jar
     10RUNTIME_JJJAR=${project_loc}/lib/tools/javacc-jar.jar
    1111RUNTIME_JTBJAR=${eclipse_home}/plugins/sf.eclipse.javacc_1.5.27/jtb-1.4.7.jar
    1212RUNTIME_JVMOPTIONS=
  • trunk/README

    r16050 r16168  
    161161    - jacocoant.jar         used to include coverage data into JUnit test reports
    162162    - japicc/               used to generate a compatibility report between optimized jar and normal one
    163     - javacc.jar            used in the build process to generate some .java files from a javacc source file
    164                             (src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj)
    165163    - proguard.jar          optimize final binary jar - see build.xml (not used in production so far)
    166164    - spotbugs/             libs and config files for spotbugs (automatically detects common bugs and potential
  • trunk/build.xml

    r16167 r16168  
    2020        <property name="lib.dir"   location="${base.dir}/lib"/>
    2121        <property name="tools.dir" location="${base.dir}/tools"/>
     22        <property name="tools.ivy" location="${tools.dir}/ivy.xml"/>
    2223        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${tools.dir}/ivy/ivy.jar"/>
    2324    </target>
     
    276277    </target>
    277278    <target name="javacc" depends="init" unless="javacc.notRequired">
     279        <ivy:cachepath file="${tools.ivy}" pathid="javacc.classpath" conf="javacc"/>
    278280        <mkdir dir="${mapcss.dir}/parsergen"/>
    279281        <java classname="javacc" fork="true" failonerror="true">
    280             <classpath path="${javacc.home}/javacc.jar"/>
     282            <classpath refid="javacc.classpath"/>
    281283            <arg value="-DEBUG_PARSER=false"/>
    282284            <arg value="-DEBUG_TOKEN_MANAGER=false"/>
     
    366368            <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
    367369            <compilerarg value="-XDignore.symbol.file"/>
    368             <compilerarg value="-Xplugin:ErrorProne -Xep:ReferenceEquality:OFF -Xep:ImmutableEnumChecker:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:FloatingPointLiteralPrecision:OFF -Xep:ShortCircuitBoolean:OFF -Xep:StringSplitter:OFF -Xep:JdkObsolete:OFF -Xep:UnnecessaryParentheses:OFF -Xep:EqualsGetClass:OFF -Xep:ThreadPriorityCheck:OFF -Xep:UndefinedEquals:OFF -Xep:MixedMutabilityReturnType:OFF -Xep:OverrideThrowableToString:OFF -Xep:JavaTimeDefaultTimeZone:OFF -Xep:UnusedVariable:OFF -Xep:EqualsUsingHashCode:OFF -Xep:BadImport:OFF -Xep:UnnecessaryLambda:OFF -Xep:AnnotateFormatMethod:OFF -Xep:MutablePublicArray:OFF"/>
     370            <compilerarg value="-Xplugin:ErrorProne -XepExcludedPaths:.*/parsergen/.* -Xep:ReferenceEquality:OFF -Xep:ImmutableEnumChecker:OFF -Xep:FutureReturnValueIgnored:OFF -Xep:FloatingPointLiteralPrecision:OFF -Xep:ShortCircuitBoolean:OFF -Xep:StringSplitter:OFF -Xep:JdkObsolete:OFF -Xep:UnnecessaryParentheses:OFF -Xep:EqualsGetClass:OFF -Xep:ThreadPriorityCheck:OFF -Xep:UndefinedEquals:OFF -Xep:MixedMutabilityReturnType:OFF -Xep:OverrideThrowableToString:OFF -Xep:JavaTimeDefaultTimeZone:OFF -Xep:UnusedVariable:OFF -Xep:EqualsUsingHashCode:OFF -Xep:BadImport:OFF -Xep:UnnecessaryLambda:OFF -Xep:AnnotateFormatMethod:OFF -Xep:MutablePublicArray:OFF"/>
    369371            <compilerarg line="-Xmaxwarns 1000"/>
    370372            <classpath>
     
    948950
    949951    <target name="spotbugs" depends="dist">
    950         <ivy:cachepath file="${tools.dir}/ivy.xml" pathid="spotbugs.classpath" conf="spotbugs"/>
     952        <ivy:cachepath file="${tools.ivy}" pathid="spotbugs.classpath" conf="spotbugs"/>
    951953        <taskdef name="spotbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${toString:spotbugs.classpath}"/>
    952954        <spotbugs output="xml"
     
    964966
    965967    <target name="pmd" depends="init-properties">
    966         <ivy:cachepath file="${tools.dir}/ivy.xml" pathid="pmd.classpath" conf="pmd"/>
     968        <ivy:cachepath file="${tools.ivy}" pathid="pmd.classpath" conf="pmd"/>
    967969        <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpath="${toString:pmd.classpath}"/>
    968970        <pmd shortFilenames="true" cacheLocation="${pmd.dir}/cache" encoding="UTF-8">
     
    11751177        <ivy:retrieve pattern="${lib.dir}/runtime/[artifact]-[type].[ext]" conf="runtime"/>
    11761178        <ivy:retrieve pattern="${lib.dir}/sources/[artifact]-[type].[ext]" conf="sources"/>
     1179        <ivy:retrieve pattern="${lib.dir}/tools/[artifact]-[type].[ext]" conf="javacc" file="${tools.ivy}"/>
    11771180    </target>
    11781181</project>
  • trunk/tools/ivy.xml

    r16167 r16168  
    44    <info organisation="org.openstreetmap" module="josm"/>
    55    <configurations>
     6        <conf name="javacc" description="Everything needed for running JavaCC"/>
    67        <conf name="pmd" description="Everything needed for running PMD"/>
    78        <conf name="spotbugs" description="Everything needed for running SpotBugs"/>
    89    </configurations>
    910    <dependencies>
     11        <!-- javacc->default -->
     12        <dependency org="net.java.dev.javacc" name="javacc" rev="7.0.3" conf="javacc->default"/>
    1013        <!-- pmd->default -->
    1114        <dependency org="net.sourceforge.pmd" name="pmd-core" rev="6.20.0" conf="pmd->default"/>
Note: See TracChangeset for help on using the changeset viewer.