Changeset 7780

Timestamp:

03/24/07 15:03:48 (20 months ago)

Author:

jburke

Message:

Refs #2607. Got string interning plugged in, but not sure if it really works yet.

Location:

util/trunk/buildscripts

Files:

• build.js (modified) (9 diffs)
• build.xml (modified) (1 diff)
• internStrings.js (deleted)
• jslib/buildUtil.js (modified) (7 diffs)

util/trunk/buildscripts/build.js

@@ -1 +1 @@
 //Main build script for Dojo
+var buildTimerStart = (new Date()).getTime();
 
 load("jslib/logger.js");
@@ -17 +18 @@
         kwArgs.profileFile = "profiles/" + kwArgs.profile + ".profile.js";
 }
+if(typeof kwArgs["internStrings"] == "undefined"){
+        kwArgs.internStrings = true;    
+}
 if(kwArgs["log"]){
         logger.level = logger[kwArgs["log"]];
@@ -32 +36 @@
 }
 
+var buildTime = ((new Date().getTime() - buildTimerStart) / 1000);
+logger.info("Build time: " + buildTime + " seconds");
 
 //********* Start clean ************
@@ -50 +56 @@
         //Get the list of module directories we need to process.
         //They will be in the dependencies.prefixes array.
-        var profileProperties = buildUtil.evalProfile(kwArgs.profileFile);
-        var dependencies = profileProperties.dependencies;
+        kwArgs.profileProperties = buildUtil.evalProfile(kwArgs.profileFile);
+        var dependencies = kwArgs.profileProperties.dependencies;
         var prefixes = dependencies.prefixes;
         var dojoPrefixPath = null;
@@ -64 +70 @@
                 var prefixPath = prefixes[i][1];
                 
+                //Set prefix path to the release location, so that
+                //build operations that depend/operate on it are using
+                //the release location.
+                prefixes[i][1] = kwArgs.releaseDir + "/"  + prefixName;
+
                 //Save dojo for last.
                 if(prefixName == "dojo"){
@@ -77 +88 @@
 
                 //FIXME: loadDependency list reparses profile file, but we've already done that.
+                logger.trace("Building dojo.js and layer files");
                 var result = buildUtil.makeDojoJs(buildUtil.loadDependencyList(kwArgs.profileFile), kwArgs.version);
 
                 //Save the build layers. The first layer is dojo.js.
                 var layerLegalText = copyrightText + buildNoticeText;
+                var dojoReleaseDir = kwArgs.releaseDir + "/dojo/";
                 for(var i = 0; i < result.length; i++){
-                        var fileName = kwArgs.releaseDir + "/dojo/" + result[i].layerName;
+                        var fileName = dojoReleaseDir + result[i].layerName;
                         var fileContents = result[i].contents;
                         
@@ -93 +106 @@
 
                         //Save uncompressed file.
-                        fileUtil.saveFile(fileName + ".uncompressed.js", layerLegalText + fileContents);
+                        var uncompressedFileName = fileName + ".uncompressed.js";
+                        fileUtil.saveFile(uncompressedFileName, layerLegalText + fileContents);
 
                         //Save compressed file.
@@ -100 +114 @@
                         var compresedContents = buildUtil.optimizeJs(fileName, fileContents, layerLegalText, true);
                         fileUtil.saveFile(fileName, compresedContents);
+
+                        //Intern strings if desired.
+                        if(kwArgs.internStrings){
+                                logger.info("Interning strings for file: " + fileName);
+                                var prefixes = dependencies["prefixes"] || [];
+                                var skiplist = dependencies["internSkipList"] || [];
+                                buildUtil.internTemplateStringsInFile(uncompressedFileName, dojoReleaseDir, prefixes, skiplist);
+                                buildUtil.internTemplateStringsInFile(fileName, dojoReleaseDir, prefixes, skiplist);
+                        }
                 }
 
@@ -127 +150 @@
         fileUtil.copyDir(prefixPath, releasePath, copyRegExp);
 
+        //Intern strings if desired.
+        if(kwArgs.internStrings){
+                logger.info("Interning strings for: " + releasePath);
+                buildUtil.internTemplateStrings(kwArgs.profileProperties.dependencies, releasePath);
+        }
+
         //FIXME: flatten bundles inside the directory
 

util/trunk/buildscripts/build.xml

@@ -338 +338 @@
         <!-- end list-profile-deps task -->
 
-        <!-- clean task -->
-        <target name="clean"
-                description="removes release files">
-                <delete dir="${release_dir}"/>
-        </target>
-        <!-- end clean task -->
-
-        <!-- release task -->
-        <target name="release" depends="-fix-config"
-                description="builds a release">
-
-                <echo level="info" taskName="release" message="Using version number: ${version} for the release."/>
-
-                <antcall target="clean" />
-
-                <copy todir="${release_dir}/${src}" includeEmptyDirs="false" preservelastmodified="true">
-                        <fileset dir="${root}/${src}">
-                                <include name="**" />
-                                <exclude name="**/*.swp" />
-                                <exclude name="**/.svn*" />
-                        </fileset>
-                </copy>
-
-                <copy todir="${release_dir}/tests" includeEmptyDirs="false" preservelastmodified="true">
-                        <fileset dir="${root}/tests">
-                                <include name="**" />
-                                <exclude name="**/*.swp" />
-                                <exclude name="**/.svn*" />
-                        </fileset>
-                </copy>
-
-                <antcall target="compress" />
-
-                <!-- Run xdgen if it xdomain loading is wanted. -->
-                <condition property="xdgenRun">
-                        <equals arg1="xdomain" arg2="${dojoLoader}"/>
-                </condition>
-                <antcall target="xdgenRelease"/>
-
-                <copy overwrite="true" file="../iframe_history.html" todir="${release_dir}/"  preservelastmodified="true" />
-
-                <copy file="${root}/LICENSE" todir="${release_dir}/"  preservelastmodified="true" />
-                <copy file="${root}/README" todir="${release_dir}/"  preservelastmodified="true" />
-        </target>
-        <!-- end release task -->
-
-        <!-- compress task -->
-        <target name="compress" depends="-fix-config, -set-profileFile"
-                description="runs compression code over release JS files">
-                <!-- Create the release dir if it doesn't exist. -->
-                <mkdir dir="${release_dir}"/>
-
-                <echo level="info" taskName="compress">profileFile: ${profileFile}</echo>
-
-                <!-- Call the JS script that will generate the raw dojo.js file -->
-                <java jar="./lib/custom_rhino.jar" failonerror="true" fork="true"
-                        logError="true">
-                        <arg value="makeDojoJs.js" />
-                        <arg value="${profileFile}" />
-                        <arg value="${release_dir}" />
-                        <arg value="source.__package__.js" />
-                        <arg value="${version}" />
-                        <sysproperty key="DOJO_LOADER" value="${dojoLoader}" />
-                </java>
-
-                <antcall target="-preload-resources">
-                        <param name="srcFile" value="${release_dir}/source.__package__.js" />
-                        <param name="dstFile" value="${release_dir}/source.__package__.js" />
-                        <param name="buildPrefix" value="dojo" />
-                </antcall>
-
-                <!--
-                        clobber requireLocalization statements.  They need to be come no-ops since the resources
-                        are now prebuilt and also because we do not want dojo.js to trigger XHRs on load
-                -->
-                <replaceregexp match="dojo.requireLocalization\((.*?)\);"
-                        byline="true" flags="g" file="${release_dir}/source.__package__.js">
-                        <substitution expression=""/>
-                </replaceregexp>
-
-                <antcall target="-rhino-compress">
-                        <param name="srcFile" value="${release_dir}/source.__package__.js" />
-                        <param name="dstFile" value="${release_dir}/dojo.js" />
-                </antcall>
-
-                <antcall target="-no-rhino-compress">
-                        <param name="srcFile" value="${release_dir}/source.__package__.js" />
-                        <param name="dstFile" value="${release_dir}/dojo.js" />
-                </antcall>
-
-                <!-- add build notice -->
-                <replaceregexp match="^" byline="false" replace="${build_notice}">
-                        <fileset dir="${release_dir}" includes="dojo.js"/>
-                </replaceregexp>
-
-                <!-- add copyright notice -->
-                <replaceregexp match="^" byline="false" replace="${copyright}">
-                        <fileset dir="${release_dir}">
-                                <include name="**/*.js" />
-                                <include name="**/*.as" />
-                                <not>
-                                        <contains text="copyright" casesensitive="no"  />
-                                </not>
-                        </fileset>
-                </replaceregexp>
-
-                <delete file="${release_dir}/source.__package__.js"/>
-
-                <!-- we copy over iframe_history.html here just in case this is a truly
-                stand-alone build that isn't being kicked off via release -->
-                <copy file="../iframe_history.html" todir="${release_dir}/" />
-
-                <!-- copy our dojo.storage and dojo.flash SWFs -->
-                <copy todir="${release_dir}/" preservelastmodified="true">
-                        <fileset dir="${root}/">
-                                <include name="**/*.swf" />
-                                <include name="*.jar" />
-                        </fileset>
-                </copy>
-
-        </target>
-        <!-- end compress task -->
-
-        <target name="-rhino-compress" unless="nostrip">
-                <copy overwrite="true" file="${srcFile}" tofile="${dstFile}.uncompressed.js" />
-                <java jar="./lib/custom_rhino.jar" failonerror="true" fork="true"
-                                logerror="true" output="${dstFile}">
-                        <arg value="-strict" />
-                        <arg value="-opt"/>
-                        <arg value="-1" />
-                        <arg value="-c" />
-                        <arg value="${srcFile}" />
-                </java>
-        </target>
-
-        <target name="-no-rhino-compress"
-                if="nostrip">
-                <copy overwrite="true" file="${srcFile}" tofile="${dstFile}" />
-        </target>
-
         <target name="-flatten-resources" depends="-set-profileFile"
                 description="loads all localization bundles in the build for a particular locale, flattens the object, and outputs a preloaded version">

util/trunk/buildscripts/jslib/buildUtil.js

@@ -98 +98 @@
         load = function(uri){
                 try{
-                        var text = removeComments((isWebBuild ? dojo._getText(uri) : readText(uri)));
+                        var text = removeComments((isWebBuild ? dojo._getText(uri) : fileUtil.readFile(uri)));
                         var requires = dojo._getRequiresAndProvides(text);
                         eval(requires.join(";"));
@@ -467 +467 @@
 
         //Use new String to make sure we have a JS string (not a Java string)
-        //readText is from hostenv_rhino.js, so be sure to load Dojo before calling this function.
-        var profileText = new String(readText(profileFile));
+        var profileText = new String(fileUtil.readFile(profileFile));
         //Get rid of CR and LFs since they seem to mess with the regexp match.
         //Using the "m" option on the regexp was not enough.
@@ -687 +686 @@
         }
 
-        if(bestPrefixPath == "" && resourceName.indexOf("dojo.") == 0){
-                bestPrefix = "dojo";
-                bestPrefixPath = "src/";
-        }
-        
         //Get rid of matching prefix from resource name.
         resourceName = resourceName.replace(bestPrefix, "");
@@ -712 +706 @@
 }
 
-
-function makeResourceUri(resourceName, templatePath, srcRoot, prefixes){
+buildUtil.makeResourceUri = function(resourceName, templatePath, srcRoot, prefixes){
         var bestPrefix = "";
         var bestPrefixPath = ""
@@ -751 +744 @@
 }
 
-buildUtil.internTemplateStrings = function(profileFile, loader, releaseDir, srcRoot){
-        loader = loader || "default";
-        releaseDir = releaseDir || "../release/dojo";
-        srcRoot = srcRoot || "../";
-        
-        print("loader: " + loader);
-        print("releaseDir - " + releaseDir);
-
-        //Load Dojo so we can use readText() defined in hostenv_rhino.js.
-        //Also gives us the ability to use all the neato toolkit features.
-        djConfig={
-                baseRelativePath: "../"
-        };
-        load('../dojo.js');
-        dojo.require("dojo.string.extras");
-        dojo.require("dojo.i18n.common");
-        dojo.require("dojo.json");
-        
-        //Find the bundles that need to be flattened.
-        load("buildUtil.js");
-
-        var profile = buildUtil.evalProfile(profileFile);
-        var dependencies = profileFile.dependencies;
-
+buildUtil.internTemplateStrings = function(dependencies, srcRoot){
         var prefixes = dependencies["prefixes"] || [];
-        //Make sure dojo is in the list.
-        var dojoPath = releaseDir.replace(/^.*(\/|\\)release(\/|\\)/, "release/");
-
         var skiplist = dependencies["internSkipList"] || [];
-        
-        //Intern strings for dojo.js
-        buildUtil.internTemplateStringsInFile(loader, releaseDir + "/dojo.js", srcRoot, prefixes, skiplist);
-        buildUtil.internTemplateStringsInFile(loader, releaseDir + "/dojo.js.uncompressed.js", srcRoot, prefixes, skiplist);
-
-        //Intern strings for any other layer files.
-        if(dependencies["layers"] && dependencies.layers.length > 0){
-                for(var i = 0; i < dependencies.layers.length; i++){
-                        buildUtil.internTemplateStringsInFile(loader, releaseDir + "/" + dependencies.layers[i].name, srcRoot, prefixes, skiplist);
-                }
-        }
 
         //Intern strings for all files in widget dir (xdomain and regular files)
-        var fileList = fileUtil.getFilteredFileList(releaseDir + "/src/widget",
-                /\.js$/, true);
-
+        var fileList = fileUtil.getFilteredFileList(srcRoot, /\.js$/, true);
         if(fileList){
                 for(var i = 0; i < fileList.length; i++){
-                        buildUtil.internTemplateStringsInFile(loader, fileList[i], srcRoot, prefixes, skiplist)
-                }
-        }
-}
-
-buildUtil.internTemplateStringsInFile = function(loader, resourceFile, srcRoot, prefixes, skiplist){
-        var resourceContent = new String(readText(resourceFile));
-        resourceContent = buildUtil.interningRegexpMagic(loader, resourceContent, srcRoot, prefixes, skiplist);
-        fileUtil.saveUtf8File(resourceFile, resourceContent);
-}
-
-buildUtil.interningDojoUriRegExpString = "(((templatePath|templateCssPath)\\s*(=|:)\\s*)|dojo\\.uri\\.cache\\.allow\\(\\s*)dojo\\.uri\\.(dojo|module)?Uri\\(\\s*?[\\\"\\']([\\w\\.\\/]+)[\\\"\\'](([\\,\\s]*)[\\\"\\']([\\w\\.\\/]*)[\\\"\\'])?\\s*\\)";
+                        buildUtil.internTemplateStringsInFile(fileList[i], srcRoot, prefixes, skiplist);
+                }
+        }
+}
+
+buildUtil.internTemplateStringsInFile = function(resourceFile, srcRoot, prefixes, skiplist){
+        var resourceContent = String(fileUtil.readFile(resourceFile));
+        resourceContent = buildUtil.interningRegexpMagic(resourceContent, srcRoot, prefixes, skiplist);
+        fileUtil.saveFile(resourceFile, resourceContent);
+}
+
+buildUtil.interningDojoUriRegExpString = "(((templatePath|templateCssPath)\\s*(=|:)\\s*)|dojo\\.uri\\.cache\\.allow\\(\\s*)dojo\\.(module)?Uri\\(\\s*?[\\\"\\']([\\w\\.\\/]+)[\\\"\\'](([\\,\\s]*)[\\\"\\']([\\w\\.\\/]*)[\\\"\\'])?\\s*\\)";
 buildUtil.interningGlobalDojoUriRegExp = new RegExp(buildUtil.interningDojoUriRegExpString, "g");
 buildUtil.interningLocalDojoUriRegExp = new RegExp(buildUtil.interningDojoUriRegExpString);
 
-//WARNING: This function assumes dojo.string.escapeString() has been loaded.
-buildUtil.interningRegexpMagic = function(loader, resourceContent, srcRoot, prefixes, skiplist, isSilent){
+buildUtil.interningRegexpMagic = function(resourceContent, srcRoot, prefixes, skiplist){
         return resourceContent.replace(buildUtil.interningGlobalDojoUriRegExp, function(matchString){
                 var parts = matchString.match(buildUtil.interningLocalDojoUriRegExp);
@@ -820 +773 @@
                 var filePath = "";
                 var resourceNsName = "";
-                if(parts[5] == "dojo"){
-                        if(parts[6].match(/(\.htm|\.html|\.css)$/)){
-                                if(!isSilent){
-                                        print("Dojo match: " + parts[6]);
-                                }
-                                filePath = srcRoot + parts[6]
-                                resourceNsName = "dojo:" + parts[6];
-                        }
+
+                logger.trace("Module match: " + parts[6] + " and " + parts[9]);
+                filePath = buildUtil.makeResourceUri(parts[6], parts[9], srcRoot, prefixes);
+                resourceNsName = parts[6] + ':' + parts[9];             
+
+                if(!filePath || buildUtil.isValueInArray(resourceNsName, skiplist)){
+                        logger.trace("Skip intern resource: " + filePath);
                 }else{
-                        if(!isSilent){
-                                print("Module match: " + parts[6] + " and " + parts[9]);
-                        }
-                        filePath = makeResourceUri(parts[6], parts[9], srcRoot, prefixes);
-                        resourceNsName = parts[6] + ':' + parts[9];             
-                }
-
-                if(!filePath || buildUtil.isValueInArray(resourceNsName, skiplist)){
-                        if(filePath && !isSilent){
-                                print("Skip intern resource: " + filePath);
-                        }
-                }else{
-                        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)));
+                        logger.trace("Interning resource path: " + filePath);
+                        //buildUtil.jsEscape will add starting and ending double-quotes.
+                        var jsEscapedContent = buildUtil.jsEscape(new String(fileUtil.readFile(filePath)));
                         if(jsEscapedContent){
                                 if(matchString.indexOf("dojo.uri.cache.allow") != -1){
@@ -885 +823 @@
 }
 
+buildUtil.jsEscape = function(/*string*/str){
+//summary:
+//      Adds escape sequences for non-visual characters, double quote and backslash
+//      and surrounds with double quotes to form a valid string literal.
+//      Take from the old dojo.string.escapeString code.
+//      Include it here so we don't have to load dojo.
+        return ('"' + str.replace(/(["\\])/g, '\\$1') + '"'
+                ).replace(/[\f]/g, "\\f"
+                ).replace(/[\b]/g, "\\b"
+                ).replace(/[\n]/g, "\\n"
+                ).replace(/[\t]/g, "\\t"
+                ).replace(/[\r]/g, "\\r"); // string
+}
+
 buildUtil.isValueInArray = function(/*Object*/value, /*Array*/ary){
         //summary: sees if value is in the ary array. Uses == to see if the