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

[rw...@apache.org]

Author: rwhitcomb
Date: Sun Mar 29 05:01:17 2020
New Revision: 1875833

URL: http://svn.apache.org/viewvc?rev=1875833&view=rev
Log:
Using "--release 8" to build with Java 11 seems to not find JSObject anymore,
so go back to using "-source" and "-target". And, take out the module stuff
added for the Javadoc calls -- they aren't needed either with the
javax-activation.jar file in the classpath now.

Everything seems to build and test cleanly from scratch on OpenJDK 11
(with OSX at least).


Modified:
    pivot/trunk/build.xml

Modified: pivot/trunk/build.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/build.xml?rev=1875833&r1=1875832&r2=1875833&view=diff
==============================================================================
--- pivot/trunk/build.xml (original)
+++ pivot/trunk/build.xml Sun Mar 29 05:01:17 2020
@@ -201,6 +201,8 @@ limitations under the License.
                 includejavaruntime="no"
                 includeantruntime="no"
                 deprecation="${compiler.deprecation}"
+                source="${compiler.source}"
+                target="${compiler.target}"
                 debug="${compiler.debug}"
                 bootclasspath="${compiler.bootstrap.path}"
                 encoding="${compiler.encoding}"
@@ -213,9 +215,6 @@ limitations under the License.
                     </dirset>
                 </src>
                 <compilerarg line="${compiler.arg}"/>
-                <compilerarg line="-source ${compiler.source}" unless:true="${java_modules}"/>
-                <compilerarg line="-target ${compiler.target}" unless:true="${java_modules}"/>
-                <compilerarg line="--release ${compiler.release}" if:true="${java_modules}"/>
                 <classpath>
                     <path refid="classpath.general"/>
                     <dirset dir="${basedir}" includes="**/${folder.bin}"/>
@@ -406,10 +405,6 @@ limitations under the License.
 
                 <arg value="-html4" if:true="${java_modules}"/>
                 <arg value="--frames" if:true="${java_modules}"/>
-                <arg value="--module-path" if:true="${java_modules}"/>
-                <arg value="wtk/lib/javax.activation-1.2.0.jar" if:true="${java_modules}"/>
-                <arg value="--add-modules" if:true="${java_modules}"/>
-                <arg value="java.activation" if:true="${java_modules}"/>
             </javadoc>
 
             <package-maven-source-or-javadoc-jar
@@ -451,8 +446,7 @@ limitations under the License.
         <echo message="Compile environment for ${ant.project.name}-${version} is:"/>
         <echo message="  show deprecation ${compiler.deprecation}"/>
         <echo message="  debug ${compiler.debug}"/>
-        <echo message="  source ${compiler.source}, target ${compiler.target}" unless:true="${java_modules}"/>
-        <echo message="  release ${compiler.release}" if:true="${java_modules}"/>
+        <echo message="  source ${compiler.source}, target ${compiler.target}"/>
         <echo message="  encoding ${compiler.encoding}"/>
         <echo message="  indexJars ${compiler.indexJars}"/>
         <echo message="  arg ${compiler.arg}"/>
@@ -591,10 +585,6 @@ limitations under the License.
 
             <arg value="-html4" if:true="${java_modules}"/>
             <arg value="--frames" if:true="${java_modules}"/>
-            <arg value="--module-path" if:true="${java_modules}"/>
-            <arg value="wtk/lib/javax.activation-1.2.0.jar" if:true="${java_modules}"/>
-            <arg value="--add-modules" if:true="${java_modules}"/>
-            <arg value="java.activation" if:true="${java_modules}"/>
         </javadoc>
     </target>