Changeset 7275

Timestamp:

02/09/07 14:59:56 (22 months ago)

Author:

jburke

Message:

(merge from branch) References #2366. Added string interning and copyright file to built dojo.js.

Location:

trunk/buildscripts

Files:

• buildUtil.js (modified) (3 diffs)
• makeDojoJsWeb.js (modified) (1 diff)
• webbuild.php (modified) (1 diff)

trunk/buildscripts/buildUtil.js

@@ -698 +698 @@
 
 //WARNING: This function assumes dojo.string.escapeString() has been loaded.
-buildUtil.interningRegexpMagic = function(loader, resourceContent, srcRoot, prefixes, skiplist){
+buildUtil.interningRegexpMagic = function(loader, resourceContent, srcRoot, prefixes, skiplist, isSilent){
         return resourceContent.replace(buildUtil.interningGlobalDojoUriRegExp, function(matchString){
                 var parts = matchString.match(buildUtil.interningLocalDojoUriRegExp);
@@ -706 +706 @@
                 if(parts[5] == "dojo"){
                         if(parts[6].match(/(\.htm|\.html|\.css)$/)){
-                                print("Dojo match: " + parts[6]);
+                                if(!isSilent){
+                                        print("Dojo match: " + parts[6]);
+                                }
                                 filePath = srcRoot + parts[6]
                                 resourceNsName = "dojo:" + parts[6];
                         }
                 }else{
-                        print("Module match: " + parts[6] + " and " + parts[9]);
+                        if(!isSilent){
+                                print("Module match: " + parts[6] + " and " + parts[9]);
+                        }
                         filePath = makeResourceUri(parts[6], parts[9], srcRoot, prefixes);
                         resourceNsName = parts[6] + ':' + parts[9];             
@@ -717 +721 @@
 
                 if(!filePath || buildUtil.isValueInArray(resourceNsName, skiplist)){
-                        if(filePath){
+                        if(filePath && !isSilent){
                                 print("Skip intern resource: " + filePath);
                         }
                 }else{
-                        print("Interning resource path: " + filePath);
+                        if(!isSilent){
+                                print("Interning resource path: " + filePath);
+                        }
                         //dojo.string.escapeString will add starting and ending double-quotes.
                         var jsEscapedContent = dojo.string.escapeString(new String(readText(filePath)));

trunk/buildscripts/makeDojoJsWeb.js

@@ -15 +15 @@
 eval('dependencyResult = {depList: ["' + depList.join('","') + '"], provideList: ["' + provideList.join('","') + '"]};');
 
+//Load dojo (needed for string interning)
+djConfig={
+        baseRelativePath: "../"
+};
+load('../dojo.js');
+dojo.require("dojo.string.extras");
+
 var contents = buildUtil.makeDojoJs(dependencyResult, version).dojoContents;
+
+//Add copyright, and intern strings.
+contents = new String(readFile("copyright.txt")) + buildUtil.interningRegexpMagic("xdomain", contents, djConfig.baseRelativePath, [["dojo", "src"]], [], true);
 
 if(xdDojoUrl){

trunk/buildscripts/webbuild.php

@@ -3 +3 @@
         $depList = isset($_POST['depList']) ? $_POST['depList'] : null;
         $provideList = isset($_POST['provideList']) ? $_POST['provideList'] : '';
-        $version = isset($_POST['version']) ? $_POST['version'] : '';
+        $version = isset($_POST['version']) ? $_POST['version'] : '0.0.0dev';
         $xdDojoUrl = isset($_POST['xdDojoUrl']) ? $_POST['xdDojoUrl'] : '';