Just do a full link initially; fixes a problem where CSS/scripts was not being generated into the initial selection script.
Issue: 3264
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4428 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/HostedMode.java b/dev/core/src/com/google/gwt/dev/HostedMode.java
index fe914a5..90a4920 100644
--- a/dev/core/src/com/google/gwt/dev/HostedMode.java
+++ b/dev/core/src/com/google/gwt/dev/HostedMode.java
@@ -342,7 +342,7 @@
+ "'; add servlet tags to your web.xml instead");
}
- link(loadLogger, module, false);
+ link(loadLogger, module);
} catch (UnableToCompleteException e) {
// Already logged.
return false;
@@ -396,7 +396,7 @@
shouldRefreshPage = true;
module = loadModule(getTopLogger(), module.getCanonicalName(), false);
}
- link(getTopLogger(), module, true);
+ link(getTopLogger(), module);
return shouldRefreshPage;
} catch (UnableToCompleteException e) {
// Already logged.
@@ -425,8 +425,8 @@
* the link, otherwise do not include them
* @throws UnableToCompleteException
*/
- private void link(TreeLogger logger, ModuleDef module,
- boolean includePublicFiles) throws UnableToCompleteException {
+ private void link(TreeLogger logger, ModuleDef module)
+ throws UnableToCompleteException {
// TODO: move the module-specific computations to a helper function.
File moduleOutDir = new File(options.getWarDir(), module.getName());
File moduleExtraDir = (options.getExtraDir() == null) ? null : new File(
@@ -437,10 +437,6 @@
module, options);
linkerStacks.put(module.getName(), linkerStack);
- if (!includePublicFiles) {
- linkerStack.getArtifacts().clear();
- }
-
ArtifactSet artifacts = linkerStack.invokeLink(logger);
linkerStack.produceOutputDirectory(logger, artifacts, moduleOutDir,
moduleExtraDir);