Changeset 7175

Show
Ignore:
Timestamp:
02/02/07 22:07:49 (22 months ago)
Author:
jburke
Message:

(Merge from 0.4 branch) References #2366: more webbuild plumbing. Generate a tree of available modules. There is problem with modules that have same name as directory, and the tree isn't hooked up to anything, but it is a start.

Location:
trunk/buildscripts
Files:
2 modified
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/buildscripts/webbuild.html

    r7074 r7175  
    99        <script type="text/javascript"> 
    1010                djConfig = { 
    11                         isDebug: true 
     11                        isDebug: true, 
     12                        baseRelativePath: "../" 
    1213                }; 
    1314        </script> 
    … …  
    1617        <script src="buildUtilXd.js" type="text/javascript"></script> 
    1718        <script src="webbuild/webbuild.js" type="text/javascript"></script> 
     19        <script type="text/javascript"> 
     20                function startBuild(depString, version, xdDojoPath){ 
     21                        //Need a timeout here because otherwise the calling location is from the frame 
     22                        //that calls this page, which messes up our path building for loading files. 
     23                        //(at least in Firefox 2.0) 
     24                        setTimeout(function(){webbuild.build(depString, version, xdDojoPath);}, 100); 
     25                } 
     26        </script> 
    1827</head> 
    1928 
    2029<body> 
    21         <h2>Dojo Builder Prototype</h2> 
    22         <p> 
    23                 (experimental, prototype) 
    24         </p> 
    25         <p> 
    26                 <b>XDomain Dojo path (example: http://some.domain.com/dojo-xdversion/src):</b><br /> 
    27                 <input type="text" id="xdDojoPath" value="" size="30" /> 
    28         </p> 
    29         <p> 
    30                 <b>Modules to include in build (comma-separated list):</b><br /> 
    31                 <textarea id="dependencyList" cols="40" rows="20"> 
    32                 "dojo.io.*", 
    33                 "dojo.io.BrowserIO", 
    34                 "dojo.event.*", 
    35                 "dojo.lfx.*" 
    36                 </textarea> 
    37         </p> 
    38         <p> 
    39                 <button onclick="webbuild.build(dojo.byId('dependencyList').value, '0.4.2dev', dojo.byId('xdDojoPath').value)">Go</button> 
    40         </p> 
     30        Hidden builder content for webbuild/index.html. See that file for the entry 
     31        point into the web build system. This file needs to live in the buildscripts 
     32        directory because of some assumptions in buildUtil.js. 
    4133</body> 
    4234</html> 

  • trunk/buildscripts/webbuild/webbuild.js

    r7074 r7175  
    22//in order for the build scripts to work. 
    33print = function(message){ 
    4         dojo.debug(message); 
     4        parent.output(message); 
    55} 
    66 
    … …  
    4747                dojo.debug("files in the profile:"); 
    4848                for(var i = 0; i < dojoResult.resourceDependencies.length; i++){ 
    49                         dojo.debug(dojoResult.resourceDependencies[i]); 
     49                        print(dojoResult.resourceDependencies[i]); 
    5050                } 
    5151                 
    … …  
    5959                } 
    6060 
     61                parent.dojoContents = webbuild.dojoContents; 
    6162                var outputWindow = window.open("webbuild/dojo.js.html", "dojoOutput"); 
    6263                outputWindow.focus();