Changeset 7907

Timestamp:

04/02/07 15:33:56 (22 months ago)

Author:

jburke

Message:

Fixes #2407 and Refs #2386. dojo compressing now works over multiple files in the same process. Layer files are now compressed, and it is possible to compress all files in the src directory via the strip-resource-comments ant task. Specify that task and a -Dstrip_and_compress=true to ant.

Location:

branches/0.4/buildscripts

Files:

• build.xml (modified) (2 diffs)
• buildUtil.js (modified) (2 diffs)
• lib/custom_rhino.diff (modified) (15 diffs)
• lib/custom_rhino.jar (modified) (previous)
• makeDojoJs.js (modified) (1 diff)
• stripComments.js (modified) (1 diff)

branches/0.4/buildscripts/build.xml

@@ -39 +39 @@
         <property name="release_website_dir" value="/srv/www/htdocs"/>
         <property name="profile" value=""/>
+        <property name="strip_and_compress" value="false"/>
         <property name="locales" value="en-gb,en-us,de-de,es-es,fr-fr,it-it,pt-br,ko-kr,zh-tw,zh-cn,ja-jp"/>
         <!-- FIXME: where should this list come from? -->
@@ -284 +285 @@
                                 logerror="true">
                         <arg value="stripComments.js" />
-                        <arg value="${release_dir}"/>
+                        <arg value="${release_dir}/src"/>
+                        <arg value="false"/>
+                        <arg value="${strip_and_compress}"/>
                 </java>
         </target>

branches/0.4/buildscripts/buildUtil.js

@@ -1004 +1004 @@
 }
 
-buildUtil.stripComments = function(/*String*/startDir, /*boolean*/suppressDojoCopyright){
+buildUtil.stripComments = function(/*String*/startDir, /*boolean*/suppressDojoCopyright, /*boolean*/doCompress){
         //summary: strips the JS comments from all the files in "startDir", and all subdirectories.
         var copyright = suppressDojoCopyright ? "" : (new String(buildUtil.readFile("copyright.txt")) + buildUtil.getLineSeparator());
@@ -1024 +1024 @@
                                 //Do comment removal.
                                 try{
-                                        fileContents = buildUtil.optimizeJs(fileList[i], fileContents, copyright, false);
+                                        fileContents = buildUtil.optimizeJs(fileList[i], fileContents, copyright, doCompress);
                                 }catch(e){
                                         print("Could not strip comments for file: " + fileList[i] + ", error: " + e);

branches/0.4/buildscripts/lib/custom_rhino.diff

@@ +1 @@
+### Eclipse Workspace Patch 1.0
+#P rhino
 Index: src/org/mozilla/javascript/BaseFunction.java
 ===================================================================
@@ -5 +7 @@
 diff -u -r1.57 BaseFunction.java
 --- src/org/mozilla/javascript/BaseFunction.java        30 Aug 2005 10:05:42 -0000      1.57
-+++ src/org/mozilla/javascript/BaseFunction.java        2 Jun 2006 09:19:22 -0000
++++ src/org/mozilla/javascript/BaseFunction.java        2 Apr 2007 22:06:50 -0000
 @@ -373,6 +373,28 @@
          return sb.toString();
@@ -35 +37 @@
  
      public int getLength() { return 0; }
+Index: src/org/mozilla/javascript/NativeFunction.java
+===================================================================
+RCS file: /cvsroot/mozilla/js/rhino/src/org/mozilla/javascript/NativeFunction.java,v
+retrieving revision 1.62
+diff -u -r1.62 NativeFunction.java
+--- src/org/mozilla/javascript/NativeFunction.java      17 Jan 2005 13:06:33 -0000      1.62
++++ src/org/mozilla/javascript/NativeFunction.java      2 Apr 2007 22:06:50 -0000
+@@ -70,6 +70,26 @@
+         }
+     }
+ 
++    /**
++     * Compress the script.
++     * <p>
++     * 
++     * @param parseTree Mapping for each function node and corresponding parameters & variables names
++     * @param indent How much to indent the decompiled result
++     * @param flags Flags specifying format of decompilation output
++     * @return compressed script
++     */
++    final String compress(ScriptOrFnNode parseTree, int indent, int flags)
++    {
++        String encodedSource = getEncodedSource();
++        if (encodedSource == null) {
++            return super.compress(indent, flags);
++        } else {
++            UintMap properties = new UintMap(1);
++            properties.put(Decompiler.INITIAL_INDENT_PROP, indent);
++            return Decompiler.compress(encodedSource, flags, properties, parseTree);
++        }
++    }
+     public int getLength()
+     {
+         int paramCount = getParamCount();
+Index: src/org/mozilla/javascript/TokenStream.java
+===================================================================
+RCS file: /cvsroot/mozilla/js/rhino/src/org/mozilla/javascript/TokenStream.java,v
+retrieving revision 1.63
+diff -u -r1.63 TokenStream.java
+--- src/org/mozilla/javascript/TokenStream.java 31 Jul 2005 13:48:46 -0000      1.63
++++ src/org/mozilla/javascript/TokenStream.java 2 Apr 2007 22:06:50 -0000
+@@ -64,9 +64,12 @@
+     private final static int
+         EOF_CHAR = -1;
+ 
++    public StringBuffer lastComment;
++    
+     TokenStream(Parser parser, Reader sourceReader, String sourceString,
+                 int lineno)
+     {
++       this.lastComment = new StringBuffer();
+         this.parser = parser;
+         this.lineno = lineno;
+         if (sourceReader != null) {
+@@ -736,6 +739,8 @@
+ 
+             case '/':
+                 // is it a // comment?
++               // FIXME: RAR: comment, need to set config to optionally keep
++               // instead of skipping!
+                 if (matchChar('/')) {
+                     skipLine();
+                     continue retry;
 Index: src/org/mozilla/javascript/Context.java
 ===================================================================
@@ -41 +106 @@
 diff -u -r1.244 Context.java
 --- src/org/mozilla/javascript/Context.java     4 Nov 2005 13:37:45 -0000       1.244
-+++ src/org/mozilla/javascript/Context.java     2 Jun 2006 09:19:26 -0000
++++ src/org/mozilla/javascript/Context.java     2 Apr 2007 22:06:50 -0000
 @@ -1178,6 +1178,33 @@
          }
@@ -76 +141 @@
       * Check whether a string is ready to be compiled.
       * <p>
-@@ -1361,6 +1388,27 @@
+@@ -1361,6 +1388,33 @@
      }
  
@@ -90 +155 @@
 +    public final String compressScript(Script script, int indent, String source,int lineno)
 +    {
++        //Make sure to clear out the TokenMapper state before running.
++        //This allows for more than one script to be compressed.
++        //However, this is not a very clean way to do the reset.
++        TokenMapper.reset();
++        Decompiler.tm = new TokenMapper();
++
 +        NativeFunction scriptImpl = (NativeFunction) script;
 +        
@@ -104 +175 @@
       * <p>
       * Decompiles a previously compiled JavaScript function object to
-@@ -2240,7 +2288,6 @@
+@@ -2240,7 +2294,6 @@
                  sourceReader = null;
              }
@@ -112 +183 @@
          if (returnFunction) {
              p.calledByCompileFunction = true;
-@@ -2251,6 +2298,7 @@
+@@ -2251,6 +2304,7 @@
          } else {
              tree = p.parse(sourceReader, sourceName, lineno);
@@ -126 +197 @@
 diff -u -r1.19 Decompiler.java
 --- src/org/mozilla/javascript/Decompiler.java  28 Aug 2005 23:25:22 -0000      1.19
-+++ src/org/mozilla/javascript/Decompiler.java  2 Jun 2006 09:19:28 -0000
++++ src/org/mozilla/javascript/Decompiler.java  2 Apr 2007 22:06:50 -0000
 @@ -37,6 +37,11 @@
  
@@ -139 +210 @@
   * The following class save decompilation information about the source.
   * Source information is returned from the parser as a String
-@@ -70,6 +75,264 @@
+@@ -70,6 +75,272 @@
   * the final constant pool entry from information available at parse
   * time.
@@ -169 +240 @@
 +
 +       private int lastTokenCount = 0;
++
++       /**
++        * Reset the static members for the TokenMapper.
++        */
++       public static void reset() {
++               funcObjects = new ObjArray();
++               functionVarMappings = new ArrayList();
++       }
 +
 +       /**
@@ -404 +483 @@
  {
      /**
-@@ -266,6 +529,512 @@
+@@ -266,6 +537,515 @@
          return new String(sourceBuffer, offset, sourceTop - offset);
      }
  
-+    private static TokenMapper tm = new TokenMapper();
++    //Used to be private, but making it public so we
++    //can reset the token state between compression runs.
++    //Not very pretty.
++    public static TokenMapper tm = new TokenMapper();
 +    
 +    /**
@@ -917 +999 @@
       * Decompile the source information associated with this js
       * function/script back into a string.  For the most part, this
-Index: src/org/mozilla/javascript/NativeFunction.java
-===================================================================
-RCS file: /cvsroot/mozilla/js/rhino/src/org/mozilla/javascript/NativeFunction.java,v
-retrieving revision 1.62
-diff -u -r1.62 NativeFunction.java
---- src/org/mozilla/javascript/NativeFunction.java      17 Jan 2005 13:06:33 -0000      1.62
-+++ src/org/mozilla/javascript/NativeFunction.java      2 Jun 2006 09:19:28 -0000
-@@ -70,6 +70,26 @@
-         }
-     }
- 
-+    /**
-+     * Compress the script.
-+     * <p>
-+     * 
-+     * @param parseTree Mapping for each function node and corresponding parameters & variables names
-+     * @param indent How much to indent the decompiled result
-+     * @param flags Flags specifying format of decompilation output
-+     * @return compressed script
-+     */
-+    final String compress(ScriptOrFnNode parseTree, int indent, int flags)
-+    {
-+        String encodedSource = getEncodedSource();
-+        if (encodedSource == null) {
-+            return super.compress(indent, flags);
-+        } else {
-+            UintMap properties = new UintMap(1);
-+            properties.put(Decompiler.INITIAL_INDENT_PROP, indent);
-+            return Decompiler.compress(encodedSource, flags, properties, parseTree);
-+        }
-+    }
-     public int getLength()
-     {
-         int paramCount = getParamCount();
-Index: src/org/mozilla/javascript/TokenStream.java
-===================================================================
-RCS file: /cvsroot/mozilla/js/rhino/src/org/mozilla/javascript/TokenStream.java,v
-retrieving revision 1.63
-diff -u -r1.63 TokenStream.java
---- src/org/mozilla/javascript/TokenStream.java 31 Jul 2005 13:48:46 -0000      1.63
-+++ src/org/mozilla/javascript/TokenStream.java 2 Jun 2006 09:19:29 -0000
-@@ -64,9 +64,12 @@
-     private final static int
-         EOF_CHAR = -1;
- 
-+    public StringBuffer lastComment;
-+    
-     TokenStream(Parser parser, Reader sourceReader, String sourceString,
-                 int lineno)
-     {
-+       this.lastComment = new StringBuffer();
-         this.parser = parser;
-         this.lineno = lineno;
-         if (sourceReader != null) {
-@@ -736,6 +739,8 @@
- 
-             case '/':
-                 // is it a // comment?
-+               // FIXME: RAR: comment, need to set config to optionally keep
-+               // instead of skipping!
-                 if (matchChar('/')) {
-                     skipLine();
-                     continue retry;
 Index: toolsrc/org/mozilla/javascript/tools/resources/Messages.properties
 ===================================================================
@@ -986 +1005 @@
 diff -u -r1.22 Messages.properties
 --- toolsrc/org/mozilla/javascript/tools/resources/Messages.properties  2 Sep 2005 14:18:40 -0000       1.22
-+++ toolsrc/org/mozilla/javascript/tools/resources/Messages.properties  2 Jun 2006 09:19:30 -0000
++++ toolsrc/org/mozilla/javascript/tools/resources/Messages.properties  2 Apr 2007 22:06:50 -0000
 @@ -55,7 +55,9 @@
      \    -version 100|110|120|130|140|150\n\
@@ -1004 +1023 @@
 diff -u -r1.65 Main.java
 --- toolsrc/org/mozilla/javascript/tools/shell/Main.java        30 Sep 2005 08:28:51 -0000      1.65
-+++ toolsrc/org/mozilla/javascript/tools/shell/Main.java        2 Jun 2006 09:19:31 -0000
++++ toolsrc/org/mozilla/javascript/tools/shell/Main.java        2 Apr 2007 22:06:50 -0000
 @@ -66,6 +66,11 @@
      static private final int EXITCODE_RUNTIME_ERROR = 3;

branches/0.4/buildscripts/makeDojoJs.js

@@ -16 +16 @@
 //Save the other layers, if there are any.
 for(var i = 1; i < result.length; i++){
-        buildUtil.saveFile(releaseDir + "/" + result[i].layerName, result[i].contents);
+        var layerName = releaseDir + "/" + result[i].layerName;
+        var uncompressedLayerName = layerName + ".uncompressed.js";
+
+        buildUtil.saveFile(uncompressedLayerName, result[i].contents);
+        
+        //Compress the layer files. It is clunky to do it here and have dojo.js
+        //compression done elsewhere. This will be fixed in 0.9 re-org.
+        print("Compressing file: " + layerName);
+
+        var copyright = new String(buildUtil.readFile("copyright.txt"));
+
+        //Load the file contents and optimize.
+        var fileContents = new String(buildUtil.readFile(uncompressedLayerName));
+        fileContents = buildUtil.optimizeJs(uncompressedLayerName, fileContents, copyright, true);
+        
+        //Save the optimized file.
+        buildUtil.saveFile(layerName, fileContents);
 }
 

branches/0.4/buildscripts/stripComments.js

@@ -1 +1 @@
 load("buildUtil.js");
-buildUtil.stripComments(arguments[0], arguments[1]);
+
+var startDir = arguments[0];
+
+var suppressDojoCopyright =  arguments[1];
+if(suppressDojoCopyright == "true"){
+        suppressDojoCopyright = true;
+}else{
+        suppressDojoCopyright = false;
+}
+
+var doCompress =  arguments[2];
+if(doCompress == "true"){
+        doCompress = true;
+}else{
+        doCompress = false;
+}
+
+print(suppressDojoCopyright + ", " + doCompress);
+
+buildUtil.stripComments(startDir, suppressDojoCopyright, doCompress);