Changeset 10325

Timestamp:

08/21/07 11:47:11 (23 months ago)

Author:

jburke

Message:

Fixes #4246. Allow nested layer files that have flattened i18n bundles.

Location:

util/trunk/buildscripts

Files:

• build.js (modified) (5 diffs)
• jslib/i18nUtil.js (modified) (2 diffs)
• tests (added)
• tests/foo (added)
• tests/foo/page (added)
• tests/foo/page/view.js (added)
• tests/profiles (added)
• tests/profiles/nestedNls.profile.js (added)

util/trunk/buildscripts/build.js

@@ -192 +192 @@
         var defaultLegalText = copyrightText + buildNoticeText;
         var dojoReleaseDir = kwArgs.releaseDir + "/dojo/";
-        var optimizeIgnoreString = "";
+        var layerIgnoreString = "";
+        var nlsIgnoreString = "";
         for(var i = 0; i < result.length; i++){
                 var currentLayer = result[i];
@@ -202 +203 @@
                 //Build up string of files to ignore for the directory optimization step
                 var ignoreName = layerName.replace(/\.\.\//g, "");
-                optimizeIgnoreString += (optimizeIgnoreString ? "|" : "") + buildUtil.regExpEscape(ignoreName) + "$";
-                optimizeIgnoreString += "|" + buildUtil.regExpEscape(ignoreName + ".uncompressed.js") + "$";
+                var nameSegment = ignoreName.replace(/\.js$/, "");
+                layerIgnoreString += (layerIgnoreString ? "|" : "") + buildUtil.regExpEscape(ignoreName);
+                layerIgnoreString += "|" + buildUtil.regExpEscape(ignoreName + ".uncompressed");
+
+                if(nameSegment.indexOf("/") != -1){
+                        nameSegment = nameSegment.substring(nameSegment.lastIndexOf("/") + 1, nameSegment.length);
+                }
+                nlsIgnoreString += (nlsIgnoreString ? "|" : "") + buildUtil.regExpEscape(nameSegment);
                 
                 //Burn in xd path for dojo if requested, and only do this in dojo.xd.js.
@@ -257 +264 @@
         //Run string interning, xd file building, etc.. on the prefix dirs in the
         //release area.
-        var ignoreRegExp = new RegExp("(" + optimizeIgnoreString + ")");
+        var layerIgnoreRegExp = new RegExp("(" + layerIgnoreString + ")\.js$");
+        var nlsIgnoreRegExp = new RegExp("\\/nls\\/(" + nlsIgnoreString + ")_");
         for(var i = 0; i < prefixes.length; i++){
-                _optimizeReleaseDirs(prefixes[i][0], prefixes[i][1], kwArgs, ignoreRegExp);
+                _optimizeReleaseDirs(prefixes[i][0], prefixes[i][1], kwArgs, layerIgnoreRegExp, nlsIgnoreRegExp);
         }
         
@@ -299 +307 @@
         /*String*/prefixPath, 
         /*Object*/kwArgs,
-        /*RegExp*/optimizeIgnoreRegExp){
+        /*RegExp*/layerIgnoreRegExp,
+        /*RegExp*/nlsIgnoreRegExp){     
         //summary: runs intern strings, i18n bundle flattening and xdomain file generation
         //on the files in a release directory, if those options are enabled.
@@ -308 +317 @@
         if(kwArgs.internStrings){
                 logger.info("Interning strings for: " + releasePath);
-                buildUtil.internTemplateStrings(kwArgs.profileProperties.dependencies, releasePath, optimizeIgnoreRegExp);
+                buildUtil.internTemplateStrings(kwArgs.profileProperties.dependencies, releasePath, layerIgnoreRegExp);
         }
 
         //Flatten bundles inside the directory
-        i18nUtil.flattenDirBundles(prefixName, prefixPath, kwArgs);
+        i18nUtil.flattenDirBundles(prefixName, prefixPath, kwArgs, nlsIgnoreRegExp);
 
         if(kwArgs.loader == "xdomain"){
-                buildUtilXd.xdgen(prefixName, prefixPath, prefixes, optimizeIgnoreRegExp);
+                buildUtilXd.xdgen(prefixName, prefixPath, prefixes, layerIgnoreRegExp);
         }
 
         //FIXME: call stripComments. Maybe rename, inline with optimize? need build options too.
         if(kwArgs.optimize){
-                buildUtil.stripComments(releasePath, optimizeIgnoreRegExp, false, kwArgs.optimize);
+                buildUtil.stripComments(releasePath, layerIgnoreRegExp, false, kwArgs.optimize);
         }
         

util/trunk/buildscripts/jslib/i18nUtil.js

@@ -131 +131 @@
 }
 
-i18nUtil.flattenDirBundles = function(/*String*/prefixName, /*String*/prefixDir, /*Object*/kwArgs){
+i18nUtil.flattenDirBundles = function(/*String*/prefixName, /*String*/prefixDir, /*Object*/kwArgs, /*RegExp*/nlsIgnoreRegExp){
         //summary: Flattens the i18n bundles inside a directory so that only request
         //is needed per bundle. Does not handle resource flattening for dojo.js or
@@ -144 +144 @@
                 var fileContents = null;
                 
-                //Files in nls directories (except for the top level one in Dojo that has multiple
-                //bundles flattened) need to have special xd contents.
-                if(jsFileName.match(/\/nls\//) && jsFileName.indexOf(prefixDir + "/nls/") == -1){
+                //Files in nls directories, except for layer bundles that already have been processed.
+                if(jsFileName.match(/\/nls\//) && !jsFileName.match(nlsIgnoreRegExp)){
                         fileContents = "(" + i18nUtil.makeFlatBundleContents(prefixName, prefixDir, jsFileName) + ")";                  
                 }else{