Changeset 7415

Timestamp:

02/22/07 23:03:33 (18 months ago)

Author:

jburke

Message:

(merge from 0.4 branch) References #2366. Fixes issue where comment stripping was messing up the charset in i18n bundles.

Location:

trunk/buildscripts

Files:

• buildUtil.js (modified) (6 diffs)
• makeDojoJsWeb.js (modified) (1 diff)
• setXdDojoConfig.js (modified) (1 diff)
• webbuild/makeWebBuildModuleList.js (modified) (1 diff)
• webbuild/topIndex.html (copied) (copied from branches/0.4/buildscripts/webbuild/topIndex.html)
• webbuild/webbuild.js (modified) (1 diff)

trunk/buildscripts/buildUtil.js

@@ -238 +238 @@
         var dependencies = null;
         var hostenvType = null;
-        var profileText = readFile(profileFile);
+        var profileText = new String(buildUtil.readFile(profileFile));
         
         //Remove the call to getDependencyList.js because we want to call it manually.
@@ -264 +264 @@
         for(var i = 0; i < depList.length; i++){
                 //Make sure we have a JS string and not a Java string by using new String().
-                dojoContents += new String(readFile(depList[i])) + "\r\n";
+                dojoContents += new String(buildUtil.readFile(depList[i])) + "\r\n";
         }
         
@@ -812 +812 @@
 }
 
+buildUtil.readFile = function(/*String*/path, /*String?*/encoding){
+        encoding = encoding || "utf-8";
+        var file = new java.io.File(path);
+        var lineSeparator = buildUtil.getLineSeparator();
+        var input = new java.io.BufferedReader(new java.io.InputStreamReader(new java.io.FileInputStream(file), encoding));
+        try {
+                var stringBuffer = new java.lang.StringBuffer();
+                var line = "";
+                while((line = input.readLine()) !== null){
+                        stringBuffer.append(line);
+                        stringBuffer.append(lineSeparator);
+                }
+                return stringBuffer.toString();
+        } finally {
+                input.close();
+        }
+}
+
 buildUtil.saveUtf8File = function(/*String*/fileName, /*String*/fileContents){
         buildUtil.saveFile(fileName, fileContents, "utf-8");
@@ -842 +860 @@
 buildUtil.stripComments = function(/*String*/startDir, /*boolean*/suppressDojoCopyright){
         //summary: strips the JS comments from all the files in "startDir", and all subdirectories.
-        var copyright = suppressDojoCopyright ? "" : (new String(readFile("copyright.txt")) + buildUtil.getLineSeparator());
+        var copyright = suppressDojoCopyright ? "" : (new String(buildUtil.readFile("copyright.txt")) + buildUtil.getLineSeparator());
         var fileList = buildUtil.getFilteredFileList(startDir, /\.js$/, true);
         if(fileList){
@@ -854 +872 @@
                                 print("Stripping comments from file: " + fileList[i]);
                                 
-                                //Read in the file.
-                                var fileContents = readFile(fileList[i]);
-                                
+                                //Read in the file. Make sure we have a JS string.
+                                var fileContents = new String(buildUtil.readFile(fileList[i]));
+
                                 //Look for copyright. If so, maintain it.
                                 var singleLineMatches = fileContents.match(/\/\/.*copyright.*$/gi);
@@ -895 +913 @@
                                 //Ideally do this in the pretty printer rhino code.
                                 fileContents = fileContents.replace(/    /g, "\t");
-                                
+
                                 //Write out the file with appropriate copyright.
                                 buildUtil.saveUtf8File(fileList[i], copyrightText + fileContents);

trunk/buildscripts/makeDojoJsWeb.js

@@ -49 +49 @@
         
         //Add copyright, and intern strings.
-        contents = new String(readFile("copyright.txt")) + buildUtil.interningRegexpMagic("xdomain", contents, djConfig.baseRelativePath, [["dojo", "src"]], [], true);
+        contents = new String(buildUtil.readFile("copyright.txt")) + buildUtil.interningRegexpMagic("xdomain", contents, djConfig.baseRelativePath, [["dojo", "src"]], [], true);
         
         if(xdDojoUrl){

trunk/buildscripts/setXdDojoConfig.js

@@ -7 +7 @@
 load("buildUtilXd.js");
 
-var fileContents = new String(readFile(dojoFile));
+var fileContents = new String(buildUtil.readFile(dojoFile));
 fileContents = buildUtilXd.setXdDojoConfig(fileContents, xdUrl);
 buildUtil.saveFile(dojoFile, fileContents);

trunk/buildscripts/webbuild/makeWebBuildModuleList.js

@@ -57 +57 @@
 for(var i = 0; i < fileList.length; i++){
         var fileName = fileList[i];
-        var fileContents = readFile(fileName);
+        var fileContents = new String(buildUtil.readFile(fileName));
 
         var matches = fileContents.match(provideRegExp);

trunk/buildscripts/webbuild/webbuild.js

@@ -11 +11 @@
 }
 
-readText = readFile = function(uri){
+buildUtil.readFile = readText = readFile = function(uri){
         return dojo.hostenv.getText(uri);
 }