From 63130c1ef571f282bfdbb473a039c802c335e69e Mon Sep 17 00:00:00 2001 From: John Maddock Date: Sun, 9 Dec 2001 12:50:46 +0000 Subject: [PATCH] Updated Jamfiles and tests so that they actually work now! [SVN r11985] --- build/Jamfile | 6 +++++- example/Jamfile | 15 +++++++++++++++ test/Jamfile | 15 +++++++++++---- test/c_compiler_checks/posix_api_check.c | 2 ++ test/c_compiler_checks/posix_api_check.cpp | 2 ++ test/c_compiler_checks/wide_posix_api_check.c | 2 ++ test/c_compiler_checks/wide_posix_api_check.cpp | 2 ++ 7 files changed, 39 insertions(+), 5 deletions(-) diff --git a/build/Jamfile b/build/Jamfile index 93172bf1..35790e33 100644 --- a/build/Jamfile +++ b/build/Jamfile @@ -7,7 +7,8 @@ SOURCES = c_regex_traits c_regex_traits_common cpp_regex_traits lib libboost_regex$(SUFLIB) : ../src/$(SOURCES).cpp : $(BOOST_ROOT) - BOOST_RE_NO_LIB=1 + BOOST_REGEX_NO_LIB=1 + BOOST_REGEX_STATIC_LINK=1 : debug release ; @@ -23,3 +24,6 @@ dll libboost_regex$(SUFDLL[1]) : ../src/$(SOURCES).cpp + + + diff --git a/example/Jamfile b/example/Jamfile index 6fb1c600..ceaa5703 100644 --- a/example/Jamfile +++ b/example/Jamfile @@ -6,6 +6,7 @@ exe timer : timer/regex_timer.cpp : ../../../ BOOST_REGEX_NO_LIB=1 + BOOST_REGEX_STATIC_LINK=1 : debug ; @@ -15,6 +16,7 @@ exe jgrep : jgrep/jgrep.cpp jgrep/main.cpp : ../../../ BOOST_REGEX_NO_LIB=1 + BOOST_REGEX_STATIC_LINK=1 : debug ; @@ -24,6 +26,7 @@ exe credit_card_example : snippets/credit_card_example.cpp : ../../../ BOOST_REGEX_NO_LIB=1 + BOOST_REGEX_STATIC_LINK=1 : debug ; @@ -34,6 +37,7 @@ exe partial_regex_grep : snippets/partial_regex_grep.cpp : ../../../ BOOST_REGEX_NO_LIB=1 + BOOST_REGEX_STATIC_LINK=1 : debug ; @@ -43,6 +47,7 @@ exe partial_regex_match : snippets/partial_regex_match.cpp : ../../../ BOOST_REGEX_NO_LIB=1 + BOOST_REGEX_STATIC_LINK=1 : debug ; @@ -52,6 +57,7 @@ exe regex_grep_example_1 : snippets/regex_grep_example_1.cpp : ../../../ BOOST_REGEX_NO_LIB=1 + BOOST_REGEX_STATIC_LINK=1 : debug ; @@ -61,6 +67,7 @@ exe regex_grep_example_2 : snippets/regex_grep_example_2.cpp : ../../../ BOOST_REGEX_NO_LIB=1 + BOOST_REGEX_STATIC_LINK=1 : debug ; @@ -70,6 +77,7 @@ exe regex_grep_example_3 : snippets/regex_grep_example_3.cpp : ../../../ BOOST_REGEX_NO_LIB=1 + BOOST_REGEX_STATIC_LINK=1 : debug ; @@ -79,6 +87,7 @@ exe regex_grep_example_4 : snippets/regex_grep_example_4.cpp : ../../../ BOOST_REGEX_NO_LIB=1 + BOOST_REGEX_STATIC_LINK=1 : debug ; @@ -88,6 +97,7 @@ exe regex_match_example : snippets/regex_match_example.cpp : ../../../ BOOST_REGEX_NO_LIB=1 + BOOST_REGEX_STATIC_LINK=1 : debug ; @@ -97,6 +107,7 @@ exe regex_merge_example : snippets/regex_merge_example.cpp : ../../../ BOOST_REGEX_NO_LIB=1 + BOOST_REGEX_STATIC_LINK=1 : debug ; @@ -106,6 +117,7 @@ exe regex_search_example : snippets/regex_search_example.cpp : ../../../ BOOST_REGEX_NO_LIB=1 + BOOST_REGEX_STATIC_LINK=1 : debug ; @@ -115,6 +127,7 @@ exe regex_split_example_1 : snippets/regex_split_example_1.cpp : ../../../ BOOST_REGEX_NO_LIB=1 + BOOST_REGEX_STATIC_LINK=1 : debug ; @@ -124,6 +137,7 @@ exe regex_split_example_2 : snippets/regex_split_example_2.cpp : ../../../ BOOST_REGEX_NO_LIB=1 + BOOST_REGEX_STATIC_LINK=1 : debug ; @@ -132,3 +146,4 @@ exe regex_split_example_2 : snippets/regex_split_example_2.cpp + diff --git a/test/Jamfile b/test/Jamfile index 8117a46e..d5ef3300 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -12,6 +12,7 @@ unit-test regress : regress/parse.cpp regress/regress.cpp regress/tests.cpp : ../../../ BOOST_REGEX_NO_LIB=1 + BOOST_REGEX_STATIC_LINK=1 : debug : @@ -24,6 +25,7 @@ unit-test wregress : regress/parse.cpp regress/regress.cpp regress/tests.cpp ../../../ BOOST_REGEX_NO_LIB=1 TEST_UNICODE=1 + BOOST_REGEX_STATIC_LINK=1 : debug : @@ -35,10 +37,10 @@ unit-test posix_api_check_c : c_compiler_checks/posix_api_check.c : ../../../ BOOST_REGEX_NO_LIB=1 + BOOST_REGEX_STATIC_LINK=1 : debug : - $(test-files) ; unit-test wide_posix_api_check_c : c_compiler_checks/wide_posix_api_check.c @@ -46,10 +48,10 @@ unit-test wide_posix_api_check_c : c_compiler_checks/wide_posix_api_check.c : ../../../ BOOST_REGEX_NO_LIB=1 + BOOST_REGEX_STATIC_LINK=1 : debug : - $(test-files) ; unit-test posix_api_check : c_compiler_checks/posix_api_check.cpp @@ -57,10 +59,10 @@ unit-test posix_api_check : c_compiler_checks/posix_api_check.cpp : ../../../ BOOST_REGEX_NO_LIB=1 + BOOST_REGEX_STATIC_LINK=1 : debug : - $(test-files) ; unit-test wide_posix_api_check : c_compiler_checks/wide_posix_api_check.cpp @@ -68,12 +70,17 @@ unit-test wide_posix_api_check : c_compiler_checks/wide_posix_api_check.cpp : ../../../ BOOST_REGEX_NO_LIB=1 + BOOST_REGEX_STATIC_LINK=1 : debug : - $(test-files) ; + + + + + diff --git a/test/c_compiler_checks/posix_api_check.c b/test/c_compiler_checks/posix_api_check.c index 1d999f92..3b8d0eec 100644 --- a/test/c_compiler_checks/posix_api_check.c +++ b/test/c_compiler_checks/posix_api_check.c @@ -60,5 +60,7 @@ int main() } assert(matches[0].rm_so == matches[0].rm_eo == 1); regfree(&re); + printf("no errors found\n"); return 0; } + diff --git a/test/c_compiler_checks/posix_api_check.cpp b/test/c_compiler_checks/posix_api_check.cpp index 1d999f92..3b8d0eec 100644 --- a/test/c_compiler_checks/posix_api_check.cpp +++ b/test/c_compiler_checks/posix_api_check.cpp @@ -60,5 +60,7 @@ int main() } assert(matches[0].rm_so == matches[0].rm_eo == 1); regfree(&re); + printf("no errors found\n"); return 0; } + diff --git a/test/c_compiler_checks/wide_posix_api_check.c b/test/c_compiler_checks/wide_posix_api_check.c index d8c3a152..2f02d9df 100644 --- a/test/c_compiler_checks/wide_posix_api_check.c +++ b/test/c_compiler_checks/wide_posix_api_check.c @@ -62,6 +62,8 @@ int main() } assert(matches[0].rm_so == matches[0].rm_eo == 1); regfree(&re); + printf("no errors found\n"); return 0; } + diff --git a/test/c_compiler_checks/wide_posix_api_check.cpp b/test/c_compiler_checks/wide_posix_api_check.cpp index d8c3a152..2f02d9df 100644 --- a/test/c_compiler_checks/wide_posix_api_check.cpp +++ b/test/c_compiler_checks/wide_posix_api_check.cpp @@ -62,6 +62,8 @@ int main() } assert(matches[0].rm_so == matches[0].rm_eo == 1); regfree(&re); + printf("no errors found\n"); return 0; } +