Changeset 7450

Timestamp:

02/25/07 22:46:42 (21 months ago)

Author:

jburke

Message:

References #2366. Have something primitive working for the build cache. Still need to do more testing, and something is weird with compression -- failure in makeDojoJsWeb.js when trying to make it.

Location:

branches/0.4/buildscripts

Files:

• makeDojoJsWeb.js (modified) (3 diffs)
• webbuild.php (modified) (2 diffs)
• webbuild/index.html (modified) (3 diffs)

branches/0.4/buildscripts/makeDojoJsWeb.js

@@ -4 +4 @@
 load("buildUtilXd.js");
 
-var depList = new String(arguments[0]);
-var provideList = new String(arguments[1]);
-var version = new String(arguments[2]);
-var xdDojoUrl = new String(arguments[3]);
-var doCompression = new String(arguments[4]);
+var result = "ERROR";
 
-if(typeof(doCompression) != "undefined" && doCompression == "true"){
-        doCompression = true;
-}else{
-        doCompression = false;
-}
+var buildDirectory = new String(arguments[0]);
+var depList = new String(arguments[1]);
+var provideList = new String(arguments[2]);
+var version = new String(arguments[3]);
+var xdDojoUrl = new String(arguments[4]);
 
 depList = depList.split(",");
@@ -52 +48 @@
         load('../dojo.js');
         dojo.require("dojo.string.extras");
-        
-        var contents = "";
+        dojo.require("dojo.crypto.MD5");
+
+        var buildSigDir = dojo.crypto.MD5.compute(dependencyResult.depList.sort().join(","), dojo.crypto.outputTypes.Hex);
         try{
-                contents = buildUtil.makeDojoJs(dependencyResult, version).dojoContents;
+                var contents = buildUtil.makeDojoJs(dependencyResult, version).dojoContents;
+                var compressedContents = "";
                 var prefixes = [["dojo", "src"]];
         
@@ -73 +71 @@
                 }
 
-                //Compress code, if desired.
-                if(doCompression){
-                        contents = buildUtil.optimizeJs("dojo.js", contents, "", doCompression);
-                }
+                //Compress code.
+                compressedContents = buildUtil.optimizeJs("dojo.js", contents, "", true);
 
                 //Add copyright
-                contents = new String(buildUtil.readFile("copyright.txt"))
-                        + new String(buildUtil.readFile("build_notice.txt"))
-                        + contents;
+                var copyright = new String(buildUtil.readFile("copyright.txt"));
+                var buildNotice = new String(buildUtil.readFile("build_notice.txt"));
+                contents = copyright + buildNotice + contents;
+                compressedContents = copyright + buildNotice + compressedContents;
+                
+                //Prep cache location
+                var buildCachePath = buildDirectory + "/" + buildSigDir + "/";
+
+                //Create needed directories for cache location.
+                var dirFile = new java.io.File(buildCachePath + "compressed");
+                var dirsOk = dirFile.mkdirs();
+
+                result = "dirFile: " + dirFile.getAbsolutePath() + ", dirsOK: " + dirsOk;
+                
+                //Save files to disk
+                buildUtil.saveUtf8File(buildCachePath + "dojo.js", contents);
+                buildUtil.saveUtf8File(buildCachePath + "compressed/dojo.js", compressedContents);
+                
+                result = "OK";
         }catch(e){
-                contents = "dojo.js build error: " + e; 
+                result += "ERROR: " + e;        
         }
 
-        print(contents);
+        print(result);
 }

branches/0.4/buildscripts/webbuild.php

@@ -1 +1 @@
 <?
         $buildScriptsDir = "/Users/jrbsilver/svn/dojo/branches/0.4/buildscripts";
+        $buildCacheDir = "/Users/jrbsilver/svn/dojo/branches/0.4/buildscripts/webbuild/webbuildtemp/0.4.2rc1/web/buildscripts";
         $depList = isset($_POST['depList']) ? $_POST['depList'] : null;
         $provideList = isset($_POST['provideList']) ? $_POST['provideList'] : 'null';
         $version = isset($_POST['version']) ? $_POST['version'] : '0.0.0dev';
         $xdDojoUrl = isset($_POST['xdDojoUrl']) ? $_POST['xdDojoUrl'] : '';
-        $doCompression = isset($_POST['doCompression']) ? $_POST['doCompression'] : 'false';
 
         if(!isset($depList)){
@@ -17 +17 @@
                 header("Content-disposition: attachment; filename=dojo.js");
                 
-                $dojoContents = `/usr/bin/java -jar $buildScriptsDir/lib/custom_rhino.jar $buildScriptsDir/makeDojoJsWeb.js $depList $provideList $version $xdDojoUrl $doCompression`;
+                $dojoContents = `/usr/bin/java -jar $buildScriptsDir/lib/custom_rhino.jar $buildScriptsDir/makeDojoJsWeb.js $buildCacheDir/dojobuilds $depList $provideList $version $xdDojoUrl`;
 
                 print($dojoContents);

branches/0.4/buildscripts/webbuild/index.html

@@ -113 +113 @@
         dojo.require("dojo.widget.TreeEmphasizeOnSelect");
         dojo.require("dojo.html.iframe");
+        dojo.require("dojo.crypto.MD5");
+        dojo.require("dojo.string.extras");
 
         //assign output node on load.
@@ -124 +126 @@
         }
         
+        function getCachedBuildUrl(depList){
+                var doCompression = document.masterForm.doCompression[1].checked ? true : false;
+                var sortedFileList = depList.sort().join(",");
+                var buildKey = dojo.crypto.MD5.compute(sortedFileList, dojo.crypto.outputTypes.Hex);
+                return "dojobuilds/" + buildKey + (doCompression ? "/compressed" : "") + "/dojo.js";
+        }
+
         function sendDependencyResultToServer(dependencyResult){
                 clearOutput();
 
+                //Find out if the build result is already on the server.
+                var cachedBuildUrl = getCachedBuildUrl(dependencyResult.depList);
+                dojo.io.bind({
+                        //Add an URL marker for the server to know if this is an existence query.
+                        //Mostly helpful in the Safari 2.0 case where it doesn't support HEAD
+                        //requests. This marker should be used to filter server logs when trying to find
+                        //download counts.
+                        url: cachedBuildUrl + "?query=exist",
+                        method: "HEAD",
+                        mimetype: "text/plain",
+                        handle: function(type, data, xhr, kwArgs){
+                                var httpStatus = parseInt(xhr.status, 10);
+                                if(httpStatus >= 400){
+                                        //Build does not exist. Ask server to make it.
+                                        requestServerBuild(dependencyResult);
+                                }else{
+                                        outputBuildResults(dependencyResult);
+                                        window.location = "../" + cachedBuildUrl;
+                                }
+                        }
+                });
+        }
+
+        function requestServerBuild(dependencyResult){
                 var depListForm = document.depListForm;
-                depListForm.action = "../webbuild.php";
-                depListForm.depList.value = dependencyResult.depList.join(",");
-                depListForm.provideList.value = dependencyResult.provideList && dependencyResult.provideList.length > 0 ? dependencyResult.provideList.join(",") : "null";
-                depListForm.version.value = version;
-                depListForm.xdDojoUrl.value = xdDojoUrl;
-                depListForm.doCompression.value = document.masterForm.doCompression[1].checked ? true : false;
-
+                
+                //Ask the server to build the result.
+                dojo.io.bind({
+                        url: "../webbuild.php",
+                        method: "POST",
+                        mimetype: "text/plain",
+                        content: {
+                                depList: dependencyResult.depList.join(","),
+                                provideList: (dependencyResult.provideList && dependencyResult.provideList.length > 0) ? dependencyResult.provideList.join(",") : "null",
+                                version: version,
+                                xdDojoUrl: xdDojoUrl
+                        },
+                        handle: function(type, data, xhr, kwArgs){
+                                if(type == "load" && dojo.string.trim(data).indexOf("OK") == 0){
+                                        outputBuildResults(dependencyResult);
+                                        window.location = "../" + getCachedBuildUrl(dependencyResult.depList);
+                                }else{
+                                        alert("Build " + type + " [" + data + "]");
+                                }
+                        }
+                });
+
+        }
+
+        function outputBuildResults(dependencyResult){
                 //reset the hidden frame so we can do another build.
                 setTimeout(function(){
@@ -155 +206 @@
                         }
                 }
-
-                //Submit form to generate custom dojo.js file.
-                depListForm.submit();
         }