make/build.xml

*** 33,43 ****
  
      <loadproperties srcFile="make/project.properties"/>
      <path id="nashorn.jar.path">
           <pathelement location="${nashorn.jar}"/>
      </path>
-     <property name="nashorn.override.option" value="-Xpatch:${build.classes.dir}"/>
      <condition property="svn.executable" value="/usr/local/bin/svn" else="svn">
        <available file="/usr/local/bin/svn"/>
      </condition>
      <condition property="hg.executable" value="/usr/local/bin/hg" else="hg">
        <available file="/usr/local/bin/hg"/>
--- 33,42 ----
*** 174,183 ****
--- 173,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}"
             source="${javac.source}"
             target="${javac.target}"
             debug="${javac.debug}"
*** 185,196 ****
             includeantruntime="false" fork="true">
        <compilerarg value="-Xlint:all"/>
        <compilerarg value="-XDignore.symbol.file"/>
        <compilerarg value="-Xdiags:verbose"/>
        <compilerarg value="-parameters"/>
!       <compilerarg value="${nashorn.override.option}"/>
      </javac>
      <javac srcdir="${nashorn.shell.module.src.dir}"
             destdir="${nashorn.shell.module.classes.dir}"
             source="${javac.source}"
             target="${javac.target}"
             debug="${javac.debug}"
--- 188,203 ----
             includeantruntime="false" fork="true">
        <compilerarg value="-Xlint:all"/>
        <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}"
             source="${javac.source}"
             target="${javac.target}"
             debug="${javac.debug}"
*** 198,208 ****
             includeantruntime="false" fork="true">
        <compilerarg value="-Xlint:all"/>
        <compilerarg value="-XDignore.symbol.file"/>
        <compilerarg value="-Xdiags:verbose"/>
        <compilerarg value="-parameters"/>
!       <compilerarg value="${nashorn.override.option}"/>
      </javac>
      <!-- -Xpatch does not like module-info.class files! -->
      <delete>
        <fileset dir="${build.classes.dir}" includes="**/module-info.class"/>
      </delete>
--- 205,215 ----
             includeantruntime="false" fork="true">
        <compilerarg value="-Xlint:all"/>
        <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>
*** 346,360 ****
             source="${javac.source}"
             target="${javac.target}"
             debug="${javac.debug}"
             encoding="${javac.encoding}"
             includeantruntime="false" fork="true">
!         <compilerarg value="${nashorn.override.option}"/>
          <compilerarg value="-Xlint:unchecked"/>
          <compilerarg value="-Xlint:deprecation"/>
          <compilerarg value="-Xdiags:verbose"/>
!         <compilerarg value="-XaddExports:${test.module.imports}"/>
      </javac>
  
      <copy todir="${build.test.classes.dir}/META-INF/services">
         <fileset dir="${test.src.dir}/META-INF/services/"/>
      </copy>
--- 353,367 ----
             source="${javac.source}"
             target="${javac.target}"
             debug="${javac.debug}"
             encoding="${javac.encoding}"
             includeantruntime="false" fork="true">
!         <compilerarg line="${nashorn.override.option}"/>
          <compilerarg value="-Xlint:unchecked"/>
          <compilerarg value="-Xlint:deprecation"/>
          <compilerarg value="-Xdiags:verbose"/>
!         <compilerarg line="${test.module.imports}"/>
      </javac>
  
      <copy todir="${build.test.classes.dir}/META-INF/services">
         <fileset dir="${test.src.dir}/META-INF/services/"/>
      </copy>