Changeset 7308

Timestamp:

02/13/07 20:31:50 (22 months ago)

Author:

jburke

Message:

References #2366. Allow turning of Dojo copyright insertion, to make web builds smaller (copyright still inserted at top of web built file, and non-dojo copyrights are still preserved).

Location:

branches/0.4/buildscripts

Files:

• buildUtil.js (modified) (3 diffs)
• stripComments.js (modified) (1 diff)
• webbuild/webbuild.sh (modified) (1 diff)

branches/0.4/buildscripts/buildUtil.js

@@ -852 +852 @@
 }
 
-buildUtil.stripComments = function(/*String*/startDir){
+buildUtil.stripComments = function(/*String*/startDir, /*boolean*/suppressDojoCopyright){
         //summary: strips the JS comments from all the files in "startDir", and all subdirectories.
-        var copyright = new String(readFile("copyright.txt"));
+        var copyright = suppressDojoCopyright ? "" : new String(readFile("copyright.txt")) + buildUtil.getLineSeparator();
         var fileList = buildUtil.getFilteredFileList(startDir, /\.js$/, true);
         if(fileList){
@@ -885 +885 @@
                                                 copyrightText += singleLineMatches.join("\r\n");
                                         }
+                                        copyrightText += buildUtil.getLineSeparator();
                                 }else{
                                         copyrightText = copyright;
@@ -908 +909 @@
                                 
                                 //Write out the file with appropriate copyright.
-                                buildUtil.saveUtf8File(fileList[i], copyrightText + buildUtil.getLineSeparator() + fileContents);
-                        }
-                }
-        }
-}
-
+                                buildUtil.saveUtf8File(fileList[i], copyrightText + fileContents);
+                        }
+                }
+        }
+}
+

branches/0.4/buildscripts/stripComments.js

@@ -1 +1 @@
 load("buildUtil.js");
-buildUtil.stripComments(arguments[0]);
+buildUtil.stripComments(arguments[0], arguments[1]);

branches/0.4/buildscripts/webbuild/webbuild.sh

@@ -43 +43 @@
 #Got to buildscripts dir and run stripComments for web build.
 cd ..
-java -jar lib/custom_rhino.jar stripComments.js ../src
+java -jar lib/custom_rhino.jar stripComments.js ../src true
 
 #Now in release folder. Bundle it all up.