stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r531992 - in /incubator/stdcxx/trunk/etc/config/windows: build.wsf configure.wsf utilities.js
Date Tue, 24 Apr 2007 16:03:28 GMT
Author: faridz
Date: Tue Apr 24 09:03:28 2007
New Revision: 531992

URL: http://svn.apache.org/viewvc?view=rev&rev=531992
Log:
2007-04-24 Farid Zaripov <Farid_Zaripov@epam.com>

	* configure.wsf: "Checking" replaced with "checking" for consistency
	(checkHeaders): removed variable hdrname2.
	* utilities.js (stripTags): Rewritten to correctly extract text from Buildlog.htm.
	* build.wsf (event_ProjectBuildFinished): Removed invoking of the decodeHTML()
	because of this function invoked in stripTags().

Modified:
    incubator/stdcxx/trunk/etc/config/windows/build.wsf
    incubator/stdcxx/trunk/etc/config/windows/configure.wsf
    incubator/stdcxx/trunk/etc/config/windows/utilities.js

Modified: incubator/stdcxx/trunk/etc/config/windows/build.wsf
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/build.wsf?view=diff&rev=531992&r1=531991&r2=531992
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/build.wsf (original)
+++ incubator/stdcxx/trunk/etc/config/windows/build.wsf Tue Apr 24 09:03:28 2007
@@ -92,7 +92,7 @@
         var logStrm = fso.OpenTextFile(path, ForReading, false, format);
         log = logStrm.ReadAll();
         logStrm.Close();
-        log = decodeHTML(stripTags(log));
+        log = stripTags(log);
         var line = "-------";
         log = log.replace("Build Log", "").replace("Command Lines", line);
         log = log.replace("Output Window", line).replace("Results", line);

Modified: incubator/stdcxx/trunk/etc/config/windows/configure.wsf
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/configure.wsf?view=diff&rev=531992&r1=531991&r2=531992
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/configure.wsf (original)
+++ incubator/stdcxx/trunk/etc/config/windows/configure.wsf Tue Apr 24 09:03:28 2007
@@ -272,7 +272,7 @@
     removeFile(objName);
     var srcName = stageDir + "\\sanity.cpp";
     writeTextFile(srcName, "int main () { return 0; }\r\n");
-    WScript.StdOut.Write("Checking if compiler is sane... ");
+    WScript.StdOut.Write("checking if compiler is sane... ");
     var ret = compileFiles(srcName);
     if (ret == 0)
     {
@@ -288,7 +288,7 @@
     var exeName = "sanity.exe";
     var exeFullName = stageDir + "\\" + exeName;
     removeFile(exeFullName);
-    WScript.StdOut.Write("Checking if linker is sane... "); 
+    WScript.StdOut.Write("checking if linker is sane... "); 
     ret = linkFiles(objName, exeName);
     if (ret == 0)
     {
@@ -301,7 +301,7 @@
         return 0;
     }
     
-    WScript.StdOut.Write("Checking if run environment is sane... ");
+    WScript.StdOut.Write("checking if run environment is sane... ");
     ret = 1;
     try
     {
@@ -344,7 +344,7 @@
 function checkArchitecture()
 {
     //TODO: This test seems to be useless
-    WScript.StdOut.Write("Checking system architecture");
+    WScript.StdOut.Write("checking system architecture");
     var types = new Array("int", "long", "long long", "void*");
     var srcFile = stageDir + "\\arch.cpp";
     var objFile = stageDir + "\\arch.obj";
@@ -457,7 +457,7 @@
     hdrs = hdrs.replace(/  +/g, " ");
     var headers = hdrs.split(" ");
 
-    WScript.StdOut.WriteLine("Checking for headers... ");
+    WScript.StdOut.WriteLine("checking for headers... ");
 
     var noNewHeaders = false;
     for (i in headers)
@@ -473,7 +473,7 @@
             {
                 hdr = "c" + h;
             }           
-            WScript.StdOut.Write("Checking for <" + hdr + ">... ");
+            WScript.StdOut.Write("checking for <" + hdr + ">... ");
             var defstring = "_RWSTD_NO_" + hdr.toUpperCase();
             if (checkHeader(hdr) == 0)
             {
@@ -494,7 +494,7 @@
         // check for (deprecated C++) C library headers
         // or for any headers specified with the .h suffix
         hdr = hdr_base + ".h";
-            WScript.StdOut.Write("Checking for <" + hdr + ">... ");
+            WScript.StdOut.Write("checking for <" + hdr + ">... ");
         var sym = hdr_base.toUpperCase();
         var defstring = "_RWSTD_NO_" + sym + "_H";
         if (checkHeader(hdr) == 0)
@@ -534,7 +534,7 @@
     }
 
     // determine the support for namespaces
-    WScript.StdOut.Write("Checking for namespaces");
+    WScript.StdOut.Write("checking for namespaces");
     var noNamespaces = false;
     var ret = compileFiles(srcDir + "\\NAMESPACE.CPP");
     if (ret == 0)
@@ -606,25 +606,24 @@
         
             // determine which form of the header to #include
             var hdrname = hdr_base + ".h";
-            var hdrname2 = hdr_base + ".h";
             if (!useCHeader && !noNewHeaders)
             {
                 hdrname = "c" + hdr_base;
-                hdrname2 = "<c" + hdr_base + ">";
                 if (!noNamespaces)
                 {
                     std = "std::";
                 }
             }
 
+            hdrname = "<" + hdrname + ">";
             removeFile(exeFullName);
             removeFile(objFile);        
-            WScript.StdOut.Write("Checking for " + std + funname + "() in "
-                                     + hdrname2 + "... ");
+            WScript.StdOut.Write("checking for " + std + funname + "() in " +
+                                 hdrname + "... ");
             var sym = "_RWSTD_NO_" + funname.toUpperCase();
-            var defines = new Array("CHECK_DECL", "HDRNAME=<" + hdrname + ">"
-                                , "FUNNAME=" + funname
-                                , "FUN=" + fun, "TAKE_ADDR=" + take_addr);
+            var defines = new Array("CHECK_DECL", "HDRNAME=" + hdrname,
+                                    "FUNNAME=" + funname, "FUN=" + fun,
+                                    "TAKE_ADDR=" + take_addr);
             if (noNamespaces)
             {
                 defines.push("NONAMESPACE");
@@ -654,7 +653,7 @@
 
                 removeFile(exeFullName);
                 removeFile(objFile);
-                WScript.StdOut.Write("Checking for extern \"C\" "
+                WScript.StdOut.Write("checking for extern \"C\" "
                                         + funname + "() in libc... ");
                 ret = compileFiles(srcFile, "FUNNAME=" + funname);
                 if (ret == 0)

Modified: incubator/stdcxx/trunk/etc/config/windows/utilities.js
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/utilities.js?view=diff&rev=531992&r1=531991&r2=531992
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/utilities.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/utilities.js Tue Apr 24 09:03:28 2007
@@ -316,7 +316,11 @@
 // srcString - source string
 function stripTags(srcString)
 {
-    return srcString.replace(new RegExp("(<[\\s\\S]+?>)", "g"), "");
+    return decodeHTML(srcString).replace(new RegExp("> <", "g"), "><")
+           .replace(new RegExp("><", "g"), ">\r\n<")
+           .replace(new RegExp("(^<[\\s\\S]+?>)", "gm"), "")
+           .replace(new RegExp("\r", "g"), "")
+           .replace(new RegExp("\n{2,}", "g"), "\n\n");
 }
 
 // returns source string without first character if it equal to symbol



Mime
View raw message