svn commit: r1884963 - /pivot/trunk/build.xml

[rw...@apache.org]

Author: rwhitcomb
Date: Wed Dec 30 22:57:18 2020
New Revision: 1884963

URL: http://svn.apache.org/viewvc?rev=1884963&view=rev
Log:
Fix build file for issues with Java 14+.

Modified:
    pivot/trunk/build.xml

Modified: pivot/trunk/build.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/build.xml?rev=1884963&r1=1884962&r2=1884963&view=diff
==============================================================================
--- pivot/trunk/build.xml (original)
+++ pivot/trunk/build.xml Wed Dec 30 22:57:18 2020
@@ -41,9 +41,18 @@ limitations under the License.
     </fail>
 
     <!-- Java-version-related properties -->
-    <condition property="java_modules" value="true" else="false">
+    <condition property="java.modules" value="true" else="false">
         <javaversion atleast="9"/>
     </condition>
+    <condition property="html4.output" value="true" else="false">
+        <and>
+            <javaversion atleast="9"/>
+            <not><javaversion atleast="14"/></not>
+        </and>
+    </condition>
+    <condition property="no.browser.support" value="true" else="false">
+        <javaversion atleast="14"/>
+    </condition>
 
     <!-- Classpath-related properties -->
     <property environment="env"/>
@@ -54,7 +63,7 @@ limitations under the License.
         <fileset dir="${java.home}/lib">
             <include name="**/*.jar"/>
             <exclude name="**/jfxrt.jar"/>
-            <exclude name="missioncontrol/**/*.jar" if:true="${java_modules}"/>
+            <exclude name="missioncontrol/**/*.jar" if:true="${java.modules}"/>
         </fileset>
     </path>
     <property name="classpath_env" refid="classpath.env"/>
@@ -235,8 +244,11 @@ limitations under the License.
                 failonerror="true"
             >
                 <src>
+                    <fileset dir="@{project}/src">
+                        <include name="**/*.java"/>
+                        <exclude name="**/Browser*.java" if:true="${no.browser.support}"/>
+                    </fileset>
                     <dirset dir="@{project}">
-                        <include name="src"/>
                         <include name="test"/>
                     </dirset>
                 </src>
@@ -429,8 +441,8 @@ limitations under the License.
                 <link href="http://download.oracle.com/javase/8/docs/api"/>
                 <link href="http://download.oracle.com/javaee/7/api/"/>
 
-                <arg value="-html4" if:true="${java_modules}"/>
-                <arg value="--frames" if:true="${java_modules}"/>
+                <arg value="-html4" if:true="${html4.output}"/>
+                <arg value="--frames" if:true="${html4.output}"/>
             </javadoc>
 
             <package-maven-source-or-javadoc-jar
@@ -476,7 +488,7 @@ limitations under the License.
         <echo message="  encoding ${compiler.encoding}"/>
         <echo message="  indexJars ${compiler.indexJars}"/>
         <echo message="  arg ${compiler.arg}"/>
-        <echo message="needs module flags? ${java_modules}"/>
+        <echo message="needs module flags? ${java.modules}"/>
         <echo message=""/>
         <echo message="Last Changed Revision: ${lastchangedrev}"/>
         <echo message="Build Number: ${build.number} started on ${build.date} at ${build.time}"/>
@@ -610,8 +622,8 @@ limitations under the License.
             <link href="https://docs.oracle.com/javase/8/docs/api/"/>
             <link href="http://download.oracle.com/javaee/7/api/"/>
 
-            <arg value="-html4" if:true="${java_modules}"/>
-            <arg value="--frames" if:true="${java_modules}"/>
+            <arg value="-html4" if:true="${html4.output}"/>
+            <arg value="--frames" if:true="${html4.output}"/>
         </javadoc>
     </target>