Changeset 7775

Timestamp:

03/23/07 19:21:50 (20 months ago)

Author:

jburke

Message:

Refs #2607. Got something to actually build. No compression, i18n flattening or xdomain, but you can build base, and run the test harness afterward.

Location:

util/trunk/buildscripts

Files:

• build.js (modified) (5 diffs)
• jslib/buildUtil.js (modified) (14 diffs)
• jslib/fileUtil.js (modified) (2 diffs)
• jslib/logger.js (modified) (4 diffs)

util/trunk/buildscripts/build.js

@@ -27 +27 @@
 var action = kwArgs.action;
 for(var i = 0; i < action.length; i ++){
+        logger.logPrefix = action[i] + ": ";
         this[action[i]]();
+        logger.logPrefix = "";
 }
 
@@ -33 +35 @@
 //********* Start clean ************
 function clean(){
+        logger.info("Deleting: " + kwArgs.releaseDir);
         fileUtil.deleteFile(kwArgs.releaseDir);
 }
@@ -50 +53 @@
         var prefixes = dependencies.prefixes;
         var dojoPrefixPath = null;
-        
+        var lineSeparator = fileUtil.getLineSeparator();
+
         //Copy each prefix dir to the releases and
         //operate on that copy.
@@ -67 +71 @@
         //Now process Dojo core. Special things for that one.
         if(dojoPrefixPath){
-                //xxx
+                 _prefixPathRelease("dojo", dojoPrefixPath, kwArgs);
                 
+                //FIXME: loadDependency list reparses profile file, but we've already done that.
+                var result = buildUtil.makeDojoJs(buildUtil.loadDependencyList(kwArgs.profileFile), kwArgs.version);
+
+                //Save the dojo.js contents. It is always the first result.
+                fileUtil.saveFile(kwArgs.releaseDir + "/dojo/dojo.js", result[0].contents);
+
+                //Save the other layers, if there are any.
+                for(var i = 1; i < result.length; i++){
+                        fileUtil.saveFile(kwArgs.releaseDir + "/dojo/" + result[i].layerName, result[i].contents);
+                }
+
+                //Save the dependency list to build.txt
+                var buildText = "Files baked into this build:" + lineSeparator;
+                for(var i = 0; i < result.length; i++){
+                        buildText += lineSeparator + result[i].layerName + ":" + lineSeparator;
+                        buildText += result[i].depList.join(lineSeparator) + lineSeparator;
+                }
+
+                fileUtil.saveFile(kwArgs.releaseDir + "/dojo/build.txt", buildText);
+
+                logger.info(buildText);
+
+
                 //-flatten-resources
                 //              <replaceregexp match="/\*\*\*BUILD:localesGenerated\*\*\*/" byline="false" replace="=${generatedLocales}"
@@ -89 +116 @@
         
         //Use the copyRegExp to filter out tests if requested.
-        if(kwArgs.copyTests){
-                copyRegExp = new RegExp(prefixName.replace(/\\/g, "/") + "/(?!tests/)");
+        if(!kwArgs.copyTests){
+                copyRegExp = new RegExp(prefixName.replace(/\\/g, "/") + "/(?!tests)");
         }
 

util/trunk/buildscripts/jslib/buildUtil.js

@@ -10 +10 @@
         if(!isWebBuild){
                 djConfig = {
-                        baseRelativePath: "../"
+                        baseRelativePath: "../../dojo/"
                         // isDebug: true
                 };
@@ -32 +32 @@
         }
 
-        if(!isWebBuild){
-                dj_global = {};
-                
-                load("../src/bootstrap1.js");
-                load("../src/loader.js");
-                load("../src/hostenv_rhino.js");
-        
-                // FIXME: is this really what we want to say?
-                dojo.render.html.capable = true;
-        }
-
-        dojo.hostenv.loadedUris.push("dojoGuardStart.js");
-        dojo.hostenv.loadedUris.push("../src/bootstrap1.js");
+        if(!isWebBuild){                
+                load("../../dojo/_base/_loader/bootstrap.js");
+                load("../../dojo/_base/_loader/loader.js");
+                load("../../dojo/_base/_loader/hostenv_rhino.js");
+                dojo._currentContext = {};
+        }
+
+        dojo._loadedUrls.push("jslib/dojoGuardStart.js");
+        dojo._loadedUrls.push("../../dojo/_base/_loader/bootstrap.js");
         
         if(dojoLoader == "default"){
-                dojo.hostenv.loadedUris.push("../src/loader.js");
+                dojo._loadedUrls.push("../../dojo/_base/_loader/loader.js");
         }else if(dojoLoader=="xdomain"){
-                dojo.hostenv.loadedUris.push("../src/loader.js");
-                dojo.hostenv.loadedUris.push("../src/loader_xd.js");
-        }
-        dojo.hostenv.loadedUris.push("dojoGuardEnd.js");
+                dojo._loadedUrls.push("../../dojo/_base/_loader/loader.js");
+                dojo._loadedUrls.push("../../dojo/_base/_loader/loader_xd.js");
+        }
+        dojo._loadedUrls.push("jslib/dojoGuardEnd.js");
         
         if(!hostenvType){
@@ -60 +56 @@
         if(hostenvType.constructor == Array){
                 for(var x=0; x<hostenvType.length; x++){
-                        dojo.hostenv.loadedUris.push("../src/hostenv_"+hostenvType[x]+".js");
+                        dojo._loadedUrls.push("../../dojo/_base/_loader/hostenv_"+hostenvType[x]+".js");
                 }
                 hostenvType = hostenvType.pop();
         }else{
-                dojo.hostenv.loadedUris.push("../src/hostenv_"+hostenvType+".js");
+                dojo._loadedUrls.push("../../dojo/_base/_loader/hostenv_"+hostenvType+".js");
         }
         
@@ -74 +70 @@
         }
         
-        dojo.hostenv.name_ = hostenvType;
+        dojo._name = hostenvType;
         
         //Override dojo.provide to get a list of resource providers.
@@ -96 +92 @@
         }
         
-        // over-write dj_eval to prevent actual loading of subsequent files
-        var old_eval = dj_eval;
-        dj_eval = function(){ return true; }
+        // over-write dojo.eval to prevent actual loading of subsequent files
+        dojo._oldEval = dojo["eval"];
+        dojo["eval"] = function(){ return true; }
         var old_load = load;
         load = function(uri){
                 try{
-                        var text = removeComments((isWebBuild ? dojo.hostenv.getText(uri) : readText(uri)));
-                        var requires = dojo.hostenv.getRequiresAndProvides(text);
+                        var text = removeComments((isWebBuild ? dojo._getText(uri) : readText(uri)));
+                        var requires = dojo._getRequiresAndProvides(text);
                         eval(requires.join(";"));
-                        dojo.hostenv.loadedUris.push(uri);
-                        dojo.hostenv.loadedUris[uri] = true;
-                        var delayRequires = dojo.hostenv.getDelayRequiresAndProvides(text);
+                        dojo._loadedUrls.push(uri);
+                        dojo._loadedUrls[uri] = true;
+                        var delayRequires = dojo._getDelayRequiresAndProvides(text);
                         eval(delayRequires.join(";"));
                 }catch(e){
@@ -121 +117 @@
         
         if(isWebBuild){
-                dojo.hostenv.oldLoadUri = dojo.hostenv.loadUri;
-                dojo.hostenv.loadUri = load;
-        }
-        
-        dojo.hostenv.getRequiresAndProvides = function(contents){
+                dojo._oldLoadUri = dojo._loadUri;
+                dojo._loadUri = load;
+        }
+        
+        dojo._getRequiresAndProvides = function(contents){
                 // FIXME: should probably memoize this!
                 if(!contents){ return []; }
@@ -133 +129 @@
                 var tmp;
                 RegExp.lastIndex = 0;
-                var testExp = /dojo.(hostenv.loadModule|hostenv.require|require|kwCompoundRequire|hostenv.conditionalLoadModule|hostenv.startPackage|provide)\([\w\W]*?\)/mg;
+                var testExp = /dojo.(require|platformRequire|provide)\([\w\W]*?\)/mg;
                 while((tmp = testExp.exec(contents)) != null){
                         deps.push(tmp[0]);
@@ -140 +136 @@
         }
         
-        dojo.hostenv.getDelayRequiresAndProvides = function(contents){
+        dojo._getDelayRequiresAndProvides = function(contents){
                 // FIXME: should probably memoize this!
                 if(!contents){ return []; }
@@ -213 +209 @@
 
         if(isWebBuild){
-                dojo.hostenv.loadUri = dojo.hostenv.oldLoadUri;
+                dojo._loadUri = dojo._oldLoadUri;
         }else{
                 load = old_load; // restore the original load function
-                dj_eval = old_eval; // restore the original dj_eval function
-
-                dj_global['dojo'] = undefined;
-                dj_global['djConfig'] = undefined;
-                delete dj_global;
+                dojo["eval"] = dojo._oldEval; // restore the original dojo.eval function
+
+                var djGlobal = dojo._currentContext;
+                djGlobal['djConfig'] = undefined;
+
+                delete dojo;
         }
 
@@ -231 +228 @@
                 try{
                         var dep = dependencies[x];
-                        if(dep.indexOf("(") != -1){
-                                dep = dojo.hostenv.getDepsForEval(dep)[0];
-                        }
+
                         //Don't process loader_xd.js since it has some regexps 
                         //and mentions of dojo.require/provide, which will cause 
-                        //havoc in the dojo.hostenv.loadModule() method.
+                        //havoc in the dojo._loadModule() method.
                         if(dep.indexOf("loader_xd.js") == -1){
-                                dojo.hostenv.loadModule(dep, null, true);
+                                dojo._loadModule(dep, null, true);
                         }
                 }catch(e){
@@ -248 +243 @@
         var depList = [];
         var seen = {};
-        uris: for(var x=0; x<dojo.hostenv.loadedUris.length; x++){
-                var curi = dojo.hostenv.loadedUris[x];
+        uris: for(var x=0; x<dojo._loadedUrls.length; x++){
+                var curi = dojo._loadedUrls[x];
                 if(!seen[curi]){
                         seen[curi] = true;
@@ -274 +269 @@
         
         //Clear out the loadedUris for the next run. 
-        dojo.hostenv.loadedUris = []; 
+        dojo._loadedUrls = []; 
         return depList; 
 }
@@ -361 +356 @@
         // dojo.requireLocalization is a special case as it pulls in dojo.i18n.loader at runtime
         if(dojoContents.match(buildUtil.globalRequireLocalizationRegExp)){
-                depList.push("../src/i18n/loader.js");
+                //FIXME: Uncomment this line with i18n gets ported to 0.9
+                //depList.push("../src/i18n/loader.js");
                 dojoContents += new String(fileUtil.readFile(depList[depList.length-1]));
         }
@@ -508 +504 @@
 
 //The regular expressions that will help find dependencies in the file contents.
-buildUtil.masterDependencyRegExpString = "dojo.(requireLocalization|require|requireIf|requireAll|provide|requireAfterIf|requireAfter|kwCompoundRequire|conditionalRequire|hostenv\\.conditionalLoadModule|.hostenv\\.loadModule|hostenv\\.moduleLoaded)\\(([\\w\\W]*?)\\)";
+buildUtil.masterDependencyRegExpString = "dojo.(requireLocalization|require|requireIf|provide|requireAfterIf|requireAfter|platformRequire)\\(([\\w\\W]*?)\\)";
 buildUtil.globalDependencyRegExp = new RegExp(buildUtil.masterDependencyRegExpString, "mg");
 buildUtil.dependencyPartsRegExp = new RegExp(buildUtil.masterDependencyRegExpString);

util/trunk/buildscripts/jslib/fileUtil.js

@@ -55 +55 @@
                 var destFileName = srcFileName.replace(srcDir, destDir);
 
-                logger.trace("Src filename: " + srcFileName);
-                logger.trace("Dest filename: " + destFileName);
+                //logger.trace("Src filename: " + srcFileName);
+                //logger.trace("Dest filename: " + destFileName);
 
                 //Make sure destination dir exists.
@@ -118 +118 @@
 }
 
-fileUtil.deleteFile = function(fileName){
-        //summary: deletes a file if it exists.
+fileUtil.deleteFile = function(/*String*/fileName){
+        //summary: deletes a file or directory if it exists.
         var file = new java.io.File(fileName);
         if(file.exists()){
+                if(file.isDirectory()){
+                        var files = file.listFiles();
+                        for(var i = 0; i < files.length; i++){
+                                this.deleteFile(files[i]);
+                        }
+                }
                 file["delete"]();
         }

util/trunk/buildscripts/jslib/logger.js

@@ -8 +8 @@
 
         trace: function(message){
-                if(this.level >= this.TRACE){
+                if(this.level <= this.TRACE){
                         this._print(message);
                 }
@@ -14 +14 @@
 
         info: function(message){
-                if(this.level >= this.INFO){
+                if(this.level <= this.INFO){
                         this._print(message);
                 }
@@ -20 +20 @@
 
         warn: function(message){
-                if(this.level >= this.WARN){
+                if(this.level <= this.WARN){
                         this._print(message);
                 }
@@ -26 +26 @@
 
         error: function(message){
-                if(this.level >= this.ERROR){
+                if(this.level <= this.ERROR){
                         this._print(message);
                 }