Changeset 7304

Timestamp:

02/13/07 17:36:18 (22 months ago)

Author:

jburke

Message:

(merge from 0.4 branch) References #2366. Got a working comment stripping. Adjusted web build shell script to use comment stripping.

Location:

trunk/buildscripts

Files:

• build.xml (modified) (1 diff)
• buildUtil.js (modified) (3 diffs)
• webbuild/webbuild.sh (modified) (2 diffs)

trunk/buildscripts/build.xml

@@ -481 +481 @@
         <!-- end gen-strip-docs task -->
 
+        <!-- strip-resource-comments -->
+                <target name="strip-resource-comments">
+                <java jar="./lib/custom_rhino.jar" failonerror="true" fork="true" 
+                                logerror="true">
+                        <arg value="stripComments.js" />
+                        <arg value="${release_dir}"/>
+                </java>
+        </target>
+        <!-- end strip-resource-comments -->
+
         <!-- src task -->
         <target name="src"

trunk/buildscripts/buildUtil.js

@@ -860 +860 @@
                         //Don't process dojo.js since it has already been processed.
                         //Don't process dojo.js.uncompressed.js because it is huge.
-                        if(!fileList[i].match(/dojo\.js$/) && !fileList[i].match(/dojo\.js\.uncompressed\.js$/)){
+                        //Don't process anything that might be in a buildscripts folder (only a concern for webbuild.sh)
+                        if(!fileList[i].match(/dojo\.js$/)
+                                && !fileList[i].match(/dojo\.js\.uncompressed\.js$/)
+                                && !fileList[i].match(/buildscripts/)){
                                 print("Stripping comments from file: " + fileList[i]);
                                 
@@ -870 +873 @@
                                 
                                 //Get rid of cr, lf, since it messes up matching.
-                                fileContents = fileContents.replace(/\r/g, "__DOJOCARRIAGERETURN__").replace(/\n/g, "__DOJONEWLINE__");
-                                var multiLineMatches = fileContents.match(/\/\*.*?copyright.*?\*\//gi);
+                                copyrightFileContents = fileContents.replace(/\r/g, "__DOJOCARRIAGERETURN__").replace(/\n/g, "__DOJONEWLINE__");
+                                var multiLineMatches = copyrightFileContents.match(/\/\*.*?copyright.*?\*\//gi);
 
                                 //Finalize copyright notice.
@@ -887 +890 @@
 
                                 //Remove whitespace.
-                                var commandResults = buildUtil.runCommand("java -jar lib/custom_rhinoPrettyPrint.jar -strict -opt -1 -p " + fileList[i]);
+                                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();
+                                }
                                 
-                                if(commandResults.error){
-                                        print("ERROR. Skipping file. Error is: " + commandResults.error);
-                                }else{
-                                        fileContents = commandResults.result;
-        
-                                        //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 + buildUtil.getLineSeparator() + fileContents);
-                                }
-                        }
-                }
-        }
-}
-
-buildUtil.runCommand = function(/*String*/commandLineCommand){
-        //summary: runs a command on the command line.
-        var process = java.lang.Runtime.getRuntime().exec(commandLineCommand);
-        var resultReader = new java.io.BufferedReader(new java.io.InputStreamReader(process.getInputStream()));
-        var resultLine = null;
-        var result = "";
-        var lineSeparator = buildUtil.getLineSeparator();
-
-        var error = "";
-        var errorReader = new java.io.BufferedReader(new java.io.InputStreamReader(process.getErrorStream()));
-        //Only read one line of error, since waiting for all of it seems to hang.
-        //TODO: Fix that. There should be a way to get the complete error message.
-        if((resultLine = errorReader.readLine()) != null){
-                error += new String(resultLine) + lineSeparator;
-        }
-
-        if(error){
-                error = error.replace(/^\s*/, "").replace(/\s*$/, "");
-        }else{
-                while((resultLine = resultReader.readLine()) != null){
-                        result += new String(resultLine) + lineSeparator;
-                }
-        }
-
-        return {result: result, error: error}; //String
-}
+                                //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 + buildUtil.getLineSeparator() + fileContents);
+                        }
+                }
+        }
+}
+

trunk/buildscripts/webbuild/webbuild.sh

@@ -18 +18 @@
 #Do xdajax build.
 #Mark the dojo.js has an xdomain build, complete with xdomain path for Dojo.
-ant -Dprofile=ajax -DreleaseName=$version -DdojoLoader=xdomain -Dversion=$version$versionSuffix -DxdDojoUrl=$xdDojoUrl clean release intern-strings xd-dojo-config
+ant -Dprofile=ajax -DreleaseName=$version -DdojoLoader=xdomain -Dversion=$version$versionSuffix -DxdDojoUrl=$xdDojoUrl clean release intern-strings xd-dojo-config strip-resource-comments
 
-#src folders/buildscripts for the webbuild stuff.
-mkdir ../release
-
-cd ../release
+cd ../release/$version
 mkdir web
 cd web
-cp -r ../../src .
-cp -r ../../buildscripts .
-cp -r ../../dojo.js .
-cp -r ../../iframe_history.html .
-cp -r ../../flash6_gateway.swf .
-cp -r ../../DojoFileStorageProvider.jar .
-cp -r ../../storage_dialog.swf .
-cp -r ../../Storage_version6.swf .
-cp -r ../../Storage_version8.swf .
+cp -r ../../../src .
+cp -r ../../../buildscripts .
+cp -r ../../../dojo.js .
+cp -r ../../../iframe_history.html .
+cp -r ../../../flash6_gateway.swf .
+cp -r ../../../DojoFileStorageProvider.jar .
+cp -r ../../../storage_dialog.swf .
+cp -r ../../../Storage_version6.swf .
+cp -r ../../../Storage_version8.swf .
 
 #Stamp the web build with the xd Dojo URL and version.
@@ -43 +40 @@
 #Generate the list of modules for the web build process.
 java -jar ../lib/custom_rhino.jar makeWebBuildModuleList.js ../../src treeData.js
-cd ../../..
+
+#Got to buildscripts dir and run stripComments for web build.
+cd ..
+java -jar lib/custom_rhino.jar stripComments.js ../src
 
 #Now in release folder. Bundle it all up.
-mv web/ $version/
+cd ../../..
 zip -r dojo-$version.zip $version/*
 mv dojo-$version.zip ../..
 
-#Return to start directory.
+#Return to start directory
 cd ../../..