Author: [EMAIL PROTECTED]
Date: Mon Nov 10 16:50:32 2008
New Revision: 4011
Modified:
releases/1.6/dev/core/src/com/google/gwt/dev/CompileArgProcessor.java
releases/1.6/dev/core/src/com/google/gwt/dev/CompileTaskOptions.java
releases/1.6/dev/core/src/com/google/gwt/dev/CompileTaskOptionsImpl.java
releases/1.6/dev/core/src/com/google/gwt/dev/GWTCompiler.java
releases/1.6/dev/core/src/com/google/gwt/dev/Link.java
Log:
- Out directory is now a Link option only; the other compile phases don't
need it
- What they DO need, however, is a way to specify the work directory; this
was breaking builds due to parallel testing
Review by: bobv (TBR)
Modified:
releases/1.6/dev/core/src/com/google/gwt/dev/CompileArgProcessor.java
==============================================================================
--- releases/1.6/dev/core/src/com/google/gwt/dev/CompileArgProcessor.java
(original)
+++ releases/1.6/dev/core/src/com/google/gwt/dev/CompileArgProcessor.java
Mon Nov 10 16:50:32 2008
@@ -17,15 +17,15 @@
import com.google.gwt.dev.util.arg.ArgHandlerLogLevel;
import com.google.gwt.dev.util.arg.ArgHandlerModuleName;
-import com.google.gwt.dev.util.arg.ArgHandlerOutDir;
import com.google.gwt.dev.util.arg.ArgHandlerTreeLoggerFlag;
+import com.google.gwt.dev.util.arg.ArgHandlerWorkDir;
import com.google.gwt.util.tools.ToolBase;
abstract class CompileArgProcessor extends ToolBase {
public CompileArgProcessor(CompileTaskOptions options) {
registerHandler(new ArgHandlerLogLevel(options));
registerHandler(new ArgHandlerTreeLoggerFlag(options));
- registerHandler(new ArgHandlerOutDir(options));
+ registerHandler(new ArgHandlerWorkDir(options));
registerHandler(new ArgHandlerModuleName(options));
}
Modified:
releases/1.6/dev/core/src/com/google/gwt/dev/CompileTaskOptions.java
==============================================================================
--- releases/1.6/dev/core/src/com/google/gwt/dev/CompileTaskOptions.java
(original)
+++ releases/1.6/dev/core/src/com/google/gwt/dev/CompileTaskOptions.java
Mon Nov 10 16:50:32 2008
@@ -18,11 +18,11 @@
import com.google.gwt.dev.util.arg.OptionGuiLogger;
import com.google.gwt.dev.util.arg.OptionLogLevel;
import com.google.gwt.dev.util.arg.OptionModuleName;
-import com.google.gwt.dev.util.arg.OptionOutDir;
+import com.google.gwt.dev.util.arg.OptionWorkDir;
/**
* A common set of options for all compile tasks.
*/
public interface CompileTaskOptions extends OptionGuiLogger,
OptionModuleName,
- OptionLogLevel, OptionOutDir {
+ OptionLogLevel, OptionWorkDir {
}
Modified:
releases/1.6/dev/core/src/com/google/gwt/dev/CompileTaskOptionsImpl.java
==============================================================================
---
releases/1.6/dev/core/src/com/google/gwt/dev/CompileTaskOptionsImpl.java
(original)
+++
releases/1.6/dev/core/src/com/google/gwt/dev/CompileTaskOptionsImpl.java
Mon Nov 10 16:50:32 2008
@@ -28,7 +28,6 @@
private Type logLevel;
private String moduleName;
- private File outDir;
private boolean useGuiLogger;
private File workDir;
@@ -42,8 +41,8 @@
public void copyFrom(CompileTaskOptions other) {
setLogLevel(other.getLogLevel());
setModuleName(other.getModuleName());
- setOutDir(other.getOutDir());
setUseGuiLogger(other.isUseGuiLogger());
+ setWorkDir(other.getWorkDir());
}
public File getCompilerWorkDir() {
@@ -58,8 +57,8 @@
return moduleName;
}
- public File getOutDir() {
- return outDir;
+ public File getWorkDir() {
+ return workDir;
}
public boolean isUseGuiLogger() {
@@ -74,22 +73,11 @@
this.moduleName = moduleName;
}
- public void setOutDir(File outDir) {
- this.outDir = outDir;
- }
-
public void setUseGuiLogger(boolean useGuiLogger) {
this.useGuiLogger = useGuiLogger;
}
- /**
- * TODO: add a command line option to pass files between compile phases?
- */
- protected File getWorkDir() {
- if (workDir == null) {
- workDir = new File(System.getProperty("java.io.tmpdir"),
GWT_TMP_DIR);
- workDir.mkdirs();
- }
- return workDir;
+ public void setWorkDir(File workDir) {
+ this.workDir = workDir;
}
}
Modified: releases/1.6/dev/core/src/com/google/gwt/dev/GWTCompiler.java
==============================================================================
--- releases/1.6/dev/core/src/com/google/gwt/dev/GWTCompiler.java
(original)
+++ releases/1.6/dev/core/src/com/google/gwt/dev/GWTCompiler.java Mon Nov
10 16:50:32 2008
@@ -19,6 +19,7 @@
import com.google.gwt.core.ext.UnableToCompleteException;
import com.google.gwt.dev.CompilePerms.CompilePermsOptionsImpl;
import com.google.gwt.dev.CompileTaskRunner.CompileTask;
+import com.google.gwt.dev.Link.LinkOptionsImpl;
import com.google.gwt.dev.Precompile.PrecompileOptionsImpl;
import com.google.gwt.dev.util.arg.ArgHandlerExtraDir;
@@ -44,7 +45,7 @@
static class GWTCompilerOptionsImpl extends PrecompileOptionsImpl
implements
CompilerOptions {
- private File extraDir;
+ private LinkOptionsImpl linkOptions = new LinkOptionsImpl();
public GWTCompilerOptionsImpl() {
}
@@ -55,15 +56,23 @@
public void copyFrom(CompilerOptions other) {
super.copyFrom(other);
- setExtraDir(other.getExtraDir());
+ linkOptions.copyFrom(other);
}
public File getExtraDir() {
- return extraDir;
+ return linkOptions.getExtraDir();
+ }
+
+ public File getOutDir() {
+ return linkOptions.getOutDir();
}
public void setExtraDir(File extraDir) {
- this.extraDir = extraDir;
+ linkOptions.setExtraDir(extraDir);
+ }
+
+ public void setOutDir(File outDir) {
+ linkOptions.setOutDir(outDir);
}
}
Modified: releases/1.6/dev/core/src/com/google/gwt/dev/Link.java
==============================================================================
--- releases/1.6/dev/core/src/com/google/gwt/dev/Link.java (original)
+++ releases/1.6/dev/core/src/com/google/gwt/dev/Link.java Mon Nov 10
16:50:32 2008
@@ -29,6 +29,7 @@
import com.google.gwt.dev.util.Util;
import com.google.gwt.dev.util.arg.ArgHandlerExtraDir;
import com.google.gwt.dev.util.arg.OptionExtraDir;
+import com.google.gwt.dev.util.arg.OptionOutDir;
import java.io.File;
import java.util.HashMap;
@@ -42,7 +43,8 @@
/**
* Options for Link.
*/
- public interface LinkOptions extends CompileTaskOptions, OptionExtraDir {
+ public interface LinkOptions extends CompileTaskOptions, OptionExtraDir,
+ OptionOutDir {
}
static class ArgProcessor extends CompileArgProcessor {
@@ -64,6 +66,7 @@
LinkOptions {
private File extraDir;
+ private File outDir;
public LinkOptionsImpl() {
}
@@ -75,14 +78,23 @@
public void copyFrom(LinkOptions other) {
super.copyFrom(other);
setExtraDir(other.getExtraDir());
+ setOutDir(other.getOutDir());
}
public File getExtraDir() {
return extraDir;
}
+ public File getOutDir() {
+ return outDir;
+ }
+
public void setExtraDir(File extraDir) {
this.extraDir = extraDir;
+ }
+
+ public void setOutDir(File outDir) {
+ this.outDir = outDir;
}
}
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
