Release 1.29.0 beta 1

[SVN r52601]

build/Jamfile.v2

@@ -10,10 +10,13 @@ project boost/regex
 #
 # ICU configuration:
 #
-local ICU_PATH = [ modules.peek : ICU_PATH ] ;
+if [ modules.peek : ICU_PATH ]
+{    
+    ICU_PATH =  [ modules.peek : ICU_PATH ] ;
+}
+
 rule check-icu-config ( )
 {
-   local ICU_PATH = [ modules.peek : ICU_PATH ] ;
    local HAVE_ICU = [ modules.peek : HAVE_ICU ] ;
    local ICU_LINK = [ modules.peek : ICU_LINK ] ;
 
@@ -59,8 +62,8 @@ rule check-icu-config ( )
             }
             else
             {
-               ECHO WARNING: ICU shared common library not found in path. ;
-               ECHO HINT:    If the regex library fails to link then try again ;
+               ECHO warning: ICU shared common library not found in path. ;
+               ECHO hint:    If the regex library fails to link then try again ;
                ECHO          with the environment variable ICU_LINK set to contain ;
                ECHO          the linker options required to link to ICU. ;
                ECHO          Defaulting to look for libicuuc ... ;
@@ -91,8 +94,8 @@ rule check-icu-config ( )
             }
             else
             {
-               ECHO WARNING: ICU shared i18n library not found in path. ;
-               ECHO HINT:    If the regex library fails to link then try again ;
+               ECHO warning: ICU shared i18n library not found in path. ;
+               ECHO hint:    If the regex library fails to link then try again ;
                ECHO          with the environment variable ICU_LINK set to contain ;
                ECHO          the linker options required to link to ICU. ;
                ECHO          Defaulting to look for libicui18n ... ;
@@ -127,15 +130,15 @@ rule check-icu-config ( )
                echo $(os) ;
                if $(os) != "DARWIN"
                {
-                  ECHO WARNING: ICU shared data library not found in path. ;
-                  ECHO HINT:    If the regex library fails to link then try again ;
+                  ECHO warning: ICU shared data library not found in path. ;
+                  ECHO hint:    If the regex library fails to link then try again ;
                   ECHO          with the environment variable ICU_LINK set to contain ;
                   ECHO          the linker options required to link to ICU. ;
                }
                else
                {
-                  ECHO WARNING: ICU shared data library not found in path. ;
-                  ECHO HINT:    If the regex library fails to link then try again ;
+                  ECHO warning: ICU shared data library not found in path. ;
+                  ECHO hint:    If the regex library fails to link then try again ;
                   ECHO          with the environment variable ICU_LINK set to contain ;
                   ECHO          the linker options required to link to ICU. ;
                   ECHO          Defaulting to look for libicudata ... ;
@@ -160,14 +163,14 @@ rule check-icu-config ( )
    else
    {
       message icu_config
-		: "Building Boost.Regex with the optional Unicode/ICU support disabled."
-		: "Note: Please refer to the Boost.Regex documentation for more information"
-		: "Note: this is a strictly optional feature." ;
+		: "warning: Building Boost.Regex with the optional Unicode/ICU support disabled."
+		: "note: Please refer to the Boost.Regex documentation for more information"
+		: "note: this is a strictly optional feature." ;
 
       if $(ICU_PATH)
       {
          message icu_config2 
-           : WARNING! ICU configuration failed
+           : warning! ICU configuration failed
            : "    Couldn't find utypes.h in " $(ICU_PATH:J=" ")/include/unicode ;
       }
       else

doc/Jamfile.v2

@@ -52,6 +52,7 @@ boostbook standalone
         # better use SVG's instead:
         <format>pdf:<xsl:param>admon.graphics.extension=".svg"
         <format>pdf:<xsl:param>admon.graphics.path=$(boost-images)/
+        <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/libs/regex/doc/html
     ;
 
 

include/boost/regex/config/cwchar.hpp

@@ -168,7 +168,7 @@ using ::wcscmp;
 inline int (wcscoll)(const wchar_t *p1, const wchar_t *p2)
 { return wcscoll(p1,p2); }
 #undef wcscoll
-#elif defined(BOOST_NO_STDC_NAMESPACE)
+#elif defined(BOOST_NO_STDC_NAMESPACE) && !defined(UNDER_CE)
 using ::wcscoll;
 #endif