Changeset 13819 in josm for trunk/build.xml

Timestamp:

2018-05-22T22:38:21+02:00 (6 years ago)

Author:

Don-vip

Message:

see #2089, see #16047 - move JavaFX classes to their own package in order to exclude them automatically when JavaFX is not on the classpath (needed for Java 11+ now that FX is gone)

File:

• trunk/build.xml (modified) (3 diffs)

trunk/build.xml

@@ -20 +20 @@
         <property name="test.dir" location="${base.dir}/test"/>
         <property name="src.dir" location="${base.dir}/src"/>
-        <condition property="noJavaFX" value="${env.JOSM_NOJAVAFX}" else="0">
+        <condition property="noJavaFX">
+            <or>
                 <isset property="env.JOSM_NOJAVAFX"/>
+                <not>
+                    <available classname="javafx.scene.media.Media"/>
+                </not>
+            </or>
         </condition>
         <property name="build.dir" location="${base.dir}/build"/>
@@ -370 +375 @@
             <compilerarg value="-Xep:JdkObsolete:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg line="-Xmaxwarns 1000"/>
-            <exclude name="org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java" if:set="noJavaFX"/>
+            <exclude name="org/openstreetmap/josm/io/audio/fx/*.java" if:set="noJavaFX"/>
         </javac>
 
@@ -405 +410 @@
             <arg value="--add-exports" if:set="isJava9" />
             <arg value="javafx.graphics/com.sun.javafx.application=ALL-UNNAMED" if:set="isJava9" />
+            <excludepackage name="org/openstreetmap/josm/io/audio/fx" if:set="noJavaFX" />
         </javadoc>
     </target>