Changeset 13819 in josm for trunk/build.xml


Ignore:
Timestamp:
2018-05-22T22:38:21+02:00 (16 months 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r13794 r13819  
    2020        <property name="test.dir" location="${base.dir}/test"/>
    2121        <property name="src.dir" location="${base.dir}/src"/>
    22         <condition property="noJavaFX" value="${env.JOSM_NOJAVAFX}" else="0">
     22        <condition property="noJavaFX">
     23            <or>
    2324                <isset property="env.JOSM_NOJAVAFX"/>
     25                <not>
     26                    <available classname="javafx.scene.media.Media"/>
     27                </not>
     28            </or>
    2429        </condition>
    2530        <property name="build.dir" location="${base.dir}/build"/>
     
    370375            <compilerarg value="-Xep:JdkObsolete:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
    371376            <compilerarg line="-Xmaxwarns 1000"/>
    372             <exclude name="org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java" if:set="noJavaFX"/>
     377            <exclude name="org/openstreetmap/josm/io/audio/fx/*.java" if:set="noJavaFX"/>
    373378        </javac>
    374379
     
    405410            <arg value="--add-exports" if:set="isJava9" />
    406411            <arg value="javafx.graphics/com.sun.javafx.application=ALL-UNNAMED" if:set="isJava9" />
     412            <excludepackage name="org/openstreetmap/josm/io/audio/fx" if:set="noJavaFX" />
    407413        </javadoc>
    408414    </target>
Note: See TracChangeset for help on using the changeset viewer.