Create maintenance branch for 1.41.

[SVN r57781]

CMakeLists.txt

@@ -1,31 +0,0 @@
-#
-# Copyright Troy D. Straszheim
-#
-# Distributed under the Boost Software License, Version 1.0.
-# See http://www.boost.org/LICENSE_1_0.txt
-#
-#----------------------------------------------------------------------------
-# This file was automatically generated from the original CMakeLists.txt file
-# Add a variable to hold the headers for the library
-set (lib_headers
-    regex.h
-    regex.hpp
-    regex_fwd.hpp
-    regex
-    cregex.hpp
-)
-
-# Add a library target to the build system
-boost_library_project(
-  regex
-  SRCDIRS  src
-  TESTDIRS  test
-  HEADERS ${lib_headers}
-  #  DOCDIRS 
-  DESCRIPTION  "A regular expression library"
-  MODULARIZED
-  AUTHORS  "John Maddock <john -at- johnmaddock.co.uk>"
-  #  MAINTAINERS 
-)
-
-

build/Jamfile.v2

@@ -200,7 +200,7 @@ if $(gHAS_ICU)
       if $(ICU_PATH) != "/usr" && $(ICU_PATH) != "/usr/local"
       {
          BOOST_REGEX_ICU_OPTS += "<include>$(ICU_PATH)/include" ;
-         ICU_SEARCH_OPTS = <search>/$(ICU_PATH)/lib ;
+         ICU_SEARCH_OPTS = <search>$(ICU_PATH)/lib ;
       }
    }
    
@@ -221,17 +221,20 @@ if $(gHAS_ICU)
       {
          lib icucore : : <name>$(gICU_CORE_LIB) $(ICU_SEARCH_OPTS) <link>shared ;
          ICU_EXTRA_SOURCE = icucore ;
+         explicit icucore ;
       }
       if $(gICU_IN_LIB)
       {
          lib icuin : : <name>$(gICU_IN_LIB) $(ICU_SEARCH_OPTS) <link>shared ;
          ICU_EXTRA_SOURCE += icuin ;
+         explicit icuin ;
       }
 #Added by Tommy Nordgren libicudata must be linked against on Mac OS X
       if $(gICU_DATA_LIB)
       {
          lib icudata : : <name>$(gICU_DATA_LIB) $(ICU_SEARCH_OPTS) <link>shared ;
          ICU_EXTRA_SOURCE += icudata ;
+         explicit icudata ; 
       }
 #End of addition by Tommy Nordgren
    }
@@ -267,9 +270,36 @@ lib boost_regex : ../src/$(SOURCES) $(ICU_EXTRA_SOURCE) icu_config2 icu_config
 	     <toolset>gcc-mingw:<link>static
 	     <toolset>gcc-cygwin:<link>static
 	     $(BOOST_REGEX_ICU_OPTS)
+             <conditional>@force-shared-linking
     ;
 
+shared-linking-warning-emitted = ;
+
+# The ICU is shipped as shared libraries with dynamic runtime.
+# If Boost.Regex is built against static runtime, the combination
+# will not work. The below rule forces shared runtime, and
+# prints an explanation.
+rule force-shared-linking ( properties * )
+{
+    if $(gHAS_ICU)
+    {
+        if <runtime-link>static in $(properties)
+        {
+            if ! $(shared-linking-warning-emitted)
+            {
+                shared-linking-warning-emitted = 1 ;
+                ECHO "warning: forcing runtime-link=shared for Boost.Regex" ;
+                ECHO "warning: this is required when using the ICU library" ;
+            }
+        }        
+        return <runtime-link>shared ;
+    }    
+}
+
+
+
 alias icu_options : $(ICU_EXTRA_SOURCE) : : : $(BOOST_REGEX_ICU_OPTS) ;
+explicit icu_options ;
 
 boost-install boost_regex ;
 

include/boost/regex/v4/basic_regex_parser.hpp

@@ -2008,7 +2008,7 @@ insert_recursion:
          v = static_cast<int>(hash_value_from_capture_name(base, m_position));
          re_brace* br = static_cast<re_brace*>(this->append_state(syntax_element_assert_backref, sizeof(re_brace)));
          br->index = v;
-         if((*m_position != charT('>')) && (*m_position != charT('\'')) || (++m_position == m_end))
+         if(((*m_position != charT('>')) && (*m_position != charT('\''))) || (++m_position == m_end))
          {
             fail(regex_constants::error_badrepeat, m_position - m_base);
             return false;

module.cmake

@@ -1 +0,0 @@
-boost_module(regex DEPENDS date_time thread)

src/CMakeLists.txt

@@ -1,40 +0,0 @@
-#
-# Copyright Troy D. Straszheim
-#
-# Distributed under the Boost Software License, Version 1.0.
-# See http://www.boost.org/LICENSE_1_0.txt
-#
-# Look for the ICU library. If we find it, we'll compile in support for ICU
-include(FindICU)
-set(BOOST_REGEX_LIBRARIES)
-if (ICU_FOUND AND ICU_I18N_FOUND)
-  add_definitions(-DBOOST_HAS_ICU=1)
-  include_directories(${ICU_INCLUDE_DIRS})
-  set(BOOST_REGEX_LIBRARIES ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
-endif (ICU_FOUND AND ICU_I18N_FOUND)
- 
-boost_add_library(boost_regex
-   c_regex_traits.cpp
-   cpp_regex_traits.cpp
-   cregex.cpp
-   fileiter.cpp
-   icu.cpp
-   instances.cpp
-   posix_api.cpp
-   regex.cpp
-   regex_debug.cpp
-   regex_raw_buffer.cpp
-   regex_traits_defaults.cpp
-   static_mutex.cpp
-   w32_regex_traits.cpp
-   wc_regex_traits.cpp
-   wide_posix_api.cpp
-   winstances.cpp 
-   usinstances.cpp 
-   LINK_LIBS ${BOOST_REGEX_LIBRARIES}
-   SHARED_COMPILE_FLAGS -DBOOST_REGEX_DYN_LINK=1)
-
-
-
-
-

test/CMakeLists.txt

@@ -1,100 +0,0 @@
-#
-# Copyright Troy D. Straszheim
-#
-# Distributed under the Boost Software License, Version 1.0.
-# See http://www.boost.org/LICENSE_1_0.txt
-#
-boost_additional_test_dependencies(regex BOOST_DEPENDS test)
-
-# TODO: Default to multi-threaded?
-macro(regex_test TESTNAME)
-  parse_arguments(REGEX_TEST "" "" ${ARGN})
-
-  if (REGEX_TEST_DEFAULT_ARGS)
-    set(REGEX_TEST_SOURCES ${REGEX_TEST_DEFAULT_ARGS})
-  else (REGEX_TEST_DEFAULT_ARGS)
-    set(REGEX_TEST_SOURCES "${TESTNAME}.cpp")
-  endif (REGEX_TEST_DEFAULT_ARGS)
-
-  boost_test_run(${TESTNAME} ${REGEX_TEST_SOURCES} 
-    COMPILE_FLAGS "-DBOOST_REGEX_DYN_LINK=1"
-    DEPENDS boost_regex 
-    EXTRA_OPTIONS SHARED)
-endmacro(regex_test)
-
-set(R_SOURCES
-  regress/basic_tests.cpp
-  regress/main.cpp
-  regress/test_alt.cpp
-  regress/test_anchors.cpp
-  regress/test_asserts.cpp
-  regress/test_backrefs.cpp
-  regress/test_deprecated.cpp
-  regress/test_emacs.cpp
-  regress/test_escapes.cpp
-  regress/test_grep.cpp
-  regress/test_locale.cpp
-  regress/test_mfc.cpp
-  regress/test_non_greedy_repeats.cpp
-  regress/test_perl_ex.cpp
-  regress/test_replace.cpp
-  regress/test_sets.cpp
-  regress/test_simple_repeats.cpp
-  regress/test_tricky_cases.cpp
-  regress/test_icu.cpp
-  regress/test_unicode.cpp
-  regress/test_overloads.cpp
-  regress/test_operators.cpp
-  )
-
-boost_test_run(regex_regress ${R_SOURCES} DEPENDS boost_regex STATIC)
-boost_test_run(regex_regress_dll ${R_SOURCES} 
-  COMPILE_FLAGS "-DBOOST_REGEX_DYN_LINK=1"
-  DEPENDS boost_regex 
-  EXTRA_OPTIONS SHARED)
-boost_test_run(regex_regress_threaded ${R_SOURCES} 
-  COMPILE_FLAGS "-DTEST_THREADS -DBOOST_REGEX_DYN_LINK=1"
-  DEPENDS boost_regex boost_thread
-  EXTRA_OPTIONS SHARED MULTI_THREADED)
-
-regex_test(posix_api_check c_compiler_checks/posix_api_check.c)
-boost_test_compile(wide_posix_api_check_c c_compiler_checks/wide_posix_api_check.c)
-regex_test(posix_api_check_cpp c_compiler_checks/wide_posix_api_check.cpp)
-regex_test(bad_expression_test pathology/bad_expression_test.cpp)
-regex_test(recursion_test pathology/recursion_test.cpp)
-regex_test(unicode_iterator_test unicode/unicode_iterator_test.cpp)
-
-boost_test_run(static_mutex_test static_mutex/static_mutex_test.cpp
-  COMPILE_FLAGS "-DBOOST_REGEX_DYN_LINK=1"
-  DEPENDS boost_regex boost_thread
-  EXTRA_OPTIONS MULTI_THREADED SHARED)
-
-regex_test(object_cache_test object_cache/object_cache_test.cpp)
-boost_test_run(regex_config_info config_info/regex_config_info.cpp
-  DEPENDS boost_regex 
-  EXTRA_OPTIONS STATIC)
-
-boost_test_run(regex_dll_config_info config_info/regex_config_info.cpp
-  COMPILE_FLAGS "-DBOOST_REGEX_DYN_LINK=1"
-  DEPENDS boost_regex 
-  EXTRA_OPTIONS SHARED)
-
-regex_test(test_collate_info collate_info/collate_info.cpp)
-
-boost_test_compile(concept_check concepts/concept_check.cpp)
-boost_test_compile(ice_concept_check concepts/icu_concept_check.cpp)
-
-# TODO: Deal with this
-  #  [ run
-    # sources
-#    captures/captures_test.cpp
- #   captures//boost_regex_extra
- #:  # additional args
- #:  # test-files
- #:  # requirements
- #   <threading>multi
- #   <define>BOOST_REGEX_MATCH_EXTRA=1
- #   <define>BOOST_REGEX_NO_LIB=1
-# :  # test name
- #   captures_test
-# ]