nashorn/make/build.xml

*** 176,186 ****
        <compilerarg value="-Xlint:all"/>
        <compilerarg value="-XDignore.symbol.file"/>
        <compilerarg value="-Xdiags:verbose"/>
        <compilerarg value="-parameters"/>
      </javac>
!     <!-- -Xpatch does not like module-info.class files! -->
      <delete>
        <fileset dir="${build.classes.dir}" includes="**/module-info.class"/>
      </delete>
      <javac srcdir="${nashorn.module.src.dir}"
             destdir="${nashorn.module.classes.dir}"
--- 176,186 ----
        <compilerarg value="-Xlint:all"/>
        <compilerarg value="-XDignore.symbol.file"/>
        <compilerarg value="-Xdiags:verbose"/>
        <compilerarg value="-parameters"/>
      </javac>
!     <!-- patch-module does not like module-info.class files! -->
      <delete>
        <fileset dir="${build.classes.dir}" includes="**/module-info.class"/>
      </delete>
      <javac srcdir="${nashorn.module.src.dir}"
             destdir="${nashorn.module.classes.dir}"
*** 193,203 ****
        <compilerarg value="-XDignore.symbol.file"/>
        <compilerarg value="-Xdiags:verbose"/>
        <compilerarg value="-parameters"/>
        <compilerarg line="${nashorn.override.option}"/>
      </javac>
!     <!-- -Xpatch does not like module-info.class files! -->
      <delete>
        <fileset dir="${build.classes.dir}" includes="**/module-info.class"/>
      </delete>
      <javac srcdir="${nashorn.shell.module.src.dir}"
             destdir="${nashorn.shell.module.classes.dir}"
--- 193,203 ----
        <compilerarg value="-XDignore.symbol.file"/>
        <compilerarg value="-Xdiags:verbose"/>
        <compilerarg value="-parameters"/>
        <compilerarg line="${nashorn.override.option}"/>
      </javac>
!     <!-- patch-module does not like module-info.class files! -->
      <delete>
        <fileset dir="${build.classes.dir}" includes="**/module-info.class"/>
      </delete>
      <javac srcdir="${nashorn.shell.module.src.dir}"
             destdir="${nashorn.shell.module.classes.dir}"
*** 210,220 ****
        <compilerarg value="-XDignore.symbol.file"/>
        <compilerarg value="-Xdiags:verbose"/>
        <compilerarg value="-parameters"/>
        <compilerarg line="${nashorn.override.option}"/>
      </javac>
!     <!-- -Xpatch does not like module-info.class files! -->
      <delete>
        <fileset dir="${build.classes.dir}" includes="**/module-info.class"/>
      </delete>
       <copy todir="${nashorn.module.classes.dir}/jdk/nashorn/api/scripting/resources">
         <fileset dir="${nashorn.module.src.dir}/jdk/nashorn/api/scripting/resources/"/>
--- 210,220 ----
        <compilerarg value="-XDignore.symbol.file"/>
        <compilerarg value="-Xdiags:verbose"/>
        <compilerarg value="-parameters"/>
        <compilerarg line="${nashorn.override.option}"/>
      </javac>
!     <!-- patch-module does not like module-info.class files! -->
      <delete>
        <fileset dir="${build.classes.dir}" includes="**/module-info.class"/>
      </delete>
       <copy todir="${nashorn.module.classes.dir}/jdk/nashorn/api/scripting/resources">
         <fileset dir="${nashorn.module.src.dir}/jdk/nashorn/api/scripting/resources/"/>
*** 264,274 ****
    <!-- generate javadoc for Nashorn classes -->
    <target name="javadoc" depends="jar">
      <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="${nashorn.module.src.dir}/overview.html"
          windowtitle="${nashorn.product.name} ${nashorn.version}"
          additionalparam="-quiet" failonerror="true" useexternalfile="true">
!       <arg value="-modulesourcepath"/>
        <arg value="${basedir}/src/*/share/classes"/>
        <arg value="${javadoc.option}"/>
        <classpath>
          <pathelement location="${build.classes.dir}"/>
        </classpath>
--- 264,274 ----
    <!-- generate javadoc for Nashorn classes -->
    <target name="javadoc" depends="jar">
      <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="${nashorn.module.src.dir}/overview.html"
          windowtitle="${nashorn.product.name} ${nashorn.version}"
          additionalparam="-quiet" failonerror="true" useexternalfile="true">
!       <arg value="--module-source-path"/>
        <arg value="${basedir}/src/*/share/classes"/>
        <arg value="${javadoc.option}"/>
        <classpath>
          <pathelement location="${build.classes.dir}"/>
        </classpath>
*** 283,293 ****
    <target name="nashornapi" depends="jar">
      <mkdir dir="${dist.nashornapi.javadoc.dir}"/>
      <javadoc destdir="${dist.nashornapi.javadoc.dir}" use="yes" overview="${nashorn.module.src.dir}/overview.html"
          extdirs="${nashorn.ext.path}" windowtitle="${nashorn.product.name} ${nashorn.version}"
          additionalparam="-quiet" failonerror="true" useexternalfile="true">
!       <arg value="-modulesourcepath"/>
        <arg value="${basedir}/src/*/share/classes"/>
        <arg value="${javadoc.option}"/>
        <classpath>
          <pathelement location="${build.classes.dir}"/>
        </classpath>
--- 283,293 ----
    <target name="nashornapi" depends="jar">
      <mkdir dir="${dist.nashornapi.javadoc.dir}"/>
      <javadoc destdir="${dist.nashornapi.javadoc.dir}" use="yes" overview="${nashorn.module.src.dir}/overview.html"
          extdirs="${nashorn.ext.path}" windowtitle="${nashorn.product.name} ${nashorn.version}"
          additionalparam="-quiet" failonerror="true" useexternalfile="true">
!       <arg value="--module-source-path"/>
        <arg value="${basedir}/src/*/share/classes"/>
        <arg value="${javadoc.option}"/>
        <classpath>
          <pathelement location="${build.classes.dir}"/>
        </classpath>
*** 300,310 ****
    <target name="dynalinkapi" depends="jar">
      <mkdir dir="${dist.dynalinkapi.javadoc.dir}"/>
      <javadoc destdir="${dist.dynalinkapi.javadoc.dir}" use="yes"
          windowtitle="Dynalink"
          additionalparam="-quiet" failonerror="true" useexternalfile="true">
!       <arg value="-modulesourcepath"/>
        <arg value="${basedir}/src/*/share/classes"/>
        <arg value="${javadoc.option}"/>
        <classpath>
          <pathelement location="${build.classes.dir}"/>
        </classpath>
--- 300,310 ----
    <target name="dynalinkapi" depends="jar">
      <mkdir dir="${dist.dynalinkapi.javadoc.dir}"/>
      <javadoc destdir="${dist.dynalinkapi.javadoc.dir}" use="yes"
          windowtitle="Dynalink"
          additionalparam="-quiet" failonerror="true" useexternalfile="true">
!       <arg value="--module-source-path"/>
        <arg value="${basedir}/src/*/share/classes"/>
        <arg value="${javadoc.option}"/>
        <classpath>
          <pathelement location="${build.classes.dir}"/>
        </classpath>