Changeset 7302

Timestamp:

02/13/07 16:56:41 (22 months ago)

Author:

jburke

Message:

References #2366. Got a working comment stripping.

Location:

branches/0.4/buildscripts

Files:

• build.xml (modified) (1 diff)
• buildUtil.js (modified) (3 diffs)

branches/0.4/buildscripts/build.xml

@@ -279 +279 @@
         <!-- 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"

branches/0.4/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);
+                        }
+                }
+        }
+}
+