Ticket #2696: build.2.patch

dojo/_base/_loader/bootstrap.js

@@ -214 +214 @@
         // NOTE: platform specializations need to implement this
 }
 
+// Implementation of Web Toolkit interface
+if(typeof window.wti == "undefined") {
+        var wti = dojo;
+        wti.require = dojo.require;
+        wti.provide = dojo.provide;
+}
 // vim:ai:ts=4:noet:textwidth=80

util/buildscripts/build.js

@@ -270 +270 @@
 }
 //********* End release *********
 
+//********* Start Minimal *********
+function minimal(){
+        logger.info("Using profile: " + kwArgs.profileFile);
+        logger.info("Using version number: " + kwArgs.version + " for the release.");
+        
+        clean();
+
+        var dependencies = kwArgs.profileProperties.dependencies;
+        var prefixes = dependencies.prefixes;
+        var lineSeparator = fileUtil.getLineSeparator();
+        var copyrightText = fileUtil.readFile("copyright.txt");
+        var buildNoticeText = fileUtil.readFile("build_notice.txt");
+        
+        //Find the dojo prefix path. Need it to process other module prefixes.
+        var dojoPrefixPath = buildUtil.getDojoPrefixPath(prefixes) + '/';
+
+        logger.trace("Building dojo.js and layer files");
+        var result = buildUtil.makeDojoJs(buildUtil.loadDependencyList(kwArgs.profileProperties), kwArgs.version);
+
+        //Save the build layers. The first layer is dojo.js.
+        var layerLegalText = copyrightText + buildNoticeText;
+        var dojoReleaseDir = kwArgs.releaseDir + "/dojo/";
+        
+        var optimizeIgnoreString = "";
+        for(var i = 0; i < result.length; i++){
+                var layerName = result[i].layerName;
+                var srcFilePath = dojoPrefixPath + result[i].layerName;
+                var dstFilePath = dojoReleaseDir + result[i].layerName;
+                var fileContents = result[i].contents;
+                
+                // make sure directory exists
+                var dir = dstFilePath.substr(0,dstFilePath.lastIndexOf('/'));
+                var d = new java.io.File(dir);
+                d.mkdirs();
+                
+                //Build up string of files to ignore for the directory optimization step
+                var ignoreName = layerName.replace(/\.\.\//g, "");
+                optimizeIgnoreString += (optimizeIgnoreString ? "|" : "") + buildUtil.regExpEscape(ignoreName) + "$";
+                optimizeIgnoreString += "|" + buildUtil.regExpEscape(ignoreName + ".uncompressed.js") + "$";
+                
+                //Burn in xd path for dojo if requested, and only do this in dojo.xd.js.
+                if(layerName.match(/dojo\.xd\.js/) && kwArgs.xdDojoPath){
+                        fileContents = buildUtilXd.setXdDojoConfig(fileContents, kwArgs.xdDojoPath);
+                }
+
+                // Remove require statements, TODO: move this to build util?
+                fileContents = fileContents.replace( /(dojo|wti)\.require\(([\w\W]*?)\)/mg , "");
+
+                //Flatten resources 
+                //FIXME: Flatten resources. Only do the top level flattening for bundles
+                //in the layer files. How to do this for layers? only do one nls file for
+                //all layers, or a different one for each layer?
+                /*
+                if(layerName == "dojo.js"){
+                        i18nUtil.flattenLayerFileBundles(dstFilePath, dojoReleaseDir + "nls", "nls", kwArgs);
+                }*/
+
+                //Save uncompressed file.
+                var uncompressedFilePath = dstFilePath + ".uncompressed.js";
+                var uncompressedContents = layerLegalText + fileContents;
+                if(layerName.match(/\.xd\.js$/) && !layerName.match(/dojo(\.xd)?\.js/)){
+                        uncompressedContents = buildUtilXd.makeXdContents(uncompressedContents, prefixes);
+                }
+                fileUtil.saveFile(uncompressedFilePath, uncompressedContents);
+
+                //Intern strings if desired. Do this before compression, since, in the xd case,
+                //"dojo" gets converted to a shortened name.
+                if(kwArgs.internStrings){
+                        logger.info("Interning strings for file: " + dstFilePath);
+                        var prefixes = dependencies["prefixes"] || [];
+                        var skiplist = dependencies["internSkipList"] || [];
+                        buildUtil.internTemplateStringsInFile(uncompressedFilePath, dojoReleaseDir, prefixes, skiplist);
+
+                        //Load the file contents after string interning, to pick up interned strings.
+                        fileContents = fileUtil.readFile(uncompressedFilePath);
+                }
+
+                //Save compressed file.
+                logger.trace("Optimizing (" + kwArgs.layerOptimize + ") file: " + dstFilePath);
+                var compressedContents = buildUtil.optimizeJs(dstFilePath, fileContents, layerLegalText, kwArgs.layerOptimize);
+                if(layerName.match(/\.xd\.js$/) && !layerName.match(/dojo(\.xd)?\.js/)){
+                        compressedContents = buildUtilXd.makeXdContents(compressedContents, prefixes);
+                }
+                fileUtil.saveFile(dstFilePath, compressedContents);
+                
+                // Remove uncompressed file
+                fileUtil.deleteFile(uncompressedFilePath);
+        }
+
+        //Remove _base from the release.
+        fileUtil.deleteFile(dojoReleaseDir + "_base");
+        fileUtil.deleteFile(dojoReleaseDir + "_base.js");
+
+
+        //Save the dependency lists to build.txt
+        var buildText = "Files baked into this build:" + lineSeparator;
+        for(var i = 0; i < result.length; i++){
+                buildText += lineSeparator + result[i].layerName + ":" + lineSeparator;
+                buildText += result[i].depList.join(lineSeparator) + lineSeparator;
+        }
+        fileUtil.saveFile(kwArgs.releaseDir + "/dojo/build.txt", buildText);
+        logger.info(buildText);
+
+        logger.info("Build is in directory: " + kwArgs.releaseDir);
+}
+//********* End release *********
+
 //********* Start _copyToRelease *********
 function _copyToRelease(/*String*/prefixName, /*String*/prefixPath, /*Object*/kwArgs){
         //summary: copies modules and supporting files from the prefix path to the release

util/buildscripts/jslib/buildUtil.js

@@ -201 +201 @@
                                 var deps = [];
                                 var tmp;
                                 RegExp.lastIndex = 0;
-                                var testExp = /dojo.(require|platformRequire|provide)\([\w\W]*?\)/mg;
+                                var testExp = /(dojo|wti).(require|platformRequire|provide)\([\w\W]*?\)/mg;
                                 while((tmp = testExp.exec(contents)) != null){
                                         deps.push(tmp[0]);
                                 }
@@ -222 +222 @@
                                 var deps = [];
                                 var tmp;
                                 RegExp.lastIndex = 0;
-                                var testExp = /dojo.(requireAfterIf|requireIf)\([\w\W]*?\)/mg;
+                                var testExp = /(dojo|wti).(requireAfterIf|requireIf)\([\w\W]*?\)/mg;
                                 while((tmp = testExp.exec(contents)) != null){
                                         deps.push(tmp[0]);
                                 }
@@ -598 +598 @@
 }
 
 //The regular expressions that will help find dependencies in the file contents.
-buildUtil.masterDependencyRegExpString = "dojo.(requireLocalization|require|requireIf|provide|requireAfterIf|platformRequire)\\(([\\w\\W]*?)\\)";
+buildUtil.masterDependencyRegExpString = "(dojo|wti).(requireLocalization|require|requireIf|provide|requireAfterIf|platformRequire)\\(([\\w\\W]*?)\\)";
 buildUtil.globalDependencyRegExp = new RegExp(buildUtil.masterDependencyRegExpString, "mg");
 buildUtil.dependencyPartsRegExp = new RegExp(buildUtil.masterDependencyRegExpString);