Changeset 35378 in osm for applications/editors/josm/plugins/comfort0

Timestamp:

2020-03-17T22:26:26+01:00 (4 years ago)

Author:

simon04

Message:

see #josm16860 - Resolve JavaCC using Apache Ivy

File:

• applications/editors/josm/plugins/comfort0/build.xml (modified) (3 diffs)

applications/editors/josm/plugins/comfort0/build.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project name="comfort0" default="dist" basedir=".">
+<project name="comfort0" default="dist" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
 
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
@@ -15 +15 @@
     <import file="../build-common.xml"/>
 
-    <property name="javacc.home" location="../00_core_tools"/>
     <property name="parser.dir" location="src/net/simon04/comfort0/level0l"/>
     <target name="pre-compile" depends="javacc"/>
     <target name="javacc" depends="init" unless="javacc.notRequired">
+        <ivy:cachepath file="${core.tools.ivy}" pathid="javacc.classpath" conf="javacc"/>
         <mkdir dir="${parser.dir}/parsergen"/>
-        <exec append="false" executable="java" failifexecutionfails="true">
-            <arg value="-cp"/>
-            <arg value="${javacc.home}/javacc.jar"/>
-            <arg value="javacc"/>
+        <java classname="javacc" fork="true" failonerror="true">
+            <classpath refid="javacc.classpath"/>
             <arg value="-DEBUG_PARSER=false"/>
             <arg value="-DEBUG_TOKEN_MANAGER=false"/>
@@ -30 +28 @@
             <arg value="-OUTPUT_DIRECTORY=${parser.dir}/parsergen"/>
             <arg value="${parser.dir}/Level0LParser.jj"/>
-        </exec>
+        </java>
     </target>