Changeset 7768

Timestamp:

03/22/07 21:51:19 (16 months ago)

Author:

jburke

Message:

Refs #2607. Building out knowledge of all top level module prefix dirs.

Location:

util/trunk/buildscripts

Files:

• build.js (modified) (3 diffs)
• jslib/buildUtil.js (modified) (2 diffs)

util/trunk/buildscripts/build.js

@@ -5 +5 @@
 load("jslib/buildUtil.js");
 
-//Constants
-var releaseDir = "release/";
-
 //Convert arguments to keyword arguments.
 var kwArgs = buildUtil.convertArrayToObject(arguments);
@@ -13 +10 @@
 //Set some defaults for some args if they are missing.
 kwArgs.releaseName = kwArgs["releaseName"] || "dojo";
-releaseDir += kwArgs.releaseName;
+kwArgs.releaseDir = "release/" + kwArgs["releaseName"] || "dojo";
 kwArgs.version = kwArgs["version"] || "0.0.0.dev";
 kwArgs.actions = (kwArgs["action"] || "release").split(",");
+kwArgs.loader = kwArgs["loader"] || "default";
 if(!kwArgs["profileFile"] && kwArgs["profile"]){
         kwArgs.profileFile = "profiles/" + kwArgs.profile + ".profile.js";
@@ -26 +24 @@
 }
 
-//*** Start clean ***
+//********* Start clean ************
 function clean(){
         fileUtil.deleteFile(releaseDir);
 }
-//*** End clean ***
+//********* End clean *********
 
-//*** Start release ***
+//********* Start release *********
 function release(){
         logger.info("Using version number: " + kwArgs.version + " for the release.");
+        logger.info("profileFile: " + kwArgs.profileFile);
         
         clean();
         
         //Get the list of module directories we need to process.
+        //They will be in the dependencies.prefixes array.
+        var dependencies = buildUtil.evalProfile(kwArgs.profileFile);
+        var prefixes = dependencies.prefixes;
+        var dojoPrefixPath = null;
+        for(var i = 0; i < prefixes.length; i++){
+                var prefixName = prefixes[i][0];
+                var prefixPath = prefixes[i][1];
+                
+                //Save dojo for last.
+                if(prefixName == "dojo"){
+                        dojoPrefixPath = prefixPath;
+                }else{
+                        _releasePrefixPath(prefixName, prefixPath, kwArgs);
+                }
+        }
         
-        //Copy each module directory.
+        //Now process Dojo core. Special things for that one.
+        if(dojoPrefixPath){
+                //xxx
+                
+                //-flatten-resources
+                //              <replaceregexp match="/\*\*\*BUILD:localesGenerated\*\*\*/" byline="false" replace="=${generatedLocales}"
+                //      file="${dstFile}"/>
+                
+                //remove dojo.requireLocalization calls.
+                
+                //Make a compressed and uncompressed version of the layer files.
+                
+                //add build_notice and copyright to module files.
+
+        }
+}
+//********* End release *********
+
+//********* Start _releasePrefixPath *********
+function _releasePrefixPath(prefixName, prefixPath, kwArgs){
+        //Copy prefixPath to release dir.
+        //Skip tests if requested.
+        //xxx
         
+        //makeDojoJs.js
+        //xxx
         
-        
+        //Run xdgen if an xdomain build.
+        //xxx
 }
-//*** End release ***
+//********* End _releasePrefixPath *********
+

util/trunk/buildscripts/jslib/buildUtil.js

@@ -296 +296 @@
         //Find prefixes that are used.
         var usedPrefixes = ["dojo"];
-        xxx
-        
+        usePrefixes._entries { dojo: true };
+        
+        //Check normal dependencies.
+        buildUtil.addPrefixesFromDependencies(usedPrefixes, dependencies);
+
+        //Check layer dependencies
+        var layerDeps = dependencies.layers;
+        for(var i = 0; i < layerDeps.length; i++){
+                buildUtil.addPrefixesFromDependencies(usedPrefixes, layerDeps[i].dependencies);
+        }
+
+        //Now add to the real prefix array.
+        //If not already in the prefix array, assume the default
+        //location, as a sibling to dojo (and util).
+        for(var i = 0; i < usedPrefixes.length; i++){
+                if(!buildUtil.isValueInArray(usedPrefixes[i], dependencies.prefixes){
+                        dependencies.prefixes.push([usedPrefixes[i], "../../" + usedPrefixes[i]]);
+                }
+        }
+
         return {
                 dependencies: dependencies,
                 hostenvType: hostenvType
         };
+}
+
+buildUtil.addPrefixesFromDependencies = function(/*Array*/prefixStore, /*Array*/dependencies){
+        //summary: finds the top level prefixes in the build process that
+        //we need to track for the build process. 
+        for(var i = 0; i < dependencies.length; i++){
+                var topPrefix = dependencies[i].split(".")[0];
+                if(!prefixStore._entries[topPrefix]){
+                        prefixStore.push(topPrefix);
+                        prefixStore._entries[topPrefix] = true;
+                }
+        }
 }
 
@@ -873 +903 @@
         var result = {};
         for(var i = 0; i < ary.length; i++){
-                var parts = ary[i].split("=");
-                if(parts.length != 2){
+                var separatorIndex = ary[i].indexOf("=");
+                if(separatorIndex == -1){
                         throw "Malformed name/value pair: [" + ary[i] + "]. Format should be name=value";
                 }
-                result[parts[0]] = parts[1];
+                result[ary[i].substring(0, separatorIndex)] = ary[i].substring(separatorIndex + 1, ary[i].length);
         }
         return result; //Object