From 71a0e020e2c0982ccc04318765be189457ea8fa1 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Thu, 13 Jan 2005 17:06:21 +0000 Subject: [PATCH] merged changes in regex5 branch [SVN r26692] --- build/Jamfile | 143 +- build/Jamfile.v2 | 124 +- build/bcb6.mak | 458 +++- build/gcc-shared.mak | 110 +- build/gcc.mak | 109 +- build/gcc_gen.sh | 28 +- build/generic.mak | 28 +- build/sunpro.mak | 106 +- build/vc6-stlport.mak | 306 ++- build/vc6.mak | 402 ++-- build/vc7-stlport.mak | 306 ++- build/vc7.mak | 402 ++-- build/vc71-stlport.mak | 306 ++- build/vc71.mak | 402 ++-- build/vc_gen.sh | 45 +- doc/Attic/bad_expression.html | 54 +- doc/Attic/basic_regex.html | 309 ++- doc/Attic/captures.html | 2 +- doc/Attic/character_class_names.html | 326 +++ doc/Attic/collating_names.html | 368 +++ doc/Attic/concepts.html | 453 ++++ doc/Attic/configuration.html | 362 ++- doc/Attic/error_type.html | 140 ++ doc/Attic/examples.html | 69 +- doc/Attic/format_boost_syntax.html | 163 ++ doc/Attic/format_perl_syntax.html | 150 ++ doc/Attic/format_sed_syntax.html | 109 + doc/Attic/format_syntax.html | 293 +-- doc/Attic/headers.html | 14 +- doc/Attic/history.html | 26 +- doc/Attic/icu_strings.html | 467 ++++ doc/Attic/install.html | 96 +- doc/Attic/introduction.html | 3 +- doc/Attic/localisation.html | 1813 +++++++------- doc/Attic/match_flag_type.html | 28 +- doc/Attic/match_results.html | 5 +- doc/Attic/mfc_strings.html | 294 +++ doc/Attic/non_standard_strings.html | 53 + doc/Attic/redistributables.html | 47 +- doc/Attic/regex_grep.html | 32 +- doc/Attic/regex_iterator.html | 48 +- doc/Attic/regex_match.html | 81 +- doc/Attic/regex_replace.html | 25 +- doc/Attic/regex_search.html | 60 +- doc/Attic/regex_split.html | 12 +- doc/Attic/regex_token_iterator.html | 106 +- doc/Attic/regex_traits.html | 63 +- doc/Attic/standards.html | 195 +- doc/Attic/sub_match.html | 23 +- doc/Attic/syntax.html | 751 +----- doc/Attic/syntax_basic.html | 236 ++ doc/Attic/syntax_extended.html | 516 ++++ doc/Attic/syntax_leftmost_longest.html | 65 + doc/Attic/syntax_option_type.html | 547 +++-- doc/Attic/syntax_perl.html | 618 +++++ doc/Attic/unicode.html | 66 + doc/bad_expression.html | 54 +- doc/basic_regex.html | 309 ++- doc/captures.html | 2 +- doc/character_class_names.html | 326 +++ doc/collating_names.html | 368 +++ doc/concepts.html | 453 ++++ doc/configuration.html | 362 ++- doc/error_type.html | 140 ++ doc/examples.html | 69 +- doc/format_boost_syntax.html | 163 ++ doc/format_perl_syntax.html | 150 ++ doc/format_sed_syntax.html | 109 + doc/format_syntax.html | 293 +-- doc/gcc-performance.html | 6 +- doc/headers.html | 14 +- doc/history.html | 26 +- doc/icu_strings.html | 467 ++++ doc/index.html | 232 +- doc/install.html | 96 +- doc/introduction.html | 3 +- doc/localisation.html | 1813 +++++++------- doc/match_flag_type.html | 28 +- doc/match_results.html | 5 +- doc/mfc_strings.html | 294 +++ doc/non_standard_strings.html | 53 + doc/redistributables.html | 47 +- doc/regex_grep.html | 32 +- doc/regex_iterator.html | 48 +- doc/regex_match.html | 81 +- doc/regex_replace.html | 25 +- doc/regex_search.html | 60 +- doc/regex_split.html | 12 +- doc/regex_token_iterator.html | 106 +- doc/regex_traits.html | 63 +- doc/standards.html | 195 +- doc/sub_match.html | 23 +- doc/syntax.html | 751 +----- doc/syntax_basic.html | 236 ++ doc/syntax_extended.html | 516 ++++ doc/syntax_leftmost_longest.html | 65 + doc/syntax_option_type.html | 547 +++-- doc/syntax_perl.html | 618 +++++ doc/unicode.html | 66 + doc/vc71-performance.html | 5 +- example/Jamfile | 38 + example/Jamfile.v2 | 4 +- .../iso8859_1_regex_traits.cpp | 317 --- .../iso8859_1_regex_traits.hpp | 24 - example/iso8859_1_regex_traits/readme.txt | 49 - example/jgrep/jgrep.cpp | 2 + example/jgrep/jgrep.h | 10 +- example/jgrep/main.cpp | 58 +- example/snippets/captures_example.cpp | 13 +- example/snippets/icu_example.cpp | 182 ++ example/snippets/mfc_example.cpp | 162 ++ example/timer/regex_timer.cpp | 9 +- include/boost/cregex.hpp | 4 - include/boost/regex.hpp | 4 - include/boost/regex/concepts.hpp | 829 +++++++ include/boost/regex/config.hpp | 388 +-- include/boost/regex/config/borland.hpp | 9 + include/boost/regex/config/cstring.hpp | 303 --- include/boost/regex/icu.hpp | 897 +++++++ include/boost/regex/mfc.hpp | 185 ++ include/boost/regex/pattern_except.hpp | 43 +- include/boost/regex/pending/object_cache.hpp | 159 ++ include/boost/regex/pending/static_mutex.hpp | 180 ++ .../boost/regex/pending/unicode_iterator.hpp | 676 ++++++ include/boost/regex/static_mutex.hpp | 180 ++ include/boost/regex/v3/cregex.hpp | 314 --- include/boost/regex/v3/fileiter.hpp | 453 ---- include/boost/regex/v3/instances.hpp | 165 -- include/boost/regex/v3/regex.hpp | 1633 ------------- include/boost/regex/v3/regex_compile.hpp | 2122 ----------------- include/boost/regex/v3/regex_cstring.hpp | 131 - include/boost/regex/v3/regex_format.hpp | 576 ----- include/boost/regex/v3/regex_fwd.hpp | 67 - include/boost/regex/v3/regex_kmp.hpp | 108 - .../boost/regex/v3/regex_library_include.hpp | 181 -- include/boost/regex/v3/regex_match.hpp | 2013 ---------------- include/boost/regex/v3/regex_raw_buffer.hpp | 246 -- include/boost/regex/v3/regex_split.hpp | 149 -- include/boost/regex/v3/regex_stack.hpp | 224 -- include/boost/regex/v3/regex_synch.hpp | 210 -- include/boost/regex/v3/regex_traits.hpp | 815 ------- include/boost/regex/v4/basic_regex.hpp | 821 ++++--- .../boost/regex/v4/basic_regex_creator.hpp | 1201 ++++++++++ include/boost/regex/v4/basic_regex_parser.hpp | 2032 ++++++++++++++++ include/boost/regex/v4/c_regex_traits.hpp | 197 ++ include/boost/regex/v4/char_regex_traits.hpp | 15 - include/boost/regex/v4/cpp_regex_traits.hpp | 1048 ++++++++ include/boost/regex/v4/cregex.hpp | 93 +- include/boost/regex/v4/error_type.hpp | 62 + include/boost/regex/v4/instances.hpp | 21 +- include/boost/regex/v4/iterator_traits.hpp | 7 + include/boost/regex/v4/match_flags.hpp | 85 +- include/boost/regex/v4/match_results.hpp | 52 +- include/boost/regex/v4/mem_block_cache.hpp | 11 +- include/boost/regex/v4/perl_matcher.hpp | 172 +- .../boost/regex/v4/perl_matcher_common.hpp | 287 ++- .../regex/v4/perl_matcher_non_recursive.hpp | 392 +-- .../boost/regex/v4/perl_matcher_recursive.hpp | 234 +- .../boost/regex/v4}/primary_transform.hpp | 39 +- include/boost/regex/v4/protected_call.hpp | 65 + include/boost/regex/v4/regbase.hpp | 109 +- include/boost/regex/v4/regex.hpp | 88 +- include/boost/regex/v4/regex_format.hpp | 1055 ++++---- include/boost/regex/v4/regex_fwd.hpp | 38 +- include/boost/regex/v4/regex_grep.hpp | 21 +- include/boost/regex/v4/regex_iterator.hpp | 36 +- include/boost/regex/v4/regex_kmp.hpp | 2 +- include/boost/regex/v4/regex_match.hpp | 218 +- include/boost/regex/v4/regex_merge.hpp | 16 +- include/boost/regex/v4/regex_raw_buffer.hpp | 102 +- include/boost/regex/v4/regex_replace.hpp | 48 +- include/boost/regex/v4/regex_search.hpp | 75 +- include/boost/regex/v4/regex_split.hpp | 32 +- include/boost/regex/v4/regex_stack.hpp | 2 +- include/boost/regex/v4/regex_synch.hpp | 210 -- .../boost/regex/v4/regex_token_iterator.hpp | 66 +- include/boost/regex/v4/regex_traits.hpp | 1247 +--------- .../boost/regex/v4/regex_traits_defaults.hpp | 288 +++ include/boost/regex/v4/regex_workaround.hpp | 115 + include/boost/regex/v4/states.hpp | 78 +- include/boost/regex/v4/sub_match.hpp | 30 +- include/boost/regex/v4/syntax_type.hpp | 102 + include/boost/regex/v4/u32regex_iterator.hpp | 190 ++ .../regex/v4/u32regex_token_iterator.hpp | 365 +++ include/boost/regex/v4/w32_regex_traits.hpp | 712 ++++++ include/boost/regex_fwd.hpp | 4 - performance/Jamfile | 3 +- performance/command_line.cpp | 5 + performance/main.cpp | 16 + performance/regex_comparison.hpp | 13 +- performance/time_boost.cpp | 4 +- performance/time_dynamic_xpressive.cpp | 129 + performance/time_greta.cpp | 4 +- performance/time_localised_boost.cpp | 4 +- performance/time_pcre.cpp | 4 +- performance/time_posix.cpp | 6 +- performance/time_safe_greta.cpp | 4 +- src/c_regex_traits.cpp | 1165 ++------- src/c_regex_traits_common.cpp | 559 ----- src/cpp_regex_traits.cpp | 910 +------ src/cregex.cpp | 54 +- src/fileiter.cpp | 68 +- src/icu.cpp | 445 ++++ src/posix_api.cpp | 58 +- src/regex.cpp | 75 +- src/regex_debug.cpp | 195 +- src/regex_raw_buffer.cpp | 70 + src/regex_synch.cpp | 74 - src/regex_traits_defaults.cpp | 688 ++++++ src/static_mutex.cpp | 177 ++ src/usinstances.cpp | 50 + src/w32_regex_traits.cpp | 1401 +++-------- src/wc_regex_traits.cpp | 262 ++ src/wide_posix_api.cpp | 70 +- test/Jamfile | 109 +- test/Jamfile.v2 | 124 +- test/captures/Jamfile | 22 +- test/captures/Jamfile.v2 | 24 +- test/concepts/concept_check.cpp | 133 +- test/concepts/icu_concept_check.cpp | 150 ++ test/concepts/wide_concept_check.cpp | 71 - test/object_cache/object_cache_test.cpp | 75 + test/profile/Makefile | 11 + test/regress/basic_tests.cpp | 195 ++ test/regress/bc55.mak | 143 -- test/regress/bcb4.mak | 193 -- test/regress/bcb5.mak | 195 -- test/regress/bcb6.mak | 4 +- test/regress/gcc.mak | 9 +- test/regress/info.hpp | 184 ++ test/regress/main.cpp | 106 + test/regress/parse.cpp | 346 --- test/regress/regex_test.cpp | 194 -- test/regress/regress.cpp | 306 --- test/regress/regress.h | 10 +- test/regress/sunpro.mak | 4 +- test/regress/test.hpp | 243 ++ test/regress/test1252.txt | 34 - test/regress/test_alt.cpp | 46 + test/regress/test_anchors.cpp | 67 + test/regress/test_asserts.cpp | 69 + test/regress/test_backrefs.cpp | 43 + test/regress/test_deprecated.cpp | 316 +++ test/regress/test_deprecated.hpp | 35 + test/regress/test_emacs.cpp | 157 ++ test/regress/test_escapes.cpp | 145 ++ test/regress/test_grep.cpp | 54 + test/regress/test_icu.cpp | 513 ++++ test/regress/test_icu.hpp | 33 + test/regress/test_locale.cpp | 161 ++ test/regress/test_locale.hpp | 90 + test/regress/test_mfc.cpp | 551 +++++ test/regress/test_mfc.hpp | 36 + test/regress/test_non_greedy_repeats.cpp | 42 + test/regress/test_not_regex.hpp | 87 + test/regress/test_operators.cpp | 166 ++ test/regress/test_overloads.cpp | 46 + test/regress/test_partial_match.hpp | 388 +++ test/regress/test_perl_ex.cpp | 627 +++++ test/regress/test_regex_replace.hpp | 75 + test/regress/test_regex_search.hpp | 388 +++ test/regress/test_replace.cpp | 119 + test/regress/test_sets.cpp | 369 +++ test/regress/test_simple_repeats.cpp | 345 +++ test/regress/test_tricky_cases.cpp | 296 +++ test/regress/test_unicode.cpp | 162 ++ test/regress/v3_tests.txt | 908 ------- test/regress/vc6-stlport.mak | 4 +- test/regress/vc6.mak | 4 +- test/regress/vc7.mak | 4 +- test/regress/vc71.mak | 4 +- test/regress/wregex_test.cpp | 201 -- test/static_mutex/static_mutex_test.cpp | 181 ++ test/unicode/unicode_iterator_test.cpp | 203 ++ tools/generate/tables.cpp | 217 ++ 275 files changed, 37305 insertions(+), 27154 deletions(-) create mode 100644 doc/Attic/character_class_names.html create mode 100644 doc/Attic/collating_names.html create mode 100644 doc/Attic/concepts.html create mode 100644 doc/Attic/error_type.html create mode 100644 doc/Attic/format_boost_syntax.html create mode 100644 doc/Attic/format_perl_syntax.html create mode 100644 doc/Attic/format_sed_syntax.html create mode 100644 doc/Attic/icu_strings.html create mode 100644 doc/Attic/mfc_strings.html create mode 100644 doc/Attic/non_standard_strings.html create mode 100644 doc/Attic/syntax_basic.html create mode 100644 doc/Attic/syntax_extended.html create mode 100644 doc/Attic/syntax_leftmost_longest.html create mode 100644 doc/Attic/syntax_perl.html create mode 100644 doc/Attic/unicode.html create mode 100644 doc/character_class_names.html create mode 100644 doc/collating_names.html create mode 100644 doc/concepts.html create mode 100644 doc/error_type.html create mode 100644 doc/format_boost_syntax.html create mode 100644 doc/format_perl_syntax.html create mode 100644 doc/format_sed_syntax.html create mode 100644 doc/icu_strings.html create mode 100644 doc/mfc_strings.html create mode 100644 doc/non_standard_strings.html create mode 100644 doc/syntax_basic.html create mode 100644 doc/syntax_extended.html create mode 100644 doc/syntax_leftmost_longest.html create mode 100644 doc/syntax_perl.html create mode 100644 doc/unicode.html delete mode 100644 example/iso8859_1_regex_traits/iso8859_1_regex_traits.cpp delete mode 100644 example/iso8859_1_regex_traits/iso8859_1_regex_traits.hpp delete mode 100644 example/iso8859_1_regex_traits/readme.txt create mode 100644 example/snippets/icu_example.cpp create mode 100644 example/snippets/mfc_example.cpp create mode 100644 include/boost/regex/concepts.hpp delete mode 100644 include/boost/regex/config/cstring.hpp create mode 100644 include/boost/regex/icu.hpp create mode 100644 include/boost/regex/mfc.hpp create mode 100644 include/boost/regex/pending/object_cache.hpp create mode 100644 include/boost/regex/pending/static_mutex.hpp create mode 100644 include/boost/regex/pending/unicode_iterator.hpp create mode 100644 include/boost/regex/static_mutex.hpp delete mode 100644 include/boost/regex/v3/cregex.hpp delete mode 100644 include/boost/regex/v3/fileiter.hpp delete mode 100644 include/boost/regex/v3/instances.hpp delete mode 100644 include/boost/regex/v3/regex.hpp delete mode 100644 include/boost/regex/v3/regex_compile.hpp delete mode 100644 include/boost/regex/v3/regex_cstring.hpp delete mode 100644 include/boost/regex/v3/regex_format.hpp delete mode 100644 include/boost/regex/v3/regex_fwd.hpp delete mode 100644 include/boost/regex/v3/regex_kmp.hpp delete mode 100644 include/boost/regex/v3/regex_library_include.hpp delete mode 100644 include/boost/regex/v3/regex_match.hpp delete mode 100644 include/boost/regex/v3/regex_raw_buffer.hpp delete mode 100644 include/boost/regex/v3/regex_split.hpp delete mode 100644 include/boost/regex/v3/regex_stack.hpp delete mode 100644 include/boost/regex/v3/regex_synch.hpp delete mode 100644 include/boost/regex/v3/regex_traits.hpp create mode 100644 include/boost/regex/v4/basic_regex_creator.hpp create mode 100644 include/boost/regex/v4/basic_regex_parser.hpp create mode 100644 include/boost/regex/v4/c_regex_traits.hpp create mode 100644 include/boost/regex/v4/cpp_regex_traits.hpp create mode 100644 include/boost/regex/v4/error_type.hpp rename {src => include/boost/regex/v4}/primary_transform.hpp (74%) create mode 100644 include/boost/regex/v4/protected_call.hpp delete mode 100644 include/boost/regex/v4/regex_synch.hpp create mode 100644 include/boost/regex/v4/regex_traits_defaults.hpp create mode 100644 include/boost/regex/v4/regex_workaround.hpp create mode 100644 include/boost/regex/v4/syntax_type.hpp create mode 100644 include/boost/regex/v4/u32regex_iterator.hpp create mode 100644 include/boost/regex/v4/u32regex_token_iterator.hpp create mode 100644 include/boost/regex/v4/w32_regex_traits.hpp create mode 100644 performance/time_dynamic_xpressive.cpp delete mode 100644 src/c_regex_traits_common.cpp create mode 100644 src/icu.cpp create mode 100644 src/regex_raw_buffer.cpp delete mode 100644 src/regex_synch.cpp create mode 100644 src/regex_traits_defaults.cpp create mode 100644 src/static_mutex.cpp create mode 100644 src/usinstances.cpp create mode 100644 src/wc_regex_traits.cpp create mode 100644 test/concepts/icu_concept_check.cpp delete mode 100644 test/concepts/wide_concept_check.cpp create mode 100644 test/object_cache/object_cache_test.cpp create mode 100644 test/profile/Makefile create mode 100644 test/regress/basic_tests.cpp delete mode 100644 test/regress/bc55.mak delete mode 100644 test/regress/bcb4.mak delete mode 100644 test/regress/bcb5.mak create mode 100644 test/regress/info.hpp create mode 100644 test/regress/main.cpp delete mode 100644 test/regress/parse.cpp delete mode 100644 test/regress/regex_test.cpp delete mode 100644 test/regress/regress.cpp create mode 100644 test/regress/test.hpp delete mode 100644 test/regress/test1252.txt create mode 100644 test/regress/test_alt.cpp create mode 100644 test/regress/test_anchors.cpp create mode 100644 test/regress/test_asserts.cpp create mode 100644 test/regress/test_backrefs.cpp create mode 100644 test/regress/test_deprecated.cpp create mode 100644 test/regress/test_deprecated.hpp create mode 100644 test/regress/test_emacs.cpp create mode 100644 test/regress/test_escapes.cpp create mode 100644 test/regress/test_grep.cpp create mode 100644 test/regress/test_icu.cpp create mode 100644 test/regress/test_icu.hpp create mode 100644 test/regress/test_locale.cpp create mode 100644 test/regress/test_locale.hpp create mode 100644 test/regress/test_mfc.cpp create mode 100644 test/regress/test_mfc.hpp create mode 100644 test/regress/test_non_greedy_repeats.cpp create mode 100644 test/regress/test_not_regex.hpp create mode 100644 test/regress/test_operators.cpp create mode 100644 test/regress/test_overloads.cpp create mode 100644 test/regress/test_partial_match.hpp create mode 100644 test/regress/test_perl_ex.cpp create mode 100644 test/regress/test_regex_replace.hpp create mode 100644 test/regress/test_regex_search.hpp create mode 100644 test/regress/test_replace.cpp create mode 100644 test/regress/test_sets.cpp create mode 100644 test/regress/test_simple_repeats.cpp create mode 100644 test/regress/test_tricky_cases.cpp create mode 100644 test/regress/test_unicode.cpp delete mode 100644 test/regress/v3_tests.txt delete mode 100644 test/regress/wregex_test.cpp create mode 100644 test/static_mutex/static_mutex_test.cpp create mode 100644 test/unicode/unicode_iterator_test.cpp create mode 100644 tools/generate/tables.cpp diff --git a/build/Jamfile b/build/Jamfile index ca1bf157..7dfb768a 100644 --- a/build/Jamfile +++ b/build/Jamfile @@ -1,6 +1,117 @@ # copyright John Maddock 2003 subproject libs/regex/build ; +# bring in the rules for testing +import testing ; + +# +# ICU configuration: +# +rule check-icu-config ( ) +{ + if ! $(gICU_CONFIG_CHECKED) + { + if $(ICU_PATH) + { + dir += $(ICU_PATH) ; + } + + if [ GLOB $(dir)$(SLASH)include$(SLASH)unicode : utypes.h ] + { + ECHO Building Boost.Regex with Unicode/ICU support enabled ; + ECHO Using ICU in $(ICU_PATH:J=" ")$(SLASH)include ; + gHAS_ICU = true ; + + # try and find ICU libraries, look for NT versions first: + if $(ICU_LINK) + { + gICU_LIBS += $(ICU_LINK) ; + } + else if [ GLOB $(dir)$(SLASH)lib : icuuc.* ] + { + gICU_LIBS += icuuc ; + } + else if [ GLOB $(dir)$(SLASH)lib : libicuuc.* ] + { + gICU_LIBS += icuuc ; + } + else if [ GLOB $(ICU_PATH)/lib : cygicuuc.dll ] + { + gICU_LIBS += $(ICU_PATH)/lib/cygicuuc.dll ; + } + else if [ GLOB /usr/local/lib : cygicuuc.dll ] + { + gICU_LIBS += /usr/local/lib/cygicuuc.dll ; + } + else + { + ECHO ICU shared common library not found. ; + ECHO HINT: Set the environment variable ICU_LINK to contain ; + ECHO the linker options required to link to ICU. ; + } + + if $(ICU_LINK) + { + # gICU_LIBS += $(ICU_LINK) ; + } + else if [ GLOB $(dir)$(SLASH)lib : icuin.* ] + { + gICU_LIBS += icuin ; + } + else if [ GLOB $(dir)$(SLASH)lib : libicui18n.* ] + { + gICU_LIBS += icui18n ; + } + else if [ GLOB $(ICU_PATH)/lib : cygicuin.dll ] + { + gICU_LIBS += $(ICU_PATH)/lib/cygicuin.dll ; + } + else if [ GLOB /usr/local/lib : cygicuin.dll ] + { + gICU_LIBS += /usr/local/lib/cygicuin.dll ; + } + else + { + ECHO ICU shared i18n library not found. ; + ECHO HINT: Set the environment variable ICU_LINK to contain ; + ECHO the linker options required to link to ICU. ; + } + } + else + { + ECHO ****************************************************** ; + ECHO ; + ECHO Building Boost.Regex with Unicode/ICU support disabled. ; + ECHO HINT: define the environment variable ICU_PATH to point to the ; + ECHO root directy of your ICU installation if you have one. ; + ECHO Couldn't find utypes.h in $(ICU_PATH:J=" ")$(SLASH)include$(SLASH)unicode ; + ECHO ; + ECHO ****************************************************** ; + } + gICU_CONFIG_CHECKED = true ; + } + if $(gHAS_ICU) + { + return true ; + } +} + +if [ check-icu-config ] +{ + BOOST_REGEX_ICU_OPTS = "BOOST_HAS_ICU=1" ; + if $(gICU_LIBS) + { + BOOST_REGEX_ICU_OPTS += $(gICU_LIBS) ; + # this one is required for VC++ : + BOOST_REGEX_ICU_TEST_OPTS = "off" ; + } + if $(ICU_PATH) + { + BOOST_REGEX_ICU_OPTS += "$(ICU_PATH)/include" ; + BOOST_REGEX_ICU_OPTS += "$(ICU_PATH)/lib" ; + } + # ECHO "BOOST_REGEX_ICU_OPTS =" $(BOOST_REGEX_ICU_OPTS) ; +} # # this template defines the options common to @@ -14,6 +125,12 @@ template regex-options # on # como requires this: <*>BOOST_REGEX_NO_W32=1 + $(BOOST_REGEX_ICU_OPTS) + ; +template regex-test-options + : # sources + : # requirements + $(BOOST_REGEX_ICU_TEST_OPTS) ; # @@ -37,11 +154,27 @@ template msvc-stlport-tricky BOOST_ALL_NO_LIB=1 ; -SOURCES = c_regex_traits c_regex_traits_common cpp_regex_traits - cregex fileiter posix_api regex regex_debug - regex_synch w32_regex_traits wide_posix_api instances winstances ; +SOURCES = + 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 ; + -lib boost_regex : ../src/$(SOURCES).cpp