Changeset 12283

Timestamp:

02/04/08 14:37:17 (11 months ago)

Author:

jburke

Message:

Fixes #5688. Specifying resourceName now gets saved in the layer file. No need to specify resourceName in the standard.profile.js since each layer already has a dojo.provide() for that resource name. \!strict

Location:

util/trunk/buildscripts

Files:

• jslib/buildUtil.js (modified) (4 diffs)
• profiles/standard.profile.js (modified) (3 diffs)

util/trunk/buildscripts/jslib/buildUtil.js

@@ -444 +444 @@
                                 result.push({
                                         layerName: layerName,
+                                        resourceName: layer.resourceName,
                                         copyrightFile: layer.copyrightFile,
                                         depList: depList,
@@ -628 +629 @@
 buildUtil.createLayerContents = function(
         /*String*/layerName,
+        /*String*/resourceName,
         /*Array*/depList,
         /*Array*/provideList,
@@ -636 +638 @@
         //Concat the files together, and mark where we should insert all the
         //provide statements.
-        var dojoContents = "";
+        var dojoContents = resourceName ? "dojo.provide(\"" + resourceName + "\");\r\n" : "";
         for(var i = 0; i < depList.length; i++){
                 //Run the file contents through the include/exclude "preprocessor".
@@ -703 +705 @@
         for(var i = 0; i< dependencyResult.length; i++){
                 var layerResult = dependencyResult[i];
-                layerResult.contents = buildUtil.createLayerContents(layerResult.layerName, layerResult.depList, layerResult.provideList, version, kwArgs);
+                layerResult.contents = buildUtil.createLayerContents(layerResult.layerName, layerResult.resourceName, layerResult.depList, layerResult.provideList, version, kwArgs);
         }
 

util/trunk/buildscripts/profiles/standard.profile.js

@@ -3 +3 @@
                 {
                         name: "../dijit/dijit.js",
-                        resourceName: "dijit.dijit",
                         dependencies: [
                                 "dijit.dijit"
@@ -10 +9 @@
                 {
                         name: "../dijit/dijit-all.js",
-                        resourceName: "dijit.dijit-all",
                         layerDependencies: [
                                 "../dijit/dijit.js"
@@ -20 +18 @@
                 {
                         name: "../dojox/off/offline.js",
-                        resourceName: "dojox.off.offline",
                         layerDependencies: [
                         ],