Author: fschumacher
Date: Sun Jul 1 08:18:25 2018
New Revision: 1834773
URL: http://svn.apache.org/viewvc?rev=1834773&view=rev
Log:
Check for JavaFX before trying to build JavaFX components. JavaFX will be
removed from JDK 11
Modified:
jmeter/trunk/build.xml
Modified: jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1834773&r1=1834772&r2=1834773&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun Jul 1 08:18:25 2018
@@ -87,6 +87,9 @@
<!-- Minimal version of Apache Ant required by this Ant script -->
<property name="ant.version.required" value="1.9.1" />
+ <!-- check if JavaFX is available -->
+ <available classname="javafx.application.Platform" property="javafx.present"
/>
+
<!-- Are we running under Gump? -->
<property name="gump.run" value="false"/>
@@ -672,6 +675,7 @@
<javac srcdir="${src.components}" destdir="${build.components}"
source="${src.java.version}" optimize="${optimize}" debug="on"
target="${target.java.version}"
includeAntRuntime="${includeAntRuntime}"
deprecation="${deprecation}" encoding="${encoding}">
<include name="**/*.java"/>
+ <exclude name="**/visualizers/RenderInBrowser.java"
unless="javafx.present"/>
<classpath>
<pathelement location="${build.jorphan}"/>
<pathelement location="${build.core}"/>
