Ticket #2696: build.3.patch

dojo/_base/_loader/bootstrap.js

@@ -97 +97 @@
 dojo._getProp = function(/*Array*/parts, /*Boolean*/create, /*Object*/context){
         var obj=context||dojo.global;
         for(var i=0, p; obj&&(p=parts[i]); i++){
-                obj = (p in obj ? obj[p] : (create ? obj[p]={} : undefined));
+                obj = (obj[p] ? obj[p] : (create ? obj[p]={} : undefined));
         }
         return obj; // Any
 }
@@ -219 +219 @@
 =====*/
 
 // vim:ai:ts=4:noet
+if(typeof dojo.global.OpenAjax == "undefined") {
+        OpenAjax = dojo;
+}
+OpenAjax._resourceToUri = {};
+OpenAjax.register = function(resources, overwrite){
+        // Register / add resource information to our list
+        for(var r in resources){
+                if(!this._resourceToUri[r] || (this._resourceToUri[r] && overwrite) ){
+                        this._resourceToUri[r] = resources[r];
+                }
+        }
+};
+
+
+// vim:ai:ts=4:noet:textwidth=80

dojo/_base/_loader/loader.js

@@ -253 +253 @@
 
 dojo._loadModule = function(    /*String*/moduleName, 
                                                                 /*Boolean?*/exactOnly, 
-                                                                /*Boolean?*/omitModuleCheck){
+                                                                /*Boolean?*/omitModuleCheck,
+                                                                /*String*/resourceType){
         //      summary:
         //              loads a Javascript module from the appropriate URI
         //      description:
@@ -283 +284 @@
         //      
         //              dj_load is an alias for dojo._loadModule
 
+        moduleType = resourceType || '.js'
+        
         omitModuleCheck = this._global_omit_module_check || omitModuleCheck;
+
         var module = this._loadedModules[moduleName];
         if(module){
                 return module;
         }
 
-        // convert periods to slashes
-        var nsyms = moduleName.split(".");
-        var syms = this._getModuleSymbols(moduleName);
-        var startedRelative = ((syms[0].charAt(0) != '/') && !syms[0].match(/^\w+:/));
-        var last = syms[syms.length - 1];
         var relpath;
-        // figure out if we're looking for a full package, if so, we want to do
-        // things slightly diffrently
-        if(last=="*"){
-                moduleName = nsyms.slice(0, -1).join('.');
-                syms.pop();
-                relpath = syms.join("/") + "/" + (djConfig["packageFileName"]||"__package__") + '.js';
-                if(startedRelative && relpath.charAt(0)=="/"){
-                        relpath = relpath.slice(1);
+        var resourceUri = OpenAjax._resourceToUri[moduleName];
+
+        if(resourceUri){
+
+                // TODO: support other types of URI, i.e. http:// for CSS or other ressources
+                if(resourceUri.match(/^file:\/\//)) {
+                        relpath = OpenAjax._resourceToUri[moduleName].replace(/^file:\/\//, '');
+                        if(relpath.charAt(0) != '/') {
+                                
+                        
+                                var d = relpath.split("/");
+                                var modulePrefix = dojo._getModulePrefix(d[0]);
+                                if(modulePrefix == d[0]){
+                                        relpath = '../'+relpath;
+                                }else{
+                                        d.splice(0, 1);
+                                        relpath = modulePrefix+'/'+d.join('/');
+                                }
+                        }
                 }
-        }else{
-                relpath = syms.join("/") + '.js';
-                moduleName = nsyms.join('.');
+                
+        } else {
+
+                // convert periods to slashes
+                var nsyms = moduleName.split(".");
+                var syms = this._getModuleSymbols(moduleName);
+                var startedRelative = ((syms[0].charAt(0) != '/') && !syms[0].match(/^\w+:/));
+                var last = syms[syms.length - 1];
+                
+                // figure out if we're looking for a full package, if so, we want to do
+                // things slightly diffrently
+                if(last=="*"){
+                        moduleName = nsyms.slice(0, -1).join('.');
+                        syms.pop();
+                        relpath = syms.join("/") + "/" + (djConfig["packageFileName"]||"__package__") + moduleType;
+                        if(startedRelative && relpath.charAt(0)=="/"){
+                                relpath = relpath.slice(1);
+                        }
+                }else{
+                        relpath = syms.join("/") + moduleType;
+                        moduleName = nsyms.join('.');
+                }
         }
         var modArg = (!omitModuleCheck) ? moduleName : null;
-        var ok = this._loadPath(relpath, modArg);
+        var ok = false;
 
+        switch(moduleType) {
+                case '.js'      :       ok = this._loadPath(relpath, modArg);
+                                                break;
+                // TODO, handle CSS resource / append to head of body
+        }
+
         if((!ok)&&(!omitModuleCheck)){
                 throw new Error("Could not load '" + moduleName + "'; last tried '" + relpath + "'");
         }
 
         // check that the symbol was defined
         // Don't bother if we're doing xdomain (asynchronous) loading.
-        if((!omitModuleCheck)&&(!this["_isXDomain"])){
+        if(moduleType == '.js' && (!omitModuleCheck)&&(!this["_isXDomain"])){
                 // pass in false so we can give better error
                 module = this._loadedModules[moduleName];
                 if(!module){
@@ -328 +363 @@
         return module;
 }
 
-dojo.require = dojo._loadModule;
+dojo.require = function(resourceId, resourceType) {
+        return dojo._loadModule(resourceId, null, null, resourceType);
+};
 
 dojo.provide = function(/*String*/ packageName){
         //      summary:

util/buildscripts/build.js

@@ -263 +263 @@
 }
 //********* 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

@@ -160 +160 @@
                                 // string, but rather a Java string, which will cause the replace() method
                                 // to bomb.
                                 contents = contents ? new String(contents) : "";
-                                // clobber all comments
-                                return contents.replace( /(\/\*([\s\S]*?)\*\/|\/\/(.*)$)/mg , "");
+        
+                                // Properly remove comments
+                                var context = Packages.org.mozilla.javascript.Context.enter();
+                                try{
+                                        context.setOptimizationLevel(-1);
+
+                                        var fileName = java.lang.System.getProperty("java.io.tmpdir")+'/tmp.js';
+                                        var script = context.compileString(contents, fileName, 1, null);
+                
+                                        // Strip comments
+                                        contents = new String(context.decompileScript(script, 0));
+                                }finally{
+                                        Packages.org.mozilla.javascript.Context.exit();
+                                }
+
+                                return contents;
                         }
                         
                         // over-write dojo.eval to prevent actual loading of subsequent files
@@ -170 +184 @@
                         var old_load = load;
                         load = function(uri){
                                 try{
+                                        
                                         var text = removeComments((isWebBuild ? dojo._getText(uri) : fileUtil.readFile(uri)));
+                                        
+                                        // Eval registrations so the loader knows where to get these resources
+                                        var register =new String(text.match(/OpenAjax.register\(([^)]*?)\)/));
+                                        if(register) {
+                                                eval(register.replace(/[\s]*/g, ''));                   
+                                        }
+                                        
                                         var requires = dojo._getRequiresAndProvides(text);
                                         eval(requires.join(";"));
                                         dojo._loadedUrls.push(uri);
@@ -201 +223 @@
                                 var deps = [];
                                 var tmp;
                                 RegExp.lastIndex = 0;
-                                var testExp = /dojo.(require|platformRequire|provide)\([\w\W]*?\)/mg;
+                                var testExp = /(dojo|OpenAjax).(require|platformRequire|provide)\([\w\W]*?\)/mg;
                                 while((tmp = testExp.exec(contents)) != null){
                                         deps.push(tmp[0]);
                                 }
@@ -222 +244 @@
                                 var deps = [];
                                 var tmp;
                                 RegExp.lastIndex = 0;
-                                var testExp = /dojo.(requireAfterIf|requireIf)\([\w\W]*?\)/mg;
+                                var testExp = /(dojo|OpenAjax).(requireAfterIf|requireIf)\([\w\W]*?\)/mg;
                                 while((tmp = testExp.exec(contents)) != null){
                                         deps.push(tmp[0]);
                                 }
@@ -607 +629 @@
 }
 
 //The regular expressions that will help find dependencies in the file contents.
-buildUtil.masterDependencyRegExpString = "dojo.(requireLocalization|require|requireIf|provide|requireAfterIf|platformRequire|i18n\._preloadLocalizations)\\(([\\w\\W]*?)\\)";
+buildUtil.masterDependencyRegExpString = "(dojo|OpenAjax).(requireLocalization|require|requireIf|provide|requireAfterIf|platformRequire|i18n\._preloadLocalizations)\\(([\\w\\W]*?)\\)";
 buildUtil.globalDependencyRegExp = new RegExp(buildUtil.masterDependencyRegExpString, "mg");
 buildUtil.dependencyPartsRegExp = new RegExp(buildUtil.masterDependencyRegExpString);