Changeset 7449

Timestamp:

02/25/07 14:03:31 (21 months ago)

Author:

jburke

Message:

(merge from 0.4 branch) References #2366. Added a compress option to the web build.

Location:

trunk/buildscripts

Files:

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

trunk/buildscripts/buildUtil.js

@@ -405 +405 @@
         fileContents = String(fileContents);
         
-        var modifiedContents = null;
+        var modifiedContents = fileContents;
         
         if(fileContents.match(buildUtil.globalRequireLocalizationRegExp)){
@@ -858 +858 @@
 }
 
+buildUtil.optimizeJs = function(/*String fileName*/fileName, /*String*/fileContents, /*String*/copyright, /*boolean*/doCompression){
+        //summary: either strips comments from string or compresses it.
+
+        //Look for copyright. If so, maintain it.
+        //If no copyright text passed in, assume want a really stripped
+        //version.
+        copyright = copyright || "";
+        var copyrightText = "";
+        if(copyright){
+                var singleLineMatches = fileContents.match(/\/\/.*copyright.*$/gi);
+                
+                //Get rid of cr, lf, since it messes up matching.
+                var copyrightFileContents = fileContents.replace(/\r/g, "__DOJOCARRIAGERETURN__").replace(/\n/g, "__DOJONEWLINE__");
+                var multiLineMatches = copyrightFileContents.match(/\/\*.*?copyright.*?\*\//gi);
+        
+                //Finalize copyright notice.
+                if((multiLineMatches && multiLineMatches.length > 0) || (singleLineMatches && singleLineMatches.length > 0)){
+                        if(multiLineMatches && multiLineMatches.length > 0){
+                                copyrightText += multiLineMatches.join("\r\n").replace(/__DOJOCARRIAGERETURN__/g, "\r").replace(/__DOJONEWLINE__/g, "\n");
+                        }                                       
+                        if(singleLineMatches && singleLineMatches.length > 0){
+                                copyrightText += singleLineMatches.join("\r\n");
+                        }
+                        copyrightText += buildUtil.getLineSeparator();
+                }else{
+                        copyrightText = copyright;
+                }
+        }
+
+        //Use rhino to help do minifying/compressing.
+        var context = Packages.org.mozilla.javascript.Context.enter();
+        try{
+                // Use the interpreter for interactive input (copied this from Main rhino class).
+                context.setOptimizationLevel(-1);
+                
+                var script = context.compileString(fileContents, fileName, 1, null);
+                if(doCompression){
+                        //Apply compression using custom compression call in Dojo-modified rhino.
+                        fileContents = new String(context.compressScript(script, 0, fileContents, 1));
+                }else{
+                        //Strip comments
+                        fileContents = new String(context.decompileScript(script, 0));
+                        //Replace the spaces with tabs.
+                        //Ideally do this in the pretty printer rhino code.
+                        fileContents = fileContents.replace(/    /g, "\t");
+                }
+        }finally{
+                Packages.org.mozilla.javascript.Context.exit();
+        }
+
+        return copyrightText + fileContents;
+}
+
 buildUtil.stripComments = function(/*String*/startDir, /*boolean*/suppressDojoCopyright){
         //summary: strips the JS comments from all the files in "startDir", and all subdirectories.
@@ -875 +928 @@
                                 var fileContents = new String(buildUtil.readFile(fileList[i]));
 
-                                //Look for copyright. If so, maintain it.
-                                var singleLineMatches = fileContents.match(/\/\/.*copyright.*$/gi);
-                                
-                                //Get rid of cr, lf, since it messes up matching.
-                                copyrightFileContents = fileContents.replace(/\r/g, "__DOJOCARRIAGERETURN__").replace(/\n/g, "__DOJONEWLINE__");
-                                var multiLineMatches = copyrightFileContents.match(/\/\*.*?copyright.*?\*\//gi);
-
-                                //Finalize copyright notice.
-                                var copyrightText = "";
-                                if((multiLineMatches && multiLineMatches.length > 0) || (singleLineMatches && singleLineMatches.length > 0)){
-                                        if(multiLineMatches && multiLineMatches.length > 0){
-                                                copyrightText += multiLineMatches.join("\r\n").replace(/__DOJOCARRIAGERETURN__/g, "\r").replace(/__DOJONEWLINE__/g, "\n");
-                                        }                                       
-                                        if(singleLineMatches && singleLineMatches.length > 0){
-                                                copyrightText += singleLineMatches.join("\r\n");
-                                        }
-                                        copyrightText += buildUtil.getLineSeparator();
-                                }else{
-                                        copyrightText = copyright;
+                                //Do comment removal.
+                                try{
+                                        fileContents = buildUtil.optimizeJs(fileList[i], fileContents, copyright, false);
+                                }catch(e){
+                                        print("Could not strip comments for file: " + fileList[i] + ", error: " + e);
                                 }
 
-                                //Remove whitespace.
-                                var context = Packages.org.mozilla.javascript.Context.enter();
-                                try{
-                                        // Use the interpreter for interactive input (copied this from Main rhino class).
-                                        context.setOptimizationLevel(-1);
-                                        
-                                        var script = context.compileString(fileContents, fileList[i], 1, null);
-                                        fileContents = new String(context.decompileScript(script, 0));
-                                }catch(e){
-                                        print("Could not strip comments for file: " + fileList[i]);
-                                }finally{
-                                        Packages.org.mozilla.javascript.Context.exit();
-                                }
-                                
-                                //Replace the spaces with tabs.
-                                //Ideally do this in the pretty printer rhino code.
-                                fileContents = fileContents.replace(/    /g, "\t");
-
                                 //Write out the file with appropriate copyright.
-                                buildUtil.saveUtf8File(fileList[i], copyrightText + fileContents);
-                        }
-                }
-        }
-}
-
+                                buildUtil.saveUtf8File(fileList[i], fileContents);
+                        }
+                }
+        }
+}
+
+

trunk/buildscripts/makeDojoJsWeb.js

@@ -8 +8 @@
 var version = new String(arguments[2]);
 var xdDojoUrl = new String(arguments[3]);
+var doCompression = new String(arguments[4]);
+
+if(typeof(doCompression) != "undefined" && doCompression == "true"){
+        doCompression = true;
+}else{
+        doCompression = false;
+}
 
 depList = depList.split(",");
@@ -46 +53 @@
         dojo.require("dojo.string.extras");
         
-        var contents = buildUtil.makeDojoJs(dependencyResult, version).dojoContents;
-        var prefixes = [["dojo", "src"]];
+        var contents = "";
+        try{
+                contents = buildUtil.makeDojoJs(dependencyResult, version).dojoContents;
+                var prefixes = [["dojo", "src"]];
+        
+                //Make sure any dojo.requireLocalization calls are modified
+                //so that they inform the loader of valid locales that can be loaded.
+                contents = buildUtil.modifyRequireLocalization(contents, djConfig.baseRelativePath, prefixes);
+                
+                //Convert requireLocalization calls into xdRequireLocalization calls.
+                contents = contents.replace(/dojo\.requireLocalization\s*\(/g, "dojo.xdRequireLocalization(");
+                
+                //Intern strings.
+                contents = buildUtil.interningRegexpMagic("xdomain", contents, djConfig.baseRelativePath, prefixes, [], true);
+                
+                //Set the xdomain dojo url
+                if(xdDojoUrl){
+                        contents = buildUtilXd.setXdDojoConfig(contents, xdDojoUrl);
+                }
 
-        //Make sure any dojo.requireLocalization calls are modified
-        //so that they inform the loader of valid locales that can be loaded.
-        contents = buildUtil.modifyRequireLocalization(contents, djConfig.baseRelativePath, prefixes);
-        
-        //Convert requireLocalization calls into xdRequireLocalization calls.
-        contents = contents.replace(/dojo\.requireLocalization\s*\(/g, "dojo.xdRequireLocalization(");
-        
-        //Add copyright, and intern strings.
-        contents = new String(buildUtil.readFile("copyright.txt")) + buildUtil.interningRegexpMagic("xdomain", contents, djConfig.baseRelativePath, prefixes, [], true);
-        
-        if(xdDojoUrl){
-                contents = buildUtilXd.setXdDojoConfig(contents, xdDojoUrl);
+                //Compress code, if desired.
+                if(doCompression){
+                        contents = buildUtil.optimizeJs("dojo.js", contents, "", doCompression);
+                }
+
+                //Add copyright
+                contents = new String(buildUtil.readFile("copyright.txt"))
+                        + new String(buildUtil.readFile("build_notice.txt"))
+                        + contents;
+        }catch(e){
+                contents = "dojo.js build error: " + e; 
         }
-        
+
         print(contents);
 }

trunk/buildscripts/webbuild.php

@@ -5 +5 @@
         $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)){
@@ -16 +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`;
+                $dojoContents = `/usr/bin/java -jar $buildScriptsDir/lib/custom_rhino.jar $buildScriptsDir/makeDojoJsWeb.js $depList $provideList $version $xdDojoUrl $doCompression`;
 
                 print($dojoContents);

trunk/buildscripts/webbuild/index.html

@@ -133 +133 @@
                 depListForm.version.value = version;
                 depListForm.xdDojoUrl.value = xdDojoUrl;
+                depListForm.doCompression.value = document.masterForm.doCompression[1].checked ? true : false;
 
                 //reset the hidden frame so we can do another build.
@@ -375 +376 @@
 
 <table id="outerTable">
-        <tr><td colspan=3><h2>Dojo Builder (highly experimental)
+        <tr><td colspan=3><h2>Dojo Builder (experimental)
                                                         <div id="version">for version @VERSION@</div>
                                                 </h2></td></tr>
@@ -527 +528 @@
                         <table class="labelRow_table" width=100% cellpadding=1><tr>
                                 <td id="dependencyRow_Arrow" class="labelRow_toggler"><div id="dependencyRow_toggler" class="toggler">&ndash;</div></td>
-                                <td id="dependencyRow_Title" class="labelRow_title">Modules to include:</td>
+                                <td id="dependencyRow_Title" class="labelRow_title">Resources to include:</td>
                                 <td id="dependencyRow_Arrow" class="labelRow_values"></td>
                         </tr></table>
@@ -548 +549 @@
                                         <td class="tree"><div id="treeContainer"></div></td>
                                 </tr>                   
-                                <tr><td class="underLabel">Enter module names separated by line returns and/or commas. <br> 
-                                                                                        "Quotes" around module names are optional.</td>
+                                <tr><td class="underLabel">Enter resource names separated by line returns and/or commas. <br> 
+                                                                                        "Quotes" around resource names are optional.</td>
                                         <td class="colSpacer">&nbsp;</td>
                                         <td class="underLabel">Double click items above to add them to the list.</td>
@@ -558 +559 @@
         </tr>
 
-        <tr style="display:none"><td colspan=3 class="rowSpacer">&nbsp;</td></tr>
-        <tr style="display:none"><td colspan=3 class="labelRow outsetBorder" id="optionsRow_label" onclick="toggleRow('optionsRow')">
+        <tr><td colspan=3 class="rowSpacer">&nbsp;</td></tr>
+        <tr><td colspan=3 class="labelRow outsetBorder" id="optionsRow_label" onclick="toggleRow('optionsRow')">
                         <table class="labelRow_table" width=100% cellpadding=1><tr>
                                 <td id="optionsRow_Arrow" class="labelRow_toggler"><div id="optionsRow_toggler" class="toggler">&ndash;</div></td>
@@ -567 +568 @@
                 </td>
         </tr>
-        <tr id="optionsRow" style="display:none">
+        <tr id="optionsRow">
                 <td class="colSpacer">&nbsp;</td>
                 <td>
                         <table>
-                                <tr><td class="fieldLabel">Profile name:</td>
-                                        <td class="field"><input id="profileName"></td>
-                                        <td class="colSpacer">&nbsp;</td>
-                                        <td class="check"><input id="tellDojo" type="checkbox"></td>
-                                        <td class="checkLabel"><label for="tellDojo">Let dojo know about this profile</label><br>
-                                                                                                                                        <span class="note">(anonymous, for usage pattern info gathering only)</span></td>
-                                </tr>                   
-
-                                <tr><td class="check"><input id="strip" type="checkbox"></td>
-                                        <td class="checkLabel"><label for="strip">Strip whitespace</label></td>
-                                </tr>                   
-
-                                <tr><td class="check"><input id="removeComments" type="checkbox"></td>
-                                        <td class="checkLabel"><label for="removeComments">Remove comments</label></td>
-                                </tr>                   
-
-                                <tr><td class="check"><input id="compress" type="checkbox"></td>
-                                        <td class="checkLabel"><label for="compress">Compress the contents (very slow)</label></td>
-                                </tr>                   
+                                <tr><td class="radio"><input id="minify" name="doCompression" type="radio" value="false" CHECKED></td>
+                                        <td class="radioLabel"><label for="minify">Minify <span class="underLabel">Removes comments, but code is still readable for debugging</span></label></td>
+                                </tr>                   
+
+                                <tr><td class="radio" style="vertical-align: top"><input id="compress" name="doCompression" type="radio" value="false"></td>
+                                        <td class="radioLabel"><label for="compress">Compress <span class="underLabel">Modifies code to shrink size, but is harder to debug. Gives about a 10% file reduction when comparing its gzipped size to the gzipped size of the Minify option (tool does not do gzipping, you must do it yourself)</span></label></td>
+                                </tr>
 <!--
 -->
@@ -634 +623 @@
         <input type="hidden" name="depList" value="" />
         <input type="hidden" name="provideList" value="" />
-        <input type="hidden" name="version" value="" />         
-        <input type="hidden" name="compress" value="false" />
+        <input type="hidden" name="version" value="" />
         <input type="hidden" name="xdDojoUrl" value="" />
+        <input type="hidden" name="doCompression" value="" />
 </form>