commit a926f5e815002ca91d0470631f6bacbe56635844
author Daniel Kurka <dankurka@google.com> Mon Oct 06 16:32:31 2014 -0700
committer Daniel Kurka <dankurka@google.com> Mon Oct 06 16:55:15 2014 -0700
tree 273efcfdc27938805b4996eebf30ac562f723793
parent 2b2d81c14b207794de771678cbe79fa43cde6de7

Always use generated recompile.nocache.js

With precompile turned off, we were generating the nocache.js with the
same content as a recompile.nocache.js file. This caused issues for
some internal clients loading the application, not being able to
determine the URL of the codeserver.
This patch now always uses stub.nocache.js to generate a nocache.js
file that will include recompile.nocache.js

Change-Id: I17ab3f5691364ea818c7f3db16a4c0eb9aee219e

dev/codeserver/java/com/google/gwt/dev/codeserver/Recompiler.java

diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/Recompiler.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/Recompiler.java
index 331b9a8..6a2d1c4 100644
--- a/dev/codeserver/java/com/google/gwt/dev/codeserver/Recompiler.java
+++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/Recompiler.java
@@ -212,7 +212,7 @@
    * Prepares a stub compile directory.
    * It will include all "public" resources and a nocache.js file that invokes the compiler.
    */
-  private static void setUpCompileDir(CompileDir compileDir, ModuleDef module,
+  private void setUpCompileDir(CompileDir compileDir, ModuleDef module,
       TreeLogger compileLogger) throws UnableToCompleteException {
     try {
       String outputModuleName = module.getName();
@@ -227,12 +227,15 @@
       }
       writePublicResources(outputDir, module, compileLogger);
 
-      // Create a "module_name.nocache.js" that calculates the permutation and forces a recompile.
-      String nocacheJs = generateModuleRecompileJs(module, compileLogger);
-      Files.write(nocacheJs,
-          new File(outputDir.getCanonicalPath() + "/" + outputModuleName + ".nocache.js"),
-          Charsets.UTF_8);
-      writeRecompileNoCacheJs(outputDir, outputModuleName, nocacheJs, compileLogger);
+      // write no cache that will inject recompile.nocache.js
+      String stub = generateStubNocacheJs(module.getName());
+      File noCacheJs = new File(outputDir.getCanonicalPath(), module.getName() + ".nocache.js");
+      Files.write(stub, noCacheJs, Charsets.UTF_8);
+
+      // Create a "module_name.recompile.nocache.js" that calculates the permutation
+      // and forces a recompile.
+      String recompileNoCache = generateModuleRecompileJs(module, compileLogger);
+      writeRecompileNoCacheJs(outputDir, outputModuleName, recompileNoCache, compileLogger);
     } catch (IOException e) {
       compileLogger.log(Type.ERROR, "Error creating stub compile directory.", e);
       UnableToCompleteException wrapped = new UnableToCompleteException();