Fix build by making -out actually work for GWTCompiler, Link, and GWTShell.java Patch by: fabbott, scottb git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4013 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/GWTCompiler.java b/dev/core/src/com/google/gwt/dev/GWTCompiler.java index 62b0ab1..0c34efb 100644 --- a/dev/core/src/com/google/gwt/dev/GWTCompiler.java +++ b/dev/core/src/com/google/gwt/dev/GWTCompiler.java
@@ -22,6 +22,7 @@ import com.google.gwt.dev.Link.LinkOptionsImpl; import com.google.gwt.dev.Precompile.PrecompileOptionsImpl; import com.google.gwt.dev.util.arg.ArgHandlerExtraDir; +import com.google.gwt.dev.util.arg.ArgHandlerOutDir; import java.io.File; @@ -34,6 +35,7 @@ public ArgProcessor(CompilerOptions options) { super(options); registerHandler(new ArgHandlerExtraDir(options)); + registerHandler(new ArgHandlerOutDir(options)); } @Override
diff --git a/dev/core/src/com/google/gwt/dev/GWTShell.java b/dev/core/src/com/google/gwt/dev/GWTShell.java index eb238a3..460ec3f 100644 --- a/dev/core/src/com/google/gwt/dev/GWTShell.java +++ b/dev/core/src/com/google/gwt/dev/GWTShell.java
@@ -43,6 +43,7 @@ import com.google.gwt.dev.util.arg.ArgHandlerLogLevel; import com.google.gwt.dev.util.arg.ArgHandlerOutDir; import com.google.gwt.dev.util.arg.ArgHandlerScriptStyle; +import com.google.gwt.dev.util.arg.ArgHandlerWorkDir; import com.google.gwt.dev.util.log.AbstractTreeLogger; import com.google.gwt.util.tools.ArgHandlerExtra; import com.google.gwt.util.tools.ArgHandlerFlag; @@ -438,12 +439,13 @@ registerHandler(new ArgHandlerLogLevel(options)); registerHandler(new ArgHandlerGenDir(options)); - registerHandler(new ArgHandlerExtraDir(options)); + registerHandler(new ArgHandlerWorkDir(options)); if (!noURLs) { registerHandler(new ArgHandlerStartupURLsExtra()); } + registerHandler(new ArgHandlerExtraDir(options)); registerHandler(new ArgHandlerOutDir(options)); registerHandler(new ArgHandlerScriptStyle(options));
diff --git a/dev/core/src/com/google/gwt/dev/Link.java b/dev/core/src/com/google/gwt/dev/Link.java index 795bf27..97968b0 100644 --- a/dev/core/src/com/google/gwt/dev/Link.java +++ b/dev/core/src/com/google/gwt/dev/Link.java
@@ -28,6 +28,7 @@ import com.google.gwt.dev.cfg.StaticPropertyOracle; import com.google.gwt.dev.util.Util; import com.google.gwt.dev.util.arg.ArgHandlerExtraDir; +import com.google.gwt.dev.util.arg.ArgHandlerOutDir; import com.google.gwt.dev.util.arg.OptionExtraDir; import com.google.gwt.dev.util.arg.OptionOutDir; @@ -51,6 +52,7 @@ public ArgProcessor(LinkOptions options) { super(options); registerHandler(new ArgHandlerExtraDir(options)); + registerHandler(new ArgHandlerOutDir(options)); } @Override