Revision: 7068 Author: [email protected] Date: Fri Nov 20 10:15:16 2009 Log: Merge of 7061, more soyc privatization
http://code.google.com/p/google-web-toolkit/source/detail?r=7068 Modified: /branches/snapshot-2009.10.23-r6446/branch-info.txt /branches/snapshot-2009.10.23-r6446/dev/core/src/com/google/gwt/dev/Compiler.java /branches/snapshot-2009.10.23-r6446/dev/core/src/com/google/gwt/soyc/io/ArtifactsOutputDirectory.java ======================================= --- /branches/snapshot-2009.10.23-r6446/branch-info.txt Thu Nov 19 20:23:38 2009 +++ /branches/snapshot-2009.10.23-r6446/branch-info.txt Fri Nov 20 10:15:16 2009 @@ -15,4 +15,5 @@ http://google-web-toolkit.googlecode.com/svn/trunk . svn merge --ignore-ancestry -c6916 \ https://google-web-toolkit.googlecode.com/svn/trunk . - + svn merge --ignore-ancestry -c7061 \ + https://google-web-toolkit.googlecode.com/svn/trunk . # ignore SoycTest ======================================= --- /branches/snapshot-2009.10.23-r6446/dev/core/src/com/google/gwt/dev/Compiler.java Wed Nov 18 17:10:11 2009 +++ /branches/snapshot-2009.10.23-r6446/dev/core/src/com/google/gwt/dev/Compiler.java Fri Nov 20 10:15:16 2009 @@ -101,6 +101,12 @@ 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); @@ -135,6 +141,7 @@ */ 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; @@ -212,7 +219,15 @@ File absPath = new File(options.getWarDir(), module.getName()); absPath = absPath.getAbsoluteFile(); - Link.link(logger.branch(TreeLogger.TRACE, "Linking into " + absPath), + + + String logMessage = "Linking into " + absPath; + if (options.getExtraDir() != null) { + File absExtrasPath = new File(options.getExtraDir(), module.getName()); + absExtrasPath = absExtrasPath.getAbsoluteFile(); + logMessage += "; Writing extras to " + absExtrasPath; + } + Link.link(logger.branch(TreeLogger.TRACE, logMessage), module, generatedArtifacts, resultFiles, options.getWarDir(), options.getExtraDir(), precompileOptions); ======================================= --- /branches/snapshot-2009.10.23-r6446/dev/core/src/com/google/gwt/soyc/io/ArtifactsOutputDirectory.java Wed Nov 18 17:10:11 2009 +++ /branches/snapshot-2009.10.23-r6446/dev/core/src/com/google/gwt/soyc/io/ArtifactsOutputDirectory.java Fri Nov 20 10:15:16 2009 @@ -51,7 +51,7 @@ SyntheticArtifact newArtifact = new SyntheticArtifact( SoycReportLinker.class, COMPILE_REPORT_DIRECTORY + "/" + path, baos.toByteArray()); - newArtifact.setPrivate(false); + newArtifact.setPrivate(true); artifacts.add(newArtifact); baos = null; } -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
