Revision: 7200 Author: [email protected] Date: Mon Nov 30 11:56:25 2009 Log: Move default extras logic into Compiler.run().
Review by: kprobst (desk) http://code.google.com/p/google-web-toolkit/source/detail?r=7200 Modified: /trunk/dev/core/src/com/google/gwt/dev/Compiler.java ======================================= --- /trunk/dev/core/src/com/google/gwt/dev/Compiler.java Fri Nov 20 09:04:47 2009 +++ /trunk/dev/core/src/com/google/gwt/dev/Compiler.java Mon Nov 30 11:56:25 2009 @@ -101,12 +101,6 @@ public File getWarDir() { return linkOptions.getWarDir(); } - - public void postProcessArgs() { - if ((isSoycEnabled()) && (getExtraDir() == null)) { - setExtraDir(new File("extras")); - } - } public void setExtraDir(File extraDir) { linkOptions.setExtraDir(extraDir); @@ -141,7 +135,6 @@ */ final CompilerOptions options = new CompilerOptionsImpl(); if (new ArgProcessor(options).processArgs(args)) { - ((CompilerOptionsImpl)options).postProcessArgs(); CompileTask task = new CompileTask() { public boolean run(TreeLogger logger) throws UnableToCompleteException { FutureTask<UpdateResult> updater = null; @@ -179,6 +172,9 @@ options.setWorkDir(Utility.makeTemporaryDirectory(null, "gwtc")); tempWorkDir = true; } + if (options.isSoycEnabled() && options.getExtraDir() == null) { + options.setExtraDir(new File("extras")); + } for (String moduleName : options.getModuleNames()) { ModuleDef module = ModuleDefLoader.loadFromClassPath(logger, @@ -220,7 +216,6 @@ File absPath = new File(options.getWarDir(), module.getName()); absPath = absPath.getAbsoluteFile(); - String logMessage = "Linking into " + absPath; if (options.getExtraDir() != null) { File absExtrasPath = new File(options.getExtraDir(), module.getName()); -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
