Changeset 7764

Timestamp:

03/22/07 18:06:52 (16 months ago)

Author:

jburke

Message:

Refs #2607. Starting non-ant build option. Does not work yet. This build approach should support any number of namespaces.

Location:

util/trunk/buildscripts

Files:

• build.js (added)
• buildUtil.test.js (deleted)
• cldr/cldrArrayInherit.js (modified) (2 diffs)
• flattenResources.js (modified) (3 diffs)
• jslib/buildUtil.js (modified) (14 diffs)
• jslib/convertTestsToXDomain.js (modified) (1 diff)
• jslib/fileUtil.js (added)
• jslib/logger.js (added)
• makeDojoJs.js (modified) (3 diffs)
• makeDojoJsWeb.js (modified) (2 diffs)
• setXdDojoConfig.js (modified) (1 diff)
• webbuild/makeWebBuildModuleList.js (modified) (3 diffs)
• webbuild/webbuild.js (modified) (2 diffs)
• xdgen.js (modified) (5 diffs)

util/trunk/buildscripts/cldr/cldrArrayInherit.js

@@ -44 +44 @@
 dojo.require("dojo.json");
 
+load("fileUtil.js");
 load("buildUtil.js");
 
 // limit search to gregorian.js files, which are the only ones to use Array as data type
-var fileList = buildUtil.getFilteredFileList(dir, /\/gregorian\.js$/, true);
+var fileList = fileUtil.getFilteredFileList(dir, /\/gregorian\.js$/, true);
 
 for(var i= 0; i < fileList.length; i++){
@@ -100 +101 @@
         });
         if(hasChanged){
-                buildUtil.saveUtf8File(jsFileName, dojo.json.serialize(data));
+                fileUtil.saveUtf8File(jsFileName, dojo.json.serialize(data));
         }
 }

util/trunk/buildscripts/flattenResources.js

@@ -33 +33 @@
 dojo.require("dojo.i18n.common");
 dojo.require("dojo.json");
+load("fileUtil.js");
 load("buildUtil.js");
 
@@ -94 +95 @@
 //Flatten all bundles and modifying dojo.requireLocalization calls.
 var prefixes = buildUtil.configPrefixes(profileFile);
-var fileList = buildUtil.getFilteredFileList(releaseDir + "/src", /\.js$/, true);
+var fileList = fileUtil.getFilteredFileList(releaseDir + "/src", /\.js$/, true);
 
 for(var i= 0; i < fileList.length; i++){
@@ -110 +111 @@
         
         if(fileContents){
-                buildUtil.saveUtf8File(jsFileName, fileContents);
+                fileUtil.saveUtf8File(jsFileName, fileContents);
         }
 }

util/trunk/buildscripts/jslib/buildUtil.js

@@ -1 +1 @@
 var buildUtil = {};
-
-buildUtil.getLineSeparator = function(){
-        //summary: Gives the line separator for the platform.
-        //For web builds override this function.
-        return java.lang.System.getProperty("line.separator");
-}
 
 buildUtil.getDojoLoader = function(/*Object?*/dependencies){
@@ -288 +282 @@
         var dependencies = null;
         var hostenvType = null;
-        var profileText = new String(buildUtil.readFile(profileFile));
-        
-        //Remove the call to getDependencyList.js because we want to call it manually.
+        var profileText = new String(fileUtil.readFile(profileFile));
+        
+        //Remove the call to getDependencyList.js because it is not supported anymore.
         profileText = profileText.replace(/load\(("|')getDependencyList.js("|')\)/, "");
         eval(profileText);
+        
+        //Build up the prefixes so the rest of the scripts
+        //do not have to guess where things are at.
+        if(!dependencies["prefixes"]){
+                dependencies.prefixes = [];
+        }
+        
+        //Find prefixes that are used.
+        var usedPrefixes = ["dojo"];
+        xxx
+        
         return {
                 dependencies: dependencies,
@@ -318 +323 @@
         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(buildUtil.readFile(depList[i])) + "\r\n";
+                dojoContents += new String(fileUtil.readFile(depList[i])) + "\r\n";
         }
         
@@ -324 +329 @@
         if(dojoContents.match(buildUtil.globalRequireLocalizationRegExp)){
                 depList.push("../src/i18n/loader.js");
-                dojoContents += new String(readFile(depList[depList.length-1]));
+                dojoContents += new String(fileUtil.readFile(depList[depList.length-1]));
         }
 
@@ -387 +392 @@
         //returned from buildUtil.getDependencyList()
 
-        var lineSeparator = buildUtil.getLineSeparator();
+        var lineSeparator = fileUtil.getLineSeparator();
 
         //Cycle through the layers to create the content for each layer.
@@ -552 +557 @@
         
         var bundleRegExp = new RegExp("nls[/]?([\\w\\-]*)/" + bundleName + ".js$");
-        var bundleFiles = buildUtil.getFilteredFileList(filePath + "nls/", bundleRegExp, true);
+        var bundleFiles = fileUtil.getFilteredFileList(filePath + "nls/", bundleRegExp, true);
         
         //Find the list of locales supported by looking at the path names.
@@ -744 +749 @@
         //Make sure dojo is in the list.
         var dojoPath = releaseDir.replace(/^.*(\/|\\)release(\/|\\)/, "release/");
-        prefixes.push(["dojo", dojoPath + "/src"]);
 
         var skiplist = dependencies["internSkipList"] || [];
@@ -760 +764 @@
 
         //Intern strings for all files in widget dir (xdomain and regular files)
-        var fileList = buildUtil.getFilteredFileList(releaseDir + "/src/widget",
+        var fileList = fileUtil.getFilteredFileList(releaseDir + "/src/widget",
                 /\.js$/, true);
 
@@ -773 +777 @@
         var resourceContent = new String(readText(resourceFile));
         resourceContent = buildUtil.interningRegexpMagic(loader, resourceContent, srcRoot, prefixes, skiplist);
-        buildUtil.saveUtf8File(resourceFile, resourceContent);
+        fileUtil.saveUtf8File(resourceFile, resourceContent);
 }
 
@@ -852 +856 @@
 }
 
-buildUtil.isValueInArray = function(value, ary){
+buildUtil.isValueInArray = function(/*Object*/value, /*Array*/ary){
+        //summary: sees if value is in the ary array. Uses == to see if the
+        //array item matches value.
         for(var i = 0; i < ary.length; i++){
                 if(ary[i] == value){
-                        return true;
-                }
-        }
-        return false;
-}
-
-
-//Recurses startDir and finds matches to the files that match regExpFilter.
-//Ignores files/directories that start with a period (.).
-buildUtil.getFilteredFileList = function(startDir, regExpFilter, makeUnixPaths, startDirIsJavaObject){
-        var files = [];
-
-        var topDir = startDir;
-        if(!startDirIsJavaObject){
-                topDir = new java.io.File(startDir);
-        }
-
-        if(topDir.exists()){
-                var dirFileArray = topDir.listFiles();
-                for (var i = 0; i < dirFileArray.length; i++){
-                        var file = dirFileArray[i];
-                        if(file.isFile()){
-                                var filePath = file.getPath();
-                                if(makeUnixPaths){
-                                        //Make sure we have a JS string.
-                                        filePath = String(filePath);
-                                        if(filePath.indexOf("/") == -1){
-                                                filePath = filePath.replace(/\\/g, "/");
-                                        }
-                                }
-                                if(!file.getName().match(/^\./) && filePath.match(regExpFilter)){
-                                        files.push(filePath);
-                                }
-                        }else if(file.isDirectory() && !file.getName().match(/^\./)){
-                                var dirFiles = this.getFilteredFileList(file, regExpFilter, makeUnixPaths, true);
-                                files.push.apply(files, dirFiles);
-                        }
-                }
-        }
-
-        return files;
-}
-
-buildUtil.ensureEndSlash = function(path){
-        if(path.charAt(path.length) != '/' || path.charAt(path.length) != '\\'){
-                path += "/";
-        }
-        return path;
-}
-
-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");
-}
-
-buildUtil.saveFile = function(/*String*/fileName, /*String*/fileContents, /*String?*/encoding){
-        var outFile = new java.io.File(fileName);
-        var outWriter;
-        if(encoding){
-                outWriter = new java.io.OutputStreamWriter(new java.io.FileOutputStream(outFile), encoding);
-        }else{
-                outWriter = new java.io.OutputStreamWriter(new java.io.FileOutputStream(outFile));
-        }
-
-        var os = new java.io.BufferedWriter(outWriter);
-        try{
-                os.write(fileContents);
-        }finally{
-                os.close();
-        }
-}
-
-buildUtil.deleteFile = function(fileName){
-        var file = new java.io.File(fileName);
-        if(file.exists()){
-                file["delete"]();
-        }
+                        return true; //boolean
+                }
+        }
+        return false; //boolean
+}
+
+buildUtil.convertArrayToObject = function(/*Array*/ary){
+        //summary: converts an array that has String members of "name=value"
+        //into an object, where the properties on the object are the names in the array
+        //member name/value pairs.
+        var result = {};
+        for(var i = 0; i < ary.length; i++){
+                var parts = ary[i].split("=");
+                if(parts.length != 2){
+                        throw "Malformed name/value pair: [" + ary[i] + "]. Format should be name=value";
+                }
+                result[parts[0]] = parts[1];
+        }
+        return result; //Object
 }
 
@@ -974 +905 @@
                                 copyrightText += singleLineMatches.join("\r\n");
                         }
-                        copyrightText += buildUtil.getLineSeparator();
+                        copyrightText += fileUtil.getLineSeparator();
                 }else{
                         copyrightText = copyright;
@@ -1012 +943 @@
 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(buildUtil.readFile("copyright.txt")) + buildUtil.getLineSeparator());
-        var fileList = buildUtil.getFilteredFileList(startDir, /\.js$/, true);
+        var copyright = suppressDojoCopyright ? "" : (new String(fileUtil.readFile("copyright.txt")) + fileUtil.getLineSeparator());
+        var fileList = fileUtil.getFilteredFileList(startDir, /\.js$/, true);
         if(fileList){
                 for(var i = 0; i < fileList.length; i++){
@@ -1026 +957 @@
                                 
                                 //Read in the file. Make sure we have a JS string.
-                                var fileContents = new String(buildUtil.readFile(fileList[i]));
+                                var fileContents = new String(fileUtil.readFile(fileList[i]));
 
                                 //Do comment removal.
@@ -1036 +967 @@
 
                                 //Write out the file with appropriate copyright.
-                                buildUtil.saveUtf8File(fileList[i], fileContents);
-                        }
-                }
-        }
-}
-
-
+                                fileUtil.saveUtf8File(fileList[i], fileContents);
+                        }
+                }
+        }
+}
+
+

util/trunk/buildscripts/jslib/convertTestsToXDomain.js

@@ -5 +5 @@
 var xdDojoUrl = arguments[1];
 
+load("fileUtil.js");
 load("buildUtil.js");
 
-var fileList = buildUtil.getFilteredFileList(startDir, /\.(html|htm)$/, true);
+var fileList = fileUtil.getFilteredFileList(startDir, /\.(html|htm)$/, true);
 
 for(var i = 0; i < fileList.length; i++){
         var fileName = fileList[i];     
-        var fileContents = String(buildUtil.readFile(fileName));
+        var fileContents = String(fileUtil.readFile(fileName));
         fileContents = fileContents.replace(/src\=\".*dojo.js"/, 'src="' + xdDojoUrl + '"');
-        buildUtil.saveUtf8File(fileName, fileContents);
+        fileUtil.saveUtf8File(fileName, fileContents);
 }

util/trunk/buildscripts/makeDojoJs.js

@@ -1 +1 @@
 //START of the "main" part of the script.
 //This is the entry point for this script file.
+load("fileUtil.js");
 load("buildUtil.js");
 
@@ -12 +13 @@
 
 //Save the dojo.js contents. It is always the first result.
-buildUtil.saveFile(releaseDir + "/" + dojoFileName, result[0].contents);
+fileUtil.saveFile(releaseDir + "/" + dojoFileName, result[0].contents);
 
 //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);
+        fileUtil.saveFile(releaseDir + "/" + result[i].layerName, result[i].contents);
 }
 
@@ -26 +27 @@
 }
 
-buildUtil.saveFile(releaseDir + "/build.txt", buildText);
+fileUtil.saveFile(releaseDir + "/build.txt", buildText);
 
 print(buildText);

util/trunk/buildscripts/makeDojoJsWeb.js

@@ -75 +75 @@
 
                 //Add copyright
-                var copyright = new String(buildUtil.readFile("copyright.txt"));
-                var buildNotice = new String(buildUtil.readFile("build_notice.txt"));
+                var copyright = new String(fileUtil.readFile("copyright.txt"));
+                var buildNotice = new String(fileUtil.readFile("build_notice.txt"));
                 contents = copyright + buildNotice + contents;
                 compressedContents = copyright + buildNotice + compressedContents;
@@ -93 +93 @@
 
                 //Save files to disk
-                buildUtil.saveUtf8File(buildCachePath + "dojo.js", contents);
-                buildUtil.saveUtf8File(buildCachePath + "compressed/dojo.js", compressedContents);
-                buildUtil.saveUtf8File(buildCachePath + "build.txt", buildContents);
+                fileUtil.saveUtf8File(buildCachePath + "dojo.js", contents);
+                fileUtil.saveUtf8File(buildCachePath + "compressed/dojo.js", compressedContents);
+                fileUtil.saveUtf8File(buildCachePath + "build.txt", buildContents);
                 
                 result = "OK";

util/trunk/buildscripts/setXdDojoConfig.js

@@ -4 +4 @@
 var xdUrl = arguments[1];
 
+load("fileUtil.js");
 load("buildUtil.js");
 load("buildUtilXd.js");
 
-var fileContents = new String(buildUtil.readFile(dojoFile));
+var fileContents = new String(fileUtil.readFile(dojoFile));
 fileContents = buildUtilXd.setXdDojoConfig(fileContents, xdUrl);
-buildUtil.saveFile(dojoFile, fileContents);
+fileUtil.saveFile(dojoFile, fileContents);
 
 

util/trunk/buildscripts/webbuild/makeWebBuildModuleList.js

@@ -44 +44 @@
 dojo.require("dojo.json");
 
+load("../fileUtil.js");
 load("../buildUtil.js");
 
 //Get a list of files that might be modules.
-var fileList = buildUtil.getFilteredFileList(srcRoot, /\.js$/, true);
+var fileList = fileUtil.getFilteredFileList(srcRoot, /\.js$/, true);
 
 var provideRegExp = /dojo\.provide\(\".*\"\)/g;
@@ -57 +58 @@
 for(var i = 0; i < fileList.length; i++){
         var fileName = fileList[i];
-        var fileContents = new String(buildUtil.readFile(fileName));
+        var fileContents = new String(fileUtil.readFile(fileName));
 
         var matches = fileContents.match(provideRegExp);
@@ -91 +92 @@
 
 //Output the results.
-buildUtil.saveFile(outputFileName, "var treeData = " + dojo.json.serialize(treeData) + ";");
+fileUtil.saveFile(outputFileName, "var treeData = " + dojo.json.serialize(treeData) + ";");
 

util/trunk/buildscripts/webbuild/webbuild.js

@@ -7 +7 @@
 //Define some methods that are defined in Rhino, but we need web equivalents
 //in order for the build scripts to work.
-buildUtil.readFile = readText = readFile = function(uri){
+fileUtil.readFile = readText = readFile = function(uri){
         return dojo.hostenv.getText(uri);
 }
@@ -16 +16 @@
 
 //Define some overrides for the buildUtil functions.
-buildUtil.getLineSeparator = function(){
+fileUtil.getLineSeparator = function(){
         //summary: Gives the line separator for the platform.
         //For web builds override this function.

util/trunk/buildscripts/xdgen.js

@@ -7 +7 @@
         var jsFileNames = [];
         for(var i = 0; i < srcDirs.length; i++){
-                var fileList = buildUtil.getFilteredFileList(srcDirs[i].prefixPath, filePathRegExp, true);
+                var fileList = fileUtil.getFilteredFileList(srcDirs[i].prefixPath, filePathRegExp, true);
                 if(fileList){
                         for(var j = 0; j < fileList.length; j++){
@@ -36 +36 @@
 
 //Find the bundles that need to be flattened.
+load("fileUtil.js");
 load("buildUtil.js");
 
@@ -45 +46 @@
 //Any other arguments to this file are directories to search.
 for(var i = 3; i < arguments.length; i++){
+xxx broken
         srcDirs.push({prefix: "dojo", prefixPath: arguments[i]});
 }
@@ -75 +77 @@
                         var xdContents = buildUtilXd.makeXdContents(readText(jsFileName), djConfig.baseRelativePath, prefixes);
                 }
-                buildUtil.saveUtf8File(xdFileName, xdContents);
+                fileUtil.saveUtf8File(xdFileName, xdContents);
         }
 }else if(action == "xdremove"){
@@ -83 +85 @@
         //Run makeXdContents on each file and save the XD file contents to a xd.js file.
         for(j = 0; j < jsFileNames.length; j++){
-                buildUtil.deleteFile(jsFileNames[j].path);
+                fileUtil.deleteFile(jsFileNames[j].path);
         }
 }