Changeset 12119

Timestamp:

01/21/08 20:42:32 (6 months ago)

Author:

jburke

Message:

Refs #4573. Allow for burning in a djConfig for a built version. Still need to convert codebase to dojo.config, but this is a first step. \!strict (redeclaration errors)

Location:

util/trunk/buildscripts

Files:

• build.js (modified) (1 diff)
• jslib/buildUtil.js (modified) (3 diffs)
• jslib/dojoGuardStart.jsfrag (modified) (1 diff)

util/trunk/buildscripts/build.js

@@ -130 +130 @@
                 }
                 nlsIgnoreString += (nlsIgnoreString ? "|" : "") + buildUtil.regExpEscape(nameSegment);
-                
-                
+
+                //Burn in djConfig for dojo.js/xd.js if requested.
+                if(kwArgs.scopeDjConfig && (layerName.match(/dojo\.xd\.js$/) || layerName.match(/dojo\.js$/))){
+                        fileContents = buildUtil.setScopeDjConfig(fileContents, kwArgs.scopeDjConfig);
+                }
+
                 //Burn in scope names for dojo.js/xd.js if requested.
                 if(kwArgs.scopeMap && (layerName.match(/dojo\.xd\.js$/) || layerName.match(/dojo\.js$/))){

util/trunk/buildscripts/jslib/buildUtil.js

@@ -93 +93 @@
                         + "short symbol names to more descriptive names."
         },
+        "scopeDjConfig": {
+                defaultValue: "",
+                helpText: "Burn in a djConfig object into the built dojo.js file. Useful if you are making your own scoped dojo and you want a "
+                        + "djConfig object local to your version that will not be affected by any globally declared djConfig object in the page. "
+                        + "Value must be a string that will look like a javascript object literal once it is placed in the built source. "
+                        + "use Dojo as part of a JS library, but want to make a self-contained library with no external dojo/dijit/dojox. Example "
+                        + "(note that the backslashes below are required to avoid shell escaping if you type this on the command line):\n"
+                        + "scopeDjConfig={isDebug:true,scopeMap:[[\\\"dojo\\\",\\\"mydojo\\\"],[\\\"dijit\\\",\\\"mydijit\\\"][\\\"dojox\\\",\\\"mydojox\\\"]]}"
+        },
         "scopeMap": {
                 defaultValue: "",
@@ -99 +108 @@
                         + "references. Format is a string that contains no spaces, and is similar to the djConfig.scopeMap value (note that the "
                         + "backslashes below are required to avoid shell escaping):\n"
-                        + "scopeMap: [[\\\"dojo\\\",\\\"mydojo\\\"],[\\\"dijit\\\",\\\"mydijit\\\"][\\\"dojox\\\",\\\"mydojox\\\"]]"
+                        + "scopeMap=[[\\\"dojo\\\",\\\"mydojo\\\"],[\\\"dijit\\\",\\\"mydijit\\\"][\\\"dojox\\\",\\\"mydojox\\\"]]"
         },
         "xdScopeArgs": {
@@ -1238 +1247 @@
 }
 
+buildUtil.setScopeDjConfig = function(/*String*/fileContents, /*String*/djConfigString){
+        //summary: burns in a local djConfig for the file contents.
+        //djConfigString should be a string.
+        //Have to use eval to avoid name condensing by shrinksafe.
+        return fileContents.replace(/\/\*\*Build will replace this comment with a scoped djConfig \*\*\//, 'eval("var djConfig = ' + djConfigString.replace(/(['"])/g, '\\$1') + ';");');
+}
+
 buildUtil.setScopeNames = function(/*String*/fileContents, /*String*/scopeMap){
         //summary: burns in the scope names into the file contents.

util/trunk/buildscripts/jslib/dojoGuardStart.jsfrag

@@ -11 +11 @@
         */
 
-        //The null below can be relaced by a build-time value.
+        /**Build will replace this comment with a scoped djConfig **/
+
+        //The null below can be relaced by a build-time value used instead of djConfig.scopeMap.
         var sMap = null;
-        
+
         //See if new scopes need to be defined.
         if((sMap || (typeof djConfig != "undefined" && djConfig.scopeMap)) && (typeof window != "undefined")){