Changeset 7075

Timestamp:

01/24/07 14:45:11 (19 months ago)

Author:

jburke

Message:

(merge from trunk). References #2366. web build plumbing. Not quite there. The end result is showing a textarea with the dojo contents. Need to send to CGI to trigger file download. Too bad.

Location:

branches/0.4/buildscripts

Files:

• buildUtil.js (modified) (8 diffs)
• buildUtilXd.js (modified) (1 diff)
• makeDojoJs.js (modified) (1 diff)
• webbuild (copied) (copied from trunk/buildscripts/webbuild)
• webbuild.html (copied) (copied from trunk/buildscripts/webbuild.html)

branches/0.4/buildscripts/buildUtil.js

@@ -1 +1 @@
 var buildUtil = {};
-buildUtil.getDependencyList = function(dependencies, hostenvType) {
-        djConfig = {
-                baseRelativePath: "../"
-                // isDebug: true
-        };
-        
+
+buildUtil.getLineSeparator = function(){
+        //summary: Gives the line separator for the platform.
+        //For web builds override this function.
+        return java.lang.System.getProperty("line.separator");
+}
+
+buildUtil.getDojoLoader = function(/*Object?*/dependencies){
+        //summary: gets the type of Dojo loader for the build. For example default or
+        //xdomain loading. Override for web builds.
+        return (dependencies && dependencies["loader"] ? dependencies["loader"] : java.lang.System.getProperty("DOJO_LOADER"));
+}
+
+buildUtil.getDependencyList = function(/*Object*/dependencies, /*String or Array*/hostenvType, /*boolean?*/isWebBuild){
+        if(!isWebBuild){
+                djConfig = {
+                        baseRelativePath: "../"
+                        // isDebug: true
+                };
+        }
+
         if(!dependencies){
                 dependencies = [ 
@@ -17 +32 @@
                 ];
         }
-        
-        var dojoLoader = java.lang.System.getProperty("DOJO_LOADER");
+
+        var dojoLoader = buildUtil.getDojoLoader(dependencies);
         if(!dojoLoader || dojoLoader=="null" || dojoLoader==""){
                 dojoLoader = "default";
         }
-        dj_global = {};
-        
-        load("../src/bootstrap1.js");
-        load("../src/loader.js");
-        load("../src/hostenv_rhino.js");
-        load("../src/bootstrap2.js");
-
-        // FIXME: is this really what we want to say?
-        dojo.render.html.capable = true;
-        
+
+        if(!isWebBuild){
+                dj_global = {};
+                
+                load("../src/bootstrap1.js");
+                load("../src/loader.js");
+                load("../src/hostenv_rhino.js");
+                load("../src/bootstrap2.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");
@@ -93 +111 @@
         load = function(uri){
                 try{
-                        var text = removeComments(readText(uri));
+                        var text = removeComments((isWebBuild ? dojo.hostenv.getText(uri) : readText(uri)));
                         var requires = dojo.hostenv.getRequiresAndProvides(text);
                         eval(requires.join(";"));
@@ -100 +118 @@
                         var delayRequires = dojo.hostenv.getDelayRequiresAndProvides(text);
                         eval(delayRequires.join(";"));
-                }catch(e){ 
-                        java.lang.System.err.println("error loading uri: " + uri + ", exception: " + e);
-                        quit(-1);
+                }catch(e){
+                        if(isWebBuild){
+                                dojo.debug("error loading uri: " + uri + ", exception: " + e);
+                        }else{
+                                java.lang.System.err.println("error loading uri: " + uri + ", exception: " + e);
+                                quit(-1);
+                        }
                 }
                 return true;
+        }
+        
+        if(isWebBuild){
+                dojo.hostenv.oldLoadUri = dojo.hostenv.loadUri;
+                dojo.hostenv.loadUri = load;
         }
         
@@ -194 +221 @@
         }
         
-        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;
-                
+        if(isWebBuild){
+                dojo.hostenv.loadUri = dojo.hostenv.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;
+        }
+
         return {
                 depList: depList,
@@ -224 +255 @@
 }
 
-buildUtil.makeDojoJs = function(/*String*/profileFile, /*String*/version){
-        //summary: Makes the uncompressed contents for dojo.js.
-
-        //Get the profileFile text.
-        var lineSeparator = java.lang.System.getProperty("line.separator");
-        
-        //Remove the call to getDependencyList.js because we want to call it manually.
-        var depLists = buildUtil.loadDependencyList(profileFile);
-        var depList = depLists.depList;
+buildUtil.makeDojoJs = function(/*Object*/dependencyResult, /*String*/version){
+        //summary: Makes the uncompressed contents for dojo.js using the object
+        //returned from buildUtil.getDependencyList()
+
+        var lineSeparator = buildUtil.getLineSeparator();
+        var depList = dependencyResult.depList;
 
         //Concat the files together, and mark where we should insert all the
@@ -250 +278 @@
         //Sort the provide list alphabetically to make it easy to read. Order of provide statements
         //do not matter.
-        var provideList = depLists.provideList.sort(); 
+        var provideList = dependencyResult.provideList.sort(); 
         var depRegExpString = "";
         for(var i = 0; i < provideList.length; i++){
@@ -437 +465 @@
         
         //Get the generated, flattened bundle.
-        var module = dojo.evalObjPath(moduleName);
+        var module = dojo.getObject(moduleName);
         var bundleLocale = localeName ? localeName.replace(/-/g, "_") : "ROOT";
         var flattenedBundle = module.nls[bundleName][bundleLocale];

branches/0.4/buildscripts/buildUtilXd.js

@@ +1 @@
+//The functions in this file assume that buildUtil.js have been loaded.
 var buildUtilXd = {};
+
+buildUtilXd.setXdDojoConfig = function(/*String*/fileContents, /*String*/url){
+        //summary: sets sets up xdomain loading for a particular URL.
+        //parameters:
+        //              fileContents: be a built dojo.js (can be uncompressed or compressed).
+        //              url: value should include the /src path for the xdomain dojo.
+        //                      Example: "http://some.domain.com/dojo-xdversion/src" (no ending slash)
+        //This function will inject some contents before the dojo.hostenv.resetXd() definition,
+        //so the contents of fileName should have been a dojo.js that includes the contents
+        //of loader_xd.js (specify -DdojoLoader=xdomain in the build command).
+
+        return fileContents.replace(/dojo\.hostenv\.resetXd\s*\=/, "djConfig.useXDomain = true;\ndojo.registerModulePath(\"dojo\", \""
+                + url
+                + "\");\ndojo.hostenv.resetXd=");
+}
 
 //START makeXdContents function

branches/0.4/buildscripts/makeDojoJs.js

@@ -9 +9 @@
 var lineSeparator = java.lang.System.getProperty("line.separator");
 
-var result = buildUtil.makeDojoJs(profileFile, version);
+var result = buildUtil.makeDojoJs(buildUtil.loadDependencyList(profileFile), version);
 
 //Save the dojo.js contents.