[gwt-contrib] [google-web-toolkit] r7070 committed - Rolling back 7064 temporarily - Error in merge from trunk.

[codesite-noreply]

Revision: 7070
Author: kpro...@google.com
Date: Fri Nov 20 10:46:56 2009
Log: Rolling back 7064 temporarily - Error in merge from trunk.
http://code.google.com/p/google-web-toolkit/source/detail?r=7070

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  
09:21:32 2009
+++ /releases/2.0/dev/core/src/com/google/gwt/dev/Compiler.java Fri Nov 20  
10:46:56 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;
@@ -219,13 +212,7 @@

            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());
-              absExtrasPath = absExtrasPath.getAbsoluteFile();
-              logMessage += "; Writing extras to " + absExtrasPath;
-          }
-          Link.link(logger.branch(TreeLogger.TRACE, logMessage),
+          Link.link(logger.branch(TreeLogger.TRACE, "Linking into " +  
absPath),
                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 09:21:32 2009
+++  
/releases/2.0/dev/core/src/com/google/gwt/soyc/io/ArtifactsOutputDirectory.java 
 
Fri Nov 20 10:46:56 2009
@@ -49,7 +49,7 @@
          closed = true;
          SoycArtifact newArtifact = new SoycArtifact(OUTPUT_DIRECTORY_NAME  
+ "/"
              + path, baos.toByteArray());
-        newArtifact.setPrivate(true);
+        newArtifact.setPrivate(false);
          artifacts.add(newArtifact);
          baos = null;
        }
=======================================
--- /releases/2.0/dev/core/test/com/google/gwt/dev/SoycTest.java        Fri Nov 
20  
09:21:32 2009
+++ /releases/2.0/dev/core/test/com/google/gwt/dev/SoycTest.java        Fri Nov 
20  
10:46:56 2009
@@ -37,18 +37,18 @@
    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.getExtraDir()  
+ "/hello/soycReport/compile-report/index.html").exists());
-    assertTrue(new File(options.getExtraDir()  
+ "/hello/soycReport/compile-report/SoycDashboard-1-index.html").exists());
-    assertTrue(new File(options.getExtraDir()  
+ "/hello/soycReport/compile-report/total-1-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);
+    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);
    }
  }

-- 
http://groups.google.com/group/Google-Web-Toolkit-Contributors