stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r673125 - /stdcxx/branches/4.2.x/etc/config/windows/configure.wsf
Date Tue, 01 Jul 2008 16:12:18 GMT
Author: faridz
Date: Tue Jul  1 09:12:17 2008
New Revision: 673125

URL: http://svn.apache.org/viewvc?rev=673125&view=rev
Log:
2008-07-01  Farid Zaripov  <faridz@apache.com>

	* etc/config/windows/configure.wsf (checkArchitecture):
	Corrected regular expression's.
	(checkDependencies): Updated regular expression to find
	the macros, that exactly matches to the required dependency.

Modified:
    stdcxx/branches/4.2.x/etc/config/windows/configure.wsf

Modified: stdcxx/branches/4.2.x/etc/config/windows/configure.wsf
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/etc/config/windows/configure.wsf?rev=673125&r1=673124&r2=673125&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/etc/config/windows/configure.wsf (original)
+++ stdcxx/branches/4.2.x/etc/config/windows/configure.wsf Tue Jul  1 09:12:17 2008
@@ -391,11 +391,11 @@
             sizes += "-";
         }
     }
-    var rxLP32 = /24?4/;
-    var rxILP32 = /44?4/;
-    var rxILP64 = /88?8/;
+    var rxLP32 = /24.4/;
+    var rxILP32 = /44.4/;
+    var rxILP64 = /88.8/;
     var rxLLP64 = /4488/;
-    var rxLP64 = /48?8/;
+    var rxLP64 = /48.8/;
     var arch;
     if (rxLP32.test(sizes))
     {
@@ -920,7 +920,7 @@
         var dep = /_RWSTD_(?:NO_)?(\S+)/.exec(deps[i])[1];
         // remove _IN_LIBC | _IN_LIBM from dependency string
         dep = dep.replace(/_IN_LIB[CM]/, "");
-        var rx = new RegExp("_RWSTD_NO_" + dep);
+        var rx = new RegExp("\\s+_RWSTD_NO_" + dep + "\\s+");
         if (!rx.test(configText))
         {
             if (dumpUnresolved)



Mime
View raw message