Changeset 36486 in osm for applications/editors/josm/plugins/build-common.xml

Timestamp:

2026-02-12T22:20:13+01:00 (7 days ago)

Author:

stoecker

Message:

fix javadoc for JavaFX, increase javafx to 21.0.10 (current java 17 version)

File:

• applications/editors/josm/plugins/build-common.xml (modified) (4 diffs)

applications/editors/josm/plugins/build-common.xml

@@ -113 +113 @@
         <!-- to be overridden by plugins that need to perform additional tasks before compiling -->
     </target>
-    <target name="compile" depends="init, pre-compile, resolve-tools" unless="skip-compile">
+    <target name="plugin-classpath-actual">
         <condition property="plugin.classpath.actual.defined">
             <isreference refid="plugin.classpath.actual" type="path"/>
@@ -120 +120 @@
             <path refid="plugin.classpath"/>
         </path>
+    </target>
+    <target name="compile" depends="init, pre-compile, resolve-tools, plugin-classpath-actual" unless="skip-compile">
         <echo message="compiling sources for ${plugin.jar} ..."/>
         <path id="jdk.boot.classpath">
@@ -293 +295 @@
         <!-- to be overridden by plugins that need to perform additional tasks before generating javadoc -->
     </target>
-    <target name="javadoc" depends="pre-javadoc,pre-compile" unless="skip-javadoc">
+    <target name="javadoc" depends="pre-javadoc,pre-compile,plugin-classpath-actual" unless="skip-javadoc">
         <mkdir dir="${plugin.doc.dir}"/>
         <javadoc destdir="${plugin.doc.dir}"
@@ -305 +307 @@
             <classpath refid="plugin.classpath" unless:set="plugin.classpath.dependencies"/>
             <classpath refid="plugin.classpath.dependencies" if:set="plugin.classpath.dependencies"/>
+            <classpath refid="plugin.classpath.actual"/>
             <sourcepath>
                 <pathelement path="${plugin.src.dir}" />