Changeset 35378 in osm for applications/editors


Ignore:
Timestamp:
2020-03-17T22:26:26+01:00 (5 years ago)
Author:
simon04
Message:

see #josm16860 - Resolve JavaCC using Apache Ivy

Location:
applications/editors/josm/plugins
Files:
3 edited

Legend:

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

    r34535 r35378  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <project name="OpeningHoursEditor" default="dist" basedir=".">
     2<project name="OpeningHoursEditor" default="dist" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
    33    <!-- enter the SVN commit message -->
    44    <property name="commit.message" value="fixed main version"/>
     
    1616    <import file="../build-common.xml"/>
    1717       
    18     <property name="javacc.home" location="../00_core_tools"/>
    1918        <property name="parser.dir" location="${plugin.src.dir}/org/openstreetmap/josm/plugins/ohe/parser"/>
    2019       
    2120    <target name="javacc" depends="init" unless="javacc.notRequired">
    22         <exec append="false" executable="java" failifexecutionfails="true">
    23             <arg value="-cp"/>
    24             <arg value="${javacc.home}/javacc.jar"/>
    25             <arg value="javacc"/>
     21        <ivy:cachepath file="${core.tools.ivy}" pathid="javacc.classpath" conf="javacc"/>
     22        <java classname="javacc" fork="true" failonerror="true">
     23            <classpath refid="javacc.classpath"/>
    2624            <arg value="-JDK_VERSION=1.8"/>
    2725            <arg value="-GRAMMAR_ENCODING=UTF-8"/>
     
    2927            <arg value="-OUTPUT_DIRECTORY=${parser.dir}"/>
    3028            <arg value="${parser.dir}/OpeningTimeCompiler.jj"/>
    31         </exec>
     29        </java>
    3230    </target>
    3331
  • applications/editors/josm/plugins/build-common.xml

    r35377 r35378  
    2727    <property name="jformatstring.jar"      location="../00_core_tools/spotbugs/jFormatString-3.0.0.jar"/>
    2828    <property name="annotations.jar"        location="../00_core_tools/spotbugs/spotbugs-annotations.jar"/>
     29    <property name="core.tools.ivy"         location="../00_core_tools/ivy.xml"/>
    2930    <property name="plugin.tools.dir"       location="../00_tools"/>
    3031    <property name="plugin.build.dir"       location="build"/>
     
    663664
    664665    <target name="spotbugs" depends="compile">
    665         <ivy:cachepath file="../00_core_tools/ivy.xml" pathid="spotbugs.classpath" conf="spotbugs"/>
     666        <ivy:cachepath file="${core.tools.ivy}" pathid="spotbugs.classpath" conf="spotbugs"/>
    666667        <taskdef name="spotbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${toString:spotbugs.classpath}"/>
    667668        <spotbugs output="xml"
  • applications/editors/josm/plugins/comfort0/build.xml

    r35316 r35378  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <project name="comfort0" default="dist" basedir=".">
     2<project name="comfort0" default="dist" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
    33
    44    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     
    1515    <import file="../build-common.xml"/>
    1616
    17     <property name="javacc.home" location="../00_core_tools"/>
    1817    <property name="parser.dir" location="src/net/simon04/comfort0/level0l"/>
    1918    <target name="pre-compile" depends="javacc"/>
    2019    <target name="javacc" depends="init" unless="javacc.notRequired">
     20        <ivy:cachepath file="${core.tools.ivy}" pathid="javacc.classpath" conf="javacc"/>
    2121        <mkdir dir="${parser.dir}/parsergen"/>
    22         <exec append="false" executable="java" failifexecutionfails="true">
    23             <arg value="-cp"/>
    24             <arg value="${javacc.home}/javacc.jar"/>
    25             <arg value="javacc"/>
     22        <java classname="javacc" fork="true" failonerror="true">
     23            <classpath refid="javacc.classpath"/>
    2624            <arg value="-DEBUG_PARSER=false"/>
    2725            <arg value="-DEBUG_TOKEN_MANAGER=false"/>
     
    3028            <arg value="-OUTPUT_DIRECTORY=${parser.dir}/parsergen"/>
    3129            <arg value="${parser.dir}/Level0LParser.jj"/>
    32         </exec>
     30        </java>
    3331    </target>
    3432
Note: See TracChangeset for help on using the changeset viewer.