Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/src/share/classes/com/sun/tools/sjavac/Main.java	Thu Sep 19 17:05:08 2013 +0200
     1.2 +++ b/src/share/classes/com/sun/tools/sjavac/Main.java	Thu Sep 19 08:26:26 2013 -0700
     1.3 @@ -274,7 +274,7 @@
     1.4  //          findFiles(args, "-modulepath", Util.set(".class"), modules_to_link_to, modules, current_module, true);
     1.5  
     1.6              // Add the set of sources to the build database.
     1.7 -            javac_state.now().collectPackagesSourcesAndArtifacts(modules);
     1.8 +            javac_state.now().flattenPackagesSourcesAndArtifacts(modules);
     1.9              javac_state.now().checkInternalState("checking sources", false, sources);
    1.10              javac_state.now().checkInternalState("checking linked sources", true, sources_to_link_to);
    1.11              javac_state.setVisibleSources(sources_to_link_to);
    1.12 @@ -311,7 +311,7 @@
    1.13              Map<String,Source> generated_sources = new HashMap<String,Source>();
    1.14              Source.scanRoot(gensrc_dir, Util.set(".java"), null, null, null, null,
    1.15                     generated_sources, modules, current_module, false, true, false);
    1.16 -            javac_state.now().collectPackagesSourcesAndArtifacts(modules);
    1.17 +            javac_state.now().flattenPackagesSourcesAndArtifacts(modules);
    1.18              // Recheck the the source files and their timestamps again.
    1.19              javac_state.checkSourceStatus(true);
    1.20  
    1.21 @@ -336,8 +336,8 @@
    1.22              // Only update the state if the compile went well.
    1.23              if (rc[0]) {
    1.24                  javac_state.save();
    1.25 -                // Collect all the artifacts.
    1.26 -                javac_state.now().collectArtifacts(modules);
    1.27 +                // Reflatten only the artifacts.
    1.28 +                javac_state.now().flattenArtifacts(modules);
    1.29                  // Remove artifacts that were generated during the last compile, but not this one.
    1.30                  javac_state.removeSuperfluousArtifacts(recently_compiled);
    1.31              }