Changeset 7922

Timestamp:

04/03/07 23:18:29 (22 months ago)

Author:

jburke

Message:

(merge from 0.4 branch) Refs #2386. Copyright parsing is flawed and takes way too much time. A copyright text is passed in to this method, so there is a way to set a specific copyright.

Files:

• util/trunk/buildscripts/jslib/buildUtil.js (modified) (2 diffs)

util/trunk/buildscripts/jslib/buildUtil.js

@@ -677 +677 @@
 buildUtil.optimizeJs = function(/*String fileName*/fileName, /*String*/fileContents, /*String*/copyright, /*boolean*/doCompression){
         //summary: either strips comments from string or compresses it.
-
-        //Look for copyright. If so, maintain it.
-        //If no copyright text passed in, assume want a really stripped
-        //version.
         copyright = copyright || "";
-        var copyrightText = "";
-        if(copyright){
-                var singleLineMatches = fileContents.match(/\/\/.*copyright.*$/gi);
-                
-                //Get rid of cr, lf, since it messes up matching.
-                var copyrightFileContents = fileContents.replace(/\r/g, "__DOJOCARRIAGERETURN__").replace(/\n/g, "__DOJONEWLINE__");
-                var multiLineMatches = copyrightFileContents.match(/\/\*.*?copyright.*?\*\//gi);
-        
-                //Finalize copyright notice.
-                if((multiLineMatches && multiLineMatches.length > 0) || (singleLineMatches && singleLineMatches.length > 0)){
-                        if(multiLineMatches && multiLineMatches.length > 0){
-                                copyrightText += multiLineMatches.join("\r\n").replace(/__DOJOCARRIAGERETURN__/g, "\r").replace(/__DOJONEWLINE__/g, "\n");
-                        }                                       
-                        if(singleLineMatches && singleLineMatches.length > 0){
-                                copyrightText += singleLineMatches.join("\r\n");
-                        }
-                        copyrightText += fileUtil.getLineSeparator();
-                }else{
-                        copyrightText = copyright;
-                }
-        }
 
         //Use rhino to help do minifying/compressing.
@@ -731 +706 @@
         }
 
-        return copyrightText + fileContents;
+        return copyright + fileContents;
 }