Changeset 12269

Timestamp:

02/03/08 17:12:29 (11 months ago)

Author:

jburke

Message:

Fixes #5182. Run processConditionals before dependency mapping. Allows ability to exclude dojo.require statements. \!strict

Location:

util/trunk/buildscripts

Files:

• build.js (modified) (1 diff)
• jslib/buildUtil.js (modified) (3 diffs)
• webbuild/helma/apps/builder/Root/main.hac (modified) (1 diff)

util/trunk/buildscripts/build.js

@@ -106 +106 @@
 
         logger.trace("Building dojo.js and layer files");
-        var result = buildUtil.makeDojoJs(buildUtil.loadDependencyList(kwArgs.profileProperties), kwArgs.version, kwArgs);
+        var result = buildUtil.makeDojoJs(buildUtil.loadDependencyList(kwArgs.profileProperties, kwArgs), kwArgs.version, kwArgs);
 
         //Save the build layers. The first layer is dojo.js.

util/trunk/buildscripts/jslib/buildUtil.js

@@ -215 +215 @@
 }
 
-buildUtil.getDependencyList = function(/*Object*/dependencies, /*String or Array*/hostenvType, /*String?*/buildscriptsPath){
+buildUtil.getDependencyList = function(/*Object*/dependencies, /*String or Array*/hostenvType, /*Object?*/kwArgs, /*String?*/buildscriptsPath){
         //summary: Main function that traces the files that are needed for a give list of dependencies.
 
@@ -335 +335 @@
                         load = function(uri){
                                 try{
-                                        var text = buildUtil.removeComments(fileUtil.readFile(uri));
+                                        //Strip comments and pply conditional directives before tracing the dependencies.
+                                        var text = fileUtil.readFile(uri);
+                                        var text = (kwArgs ? buildUtil.processConditionals(layerName, text, kwArgs) : text);
+                                        var text = buildUtil.removeComments(text);
+
                                         var requires = dojo._getRequiresAndProvides(text);
                                         eval(requires.join(";"));
@@ -612 +616 @@
 }
 
-buildUtil.loadDependencyList = function(/*Object*/profile, /*String?*/buildscriptsPath){
+buildUtil.loadDependencyList = function(/*Object*/profile, /*Object?*/kwArgs, /*String?*/buildscriptsPath){
         //summary: Traverses the dependencies in the profile object.
         //profile:
         //              The profile object that is a result of a buildUtil.evalProfile() call.
-        var depResult = buildUtil.getDependencyList(profile.dependencies, profile.hostenvType, buildscriptsPath);
+        var depResult = buildUtil.getDependencyList(profile.dependencies, profile.hostenvType, kwArgs, buildscriptsPath);
         depResult.dependencies = profile.dependencies;
         

util/trunk/buildscripts/webbuild/helma/apps/builder/Root/main.hac

@@ -73 +73 @@
 
 //Build the layer contents.
-var depResult = buildUtil.makeDojoJs(buildUtil.loadDependencyList(kwArgs.profileProperties, buildscriptDir), kwArgs.version, kwArgs);
+var depResult = buildUtil.makeDojoJs(buildUtil.loadDependencyList(kwArgs.profileProperties, null, buildscriptDir), kwArgs.version, kwArgs);
 
 //Grab the content from the "dojo.xd.js" layer.