./build.gradle

rev 10136 : 8169747: javac @compile.args does not pick up changes in local build
Reviewed-by:

*** 815,859 ****
               return null
           }
  
           mpa += mp
           return mpa
!     }
! 
!     void writeCompileArgsFile(File dest, List<String>path) {
!         dest.delete()
  
-         logger.info("Creating file ${dest.path}")
-         dest << "--upgrade-module-path\n"
- 
-         dest << "\"\\\n"
-         path.each() { e->
-             dest << "  "
-             dest << cygpath(e)
-             dest << File.pathSeparator
-             dest << "\\\n"
-         }
-         dest << "\"\n"
-     }
  
  void writeRunArgsFile(File dest, List<String> libpath, List<String> modpath) {
  
      dest.delete()
  
      logger.info("Creating file ${dest.path}")
  
      dest <<  "-Djava.library.path=\"\\\n"
      libpath.each() { e->
          dest << "  "
          dest << e
          dest << File.pathSeparator
          dest << "\\\n"
      }
      dest <<  "  \"\n"
  
      modpath.each { e ->
!         dest <<  "--patch-module \""
          dest << e
          dest << "\"\n"
      }
  }
  
--- 815,846 ----
               return null
           }
  
           mpa += mp
           return mpa
! }
  
  
  void writeRunArgsFile(File dest, List<String> libpath, List<String> modpath) {
  
      dest.delete()
  
      logger.info("Creating file ${dest.path}")
  
+     if (libpath != null) {
          dest <<  "-Djava.library.path=\"\\\n"
          libpath.each() { e->
              dest << "  "
              dest << e
              dest << File.pathSeparator
              dest << "\\\n"
          }
          dest <<  "  \"\n"
+     }
  
      modpath.each { e ->
!         dest <<  "--patch-module=\""
          dest << e
          dest << "\"\n"
      }
  }
  
*** 3524,3534 ****
      options.addBooleanOption("Xdoclint:none").setValue(!IS_DOC_LINT);
      options.addBooleanOption("javafx").setValue(true);
      options.addBooleanOption("use").setValue(true);
  
      options.setOptionFiles([
-         new File("${rootProject.buildDir}/${COMPILEARGSFILE}"),
          new File(rootProject.buildDir,MODULESOURCEPATH)
          ]);
  
      doLast {
          projectsToDocument.each { p ->
--- 3511,3520 ----
*** 3938,3966 ****
                  def dstModuleDir = cygpath("${modulesDir}/${moduleName}")
                  modpath <<  "${moduleName}=${dstModuleDir}"
              }
  
              writeRunArgsFile(runArgsFile, computeLibraryPath(true), modpath)
          }
      }
      buildModules.dependsOn(buildRunArgsTask)
  
-     def buildCompileArgsTask = task("buildCompileArgs$t.capital",
-             group: "Build", dependsOn: buildModulesTask) {
-         outputs.file(compileArgsFile);
-         doLast() {
-             List<String> modlist = []
-             moduleProjList.each { project ->
-                 def moduleName = project.ext.moduleName
-                 def dstModuleDir = "${modulesDir}/${moduleName}"
-                 modlist << dstModuleDir
-             }
-             writeCompileArgsFile(compileArgsFile, modlist);
-         }
-     }
-     buildModules.dependsOn(buildCompileArgsTask)
- 
      def isWindows = IS_WINDOWS && t.name == "win";
      def isMac = IS_MAC && t.name == "mac";
  
      // Create layout for modular classes
      moduleProjList.each { project ->
--- 3924,3938 ----
                  def dstModuleDir = cygpath("${modulesDir}/${moduleName}")
                  modpath <<  "${moduleName}=${dstModuleDir}"
              }
  
              writeRunArgsFile(runArgsFile, computeLibraryPath(true), modpath)
+             writeRunArgsFile(compileArgsFile, null, modpath)
          }
      }
      buildModules.dependsOn(buildRunArgsTask)
  
      def isWindows = IS_WINDOWS && t.name == "win";
      def isMac = IS_MAC && t.name == "mac";
  
      // Create layout for modular classes
      moduleProjList.each { project ->
*** 4285,4304 ****
                         dir = new File(project.sourceSets.shims.output.classesDir, project.ext.moduleName);
                      } else {
                         dir = new File(project.sourceSets.main.output.classesDir, project.ext.moduleName);
                      }
  
!                     modpath << dir.path
  
                      String themod = dir.toURI()
                      testJavaPolicyFile <<  "grant codeBase \"${themod}\" {\n" +
                      "    permission java.security.AllPermission;\n" +
                      "};\n"
                  }
              }
  
!             writeCompileArgsFile(testCompileArgsFile, modpath)
          }
      }
      sdk.dependsOn(testArgFiles)
      createTestArgfiles.dependsOn(testArgFiles)
  
--- 4257,4277 ----
                         dir = new File(project.sourceSets.shims.output.classesDir, project.ext.moduleName);
                      } else {
                         dir = new File(project.sourceSets.main.output.classesDir, project.ext.moduleName);
                      }
  
!                     def dstModuleDir = cygpath(dir.path)
!                     modpath << "${project.ext.moduleName}=${dstModuleDir}"
  
                      String themod = dir.toURI()
                      testJavaPolicyFile <<  "grant codeBase \"${themod}\" {\n" +
                      "    permission java.security.AllPermission;\n" +
                      "};\n"
                  }
              }
  
!             writeRunArgsFile(testCompileArgsFile, null, modpath)
          }
      }
      sdk.dependsOn(testArgFiles)
      createTestArgfiles.dependsOn(testArgFiles)