Changeset 7396

Timestamp:

02/21/07 17:12:31 (21 months ago)

Author:

jburke

Message:

References #2366. Fixes issue where moving all dojo.provide statements to the top caused problems. The important thing is the matching dojo.require() removal (which is still done)

Files:

• branches/0.4/buildscripts/buildUtil.js (modified) (2 diffs)

branches/0.4/buildscripts/buildUtil.js

@@ -262 +262 @@
         //provide statements.
         var dojoContents = "";
-        var insertedProvideMarker = false;
         for(var i = 0; i < depList.length; i++){
                 //Make sure we have a JS string and not a Java string by using new String().
                 dojoContents += new String(readFile(depList[i])) + "\r\n";
-                if(!insertedProvideMarker && depList[i].indexOf("hostenv_") != -1){
-                        dojoContents += "__DOJO_PROVIDE_INSERTION__";
-                        insertedProvideMarker = true;
-                }
-        }
-        
-        //Move all the dojo.provide calls to the top, and remove any matching dojo.require calls.
-        //Sort the provide list alphabetically to make it easy to read. Order of provide statements
-        //do not matter.
+        }
+        
+        //Construct a string of all the dojo.provide statements.
+        //This string will be used to construct the regexp that will be
+        //used to remove matching dojo.require statements.
+        //Sort the provide list alphabetically to make it easy to read.
+        //Order of provide statements do not matter.
         var provideList = dependencyResult.provideList.sort(); 
         var depRegExpString = "";
@@ -286 +283 @@
         //If we have a string for a regexp, do the dojo.require() removal now.
         if(depRegExpString){
-                var depRegExp = new RegExp("dojo\\.(provide|require)\\((" + depRegExpString + ")\\)(;?)", "g");
+                var depRegExp = new RegExp("dojo\\.(require)\\((" + depRegExpString + ")\\)(;?)", "g");
                 dojoContents = dojoContents.replace(depRegExp, "");
         }
-
-        //Insert all the provide statements at the provide insertion marker.
-        var provideString = "";
-        if(provideList && provideList.length > 0){
-                for(var i = 0; i < provideList.length; i++){
-                        provideString += 'dojo.provide("' + provideList[i] + '");' + lineSeparator;
-                }
-        }
-        dojoContents = dojoContents.replace(/__DOJO_PROVIDE_INSERTION__/, provideString);
 
         //Set version number.