Changeset 7279

Timestamp:

02/09/07 21:29:09 (22 months ago)

Author:

jburke

Message:

(merge from branch) References #2366. Fixed issue with some modules not getting in the list, fixed issue when asking for a build with no modules in it, and now printing out modules/files that are in the build.

Location:

trunk/buildscripts

Files:

• webbuild.php (modified) (1 diff)
• webbuild/index.html (modified) (2 diffs)
• webbuild/webbuild.js (modified) (4 diffs)
• webbuild/webbuild.sh (modified) (2 diffs)

trunk/buildscripts/webbuild.php

@@ -2 +2 @@
         $buildScriptsDir = "/Users/jrbsilver/svn/dojo/branches/0.4/buildscripts";
         $depList = isset($_POST['depList']) ? $_POST['depList'] : null;
-        $provideList = isset($_POST['provideList']) ? $_POST['provideList'] : '';
+        $provideList = isset($_POST['provideList']) ? $_POST['provideList'] : 'null';
         $version = isset($_POST['version']) ? $_POST['version'] : '0.0.0dev';
         $xdDojoUrl = isset($_POST['xdDojoUrl']) ? $_POST['xdDojoUrl'] : '';

trunk/buildscripts/webbuild/index.html

@@ -45 +45 @@
                         depListForm.action = "../webbuild.php";
                         depListForm.depList.value = dependencyResult.depList.join(",");
-                        depListForm.provideList.value = dependencyResult.provideList.join(",");
+                        depListForm.provideList.value = dependencyResult.provideList && dependencyResult.provideList.length > 0 ? dependencyResult.provideList.join(",") : "null";
                         depListForm.version.value = version;
                         depListForm.xdDojoUrl.value = xdDojoUrl;
@@ -54 +54 @@
                         }, 1000);
 
+
+                        //Print out the list of modules included.
+                        dojo.debug("Files included in the build:");
+                        for(var i = 0; i < dependencyResult.depList.length; i++){
+                                output(dependencyResult.depList[i]);
+                        }
+                        dojo.debug("Modules included in the build:");
+                        if(!dependencyResult.provideList || dependencyResult.provideList.length == 0){
+                                dojo.debug("[no modules included in the build]");
+                        }else{
+                                var provideList = dependencyResult.provideList.sort();
+                                for(var i = 0; i < provideList.length; i++){
+                                        output(provideList[i]);
+                                }
+                        }
+
+                        //Submit form to generate custom dojo.js file.
                         depListForm.submit();
                 }

trunk/buildscripts/webbuild/webbuild.js

@@ +1 @@
+//************************************************************************
+//DO NOT dojo.require() any modules in this file or the page that uses this
+//file. It means those modules will be excluded from the build if you do so.
+//************************************************************************
+
+
 //Define some methods that are defined in Rhino, but we need web equivalents
 //in order for the build scripts to work.
@@ -26 +32 @@
 }
 
-dojo.require("dojo.string.extras");
-
 //Define the webbuild object.
 webbuild = {
         build: function(/*String*/depString, /*String*/version, /*String*/xdDojoPath){
-                depString = dojo.string.trim(depString);
+                depString = depString.replace(/^\s*/, "").replace(/\s*$/, "");
                 if(!depString){
                         alert("Please enter some dependencies");
@@ -44 +48 @@
                 
                 if(location.toString().indexOf("file:") == 0){
-                        var dojoResult = buildUtil.makeDojoJs(dependencyResult, version);
-        
-                        //Intern strings, and add license
-                        dojoResult.dojoContents = new String(readFile("copyright.txt")) + buildUtil.interningRegexpMagic("xdomain", dojoResult.dojoContents, djConfig.baseRelativePath, [["dojo", "src"]], []);
-        
-                        //Print out the file list.
-                        dojo.debug("files in the profile:");
-                        for(var i = 0; i < dojoResult.resourceDependencies.length; i++){
-                                print(dojoResult.resourceDependencies[i]);
-                        }
-                        
                         //Return the dojo contents
-                        webbuild.dojoContents = dojoResult.dojoContents;
-        
-                        //See if we should add in xd dojo module path.
-                        xdDojoPath = dojo.string.trim(xdDojoPath);
-                        if(xdDojoPath){
-                                webbuild.dojoContents = buildUtilXd.setXdDojoConfig(webbuild.dojoContents, xdDojoPath);
-                        }
+                        webbuild.dojoContents = "Just a test. Run the build with a web server that runs PHP to get a real build file.";
 
                         var outputWindow = window.open("webbuild/dojo.js.html", "dojoOutput");
                         outputWindow.focus();
-        
-                        //FAILED attempts:
-                        //Using a javascript: url, FF 2.0 wraps the content in some HTML, so not really
-                        //good for file save operations (get HTML in the saved file).
-                        //var outputWindow = window.open("javascript:opener.webbuild.getDojoContents()", "dojoOutput");
-        
-                        //using data: urls seem to add funky text to the beginning of the file, at least in OSX FF 2.0
-                        //Same issue if application/octet-stream is used instead of text/javascript.
-                        //var outputWindow = window.open("data:text/javascript;" + webbuild.dojoContents, "dojoOutput");
                 }else{
                         parent.sendDependencyResultToServer(dependencyResult);
@@ -82 +60 @@
         getDojoContents: function(){
                 return webbuild.dojoContents;
-                        //return "200 OK HTTP/1.0\nContent-type: text/javascript\n"
-                        //      + "Content-Disposition: attachment\n\n"
-                        //      + webbuild.dojoContents;
         }
 }

trunk/buildscripts/webbuild/webbuild.sh

@@ -2 +2 @@
 
 # Define variables used for rest of the script
-version=0.4.2ALPHA
+version=0.4.2ALPHA2
 xdDojoUrl=http://dojotoolkit.org/~jburke/webbuild/$version
 versionSuffix=xdomain
@@ -42 +42 @@
 
 #Generate the list of modules for the web build process.
-cd buildscripts/webbuild
 java -jar ../lib/custom_rhino.jar makeWebBuildModuleList.js ../../src treeData.js
 cd ../../..
 
 #Now in release folder. Bundle it all up.
-zip -r dojo-$version.zip $version/* web/*
+mv web/ $version/
+zip -r dojo-$version.zip $version/*
 mv dojo-$version.zip ../..