Revision: 7076 Author: kpro...@google.com Date: Fri Nov 20 13:00:58 2009 Log: Merging trunk r7061 into this branch.
Review by: spoon http://code.google.com/p/google-web-toolkit/source/detail?r=7076 Modified: /releases/2.0/dev/core/src/com/google/gwt/dev/Compiler.java /releases/2.0/dev/core/src/com/google/gwt/soyc/io/ArtifactsOutputDirectory.java /releases/2.0/dev/core/test/com/google/gwt/dev/SoycTest.java ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/dev/Compiler.java Fri Nov 20 10:46:56 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/dev/Compiler.java Fri Nov 20 13:00:58 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,13 @@ 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, allPerms, resultFiles, options.getWarDir(), options.getExtraDir(), precompileOptions); ======================================= --- /releases/2.0/dev/core/src/com/google/gwt/soyc/io/ArtifactsOutputDirectory.java Fri Nov 20 10:46:56 2009 +++ /releases/2.0/dev/core/src/com/google/gwt/soyc/io/ArtifactsOutputDirectory.java Fri Nov 20 13:00:58 2009 @@ -49,7 +49,7 @@ closed = true; SoycArtifact newArtifact = new SoycArtifact(OUTPUT_DIRECTORY_NAME + "/" + path, baos.toByteArray()); - newArtifact.setPrivate(false); + newArtifact.setPrivate(true); artifacts.add(newArtifact); baos = null; } ======================================= --- /releases/2.0/dev/core/test/com/google/gwt/dev/SoycTest.java Fri Nov 20 10:46:56 2009 +++ /releases/2.0/dev/core/test/com/google/gwt/dev/SoycTest.java Fri Nov 20 13:00:58 2009 @@ -37,18 +37,19 @@ public void testSoyc() throws UnableToCompleteException, IOException { options.setSoycEnabled(true); options.addModuleName("com.google.gwt.sample.hello.Hello"); + options.setExtraDir(Utility.makeTemporaryDirectory(null, "helloextra")); options.setWarDir(Utility.makeTemporaryDirectory(null, "hellowar")); PrintWriterTreeLogger logger = new PrintWriterTreeLogger(); logger.setMaxDetail(TreeLogger.ERROR); new Compiler(options).run(logger); // make sure the files have been produced - assertTrue(new File(options.getWarDir() + "/hello/compile-report/index.html").exists()); - assertTrue(new File(options.getWarDir() + "/hello/compile-report/SoycDashboard-0-index.html").exists()); - assertTrue(new File(options.getWarDir() + "/hello/compile-report/total-0-overallBreakdown.html").exists()); - assertTrue(new File(options.getWarDir() + "/hello/compile-report/soyc.css").exists()); - - assertFalse(new File(options.getWarDir() + "/hello/compile-report/index2.html").exists()); - Util.recursiveDelete(options.getWarDir(), false); + assertTrue(new File(options.getExtraDir() + "/hello/soycReport/compile-report/index.html").exists()); + assertTrue(new File(options.getExtraDir() + "/hello/soycReport/compile-report/SoycDashboard-0-index.html").exists()); + assertTrue(new File(options.getExtraDir() + "/hello/soycReport/compile-report/total-0-overallBreakdown.html").exists()); + assertTrue(new File(options.getExtraDir() + "/hello/soycReport/compile-report/soyc.css").exists()); + + assertFalse(new File(options.getExtraDir() + "/hello/soycReport/compile-report/index2.html").exists()); + Util.recursiveDelete(options.getExtraDir(), false); } } -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
