Changeset 36183 in osm for applications/editors/josm/plugins/OpeningHoursEditor/build.xml

Timestamp:

2023-10-26T22:28:32+02:00 (3 years ago)

Author:

taylor.smock

Message:

See #23218: Fix compiling OpeningHoursEditor with arguments pointing to a different JOSM source directory

This also fixes some lint issues in the plugin.

File:

• applications/editors/josm/plugins/OpeningHoursEditor/build.xml (modified) (2 diffs)

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

@@ -16 +16 @@
     <import file="../build-common.xml"/>
         
-        <property name="parser.dir" location="${plugin.src.dir}/org/openstreetmap/josm/plugins/ohe/parser"/>
+    <property name="parser.dir" location="${plugin.src.dir}/org/openstreetmap/josm/plugins/ohe/parser"/>
         
-    <target name="javacc" depends="init" unless="javacc.notRequired">
+    <target name="javacc" depends="resolve-tools" unless="javacc.notRequired">
         <ivy:cachepath file="${core.tools.ivy}" pathid="javacc.classpath" conf="javacc"/>
         <java classname="javacc" fork="true" failonerror="true">
@@ -30 +30 @@
     </target>
 
-        <!--
-    **********************************************************
-    ** compile - compiles the source tree
-    **********************************************************
-    -->
-    <target name="compile" depends="init, javacc">
-        <echo message="compiling sources for ${plugin.jar} ... "/>
-        <javac srcdir="src" debug="true" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="UTF-8">
-            <classpath>
-                <pathelement path="${plugin.build.dir}"/>
-                <pathelement location="${josm}"/>
-            </classpath>
-            <compilerarg value="-Xlint:deprecation"/>
-            <compilerarg value="-Xlint:unchecked"/>
-        </javac>
+    <target name="pre-compile" depends="javacc">
+      <!-- ensure that we build the javacc classes -->
     </target>