feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Improved ICU handling.

Browse Source 
Brought auto-link test Jamfile up to date.


[SVN r29526]
This commit is contained in:
John Maddock
2005-06-11 14:21:21 +00:00
parent bbd5296b4e
commit a87dad5cc8
2 changed files with 67 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
build/Jamfile
View File

@ -30,10 +30,18 @@ rule check-icu-config ( )
else if [ GLOB $(dir)$(SLASH)lib : icuuc.* ] else if [ GLOB $(dir)$(SLASH)lib : icuuc.* ]
{ {
gICU_LIBS += <find-library>icuuc ; gICU_LIBS += <find-library>icuuc ;
if ($(ICU_PATH) != /usr) && ($(ICU_PATH) != /usr/local)
{
gICU_LIBS += <library-path>$(ICU_PATH)/lib ;
}
} }
else if [ GLOB $(dir)$(SLASH)lib : libicuuc.* ] else if [ GLOB $(dir)$(SLASH)lib : libicuuc.* ]
{ {
gICU_LIBS += <find-library>icuuc ; gICU_LIBS += <find-library>icuuc ;
if ($(ICU_PATH) != /usr) && ($(ICU_PATH) != /usr/local)
{
gICU_LIBS += <library-path>$(ICU_PATH)/lib ;
}
} }
else if [ GLOB $(ICU_PATH)/lib : cygicuuc.dll ] else if [ GLOB $(ICU_PATH)/lib : cygicuuc.dll ]
{ {
@ -45,9 +53,12 @@ rule check-icu-config ( )
} }
else else
{ {
ECHO ICU shared common library not found. ; ECHO WARNING: ICU shared common library not found in path. ;
ECHO HINT: Set the environment variable ICU_LINK to contain ; 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 the linker options required to link to ICU. ;
ECHO Defaulting to look for libicuuc ... ;
gICU_LIBS += <find-library>icuuc ;
} }
if $(ICU_LINK) if $(ICU_LINK)
@ -57,10 +68,18 @@ rule check-icu-config ( )
else if [ GLOB $(dir)$(SLASH)lib : icuin.* ] else if [ GLOB $(dir)$(SLASH)lib : icuin.* ]
{ {
gICU_LIBS += <find-library>icuin ; gICU_LIBS += <find-library>icuin ;
if ($(ICU_PATH) != /usr) && ($(ICU_PATH) != /usr/local)
{
gICU_LIBS += <library-path>$(ICU_PATH)/lib ;
}
} }
else if [ GLOB $(dir)$(SLASH)lib : libicui18n.* ] else if [ GLOB $(dir)$(SLASH)lib : libicui18n.* ]
{ {
gICU_LIBS += <find-library>icui18n ; gICU_LIBS += <find-library>icui18n ;
if ($(ICU_PATH) != /usr) && ($(ICU_PATH) != /usr/local)
{
gICU_LIBS += <library-path>$(ICU_PATH)/lib ;
}
} }
else if [ GLOB $(ICU_PATH)/lib : cygicuin.dll ] else if [ GLOB $(ICU_PATH)/lib : cygicuin.dll ]
{ {
@ -75,6 +94,13 @@ rule check-icu-config ( )
ECHO ICU shared i18n library not found. ; ECHO ICU shared i18n library not found. ;
ECHO HINT: Set the environment variable ICU_LINK to contain ; ECHO HINT: Set the environment variable ICU_LINK to contain ;
ECHO the linker options required to link to ICU. ; ECHO the linker options required to link to ICU. ;
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 ... ;
gICU_LIBS += <find-library>icui18n ;
} }
} }
else else
@ -105,9 +131,12 @@ if [ check-icu-config ]
BOOST_REGEX_ICU_TEST_OPTS = "<native-wchar_t>off" ; BOOST_REGEX_ICU_TEST_OPTS = "<native-wchar_t>off" ;
} }
if $(ICU_PATH) if $(ICU_PATH)
{
if ($(ICU_PATH) != /usr) && ($(ICU_PATH) != /usr/local)
{ {
BOOST_REGEX_ICU_OPTS += "<sysinclude>$(ICU_PATH)/include" ; BOOST_REGEX_ICU_OPTS += "<sysinclude>$(ICU_PATH)/include" ;
BOOST_REGEX_ICU_OPTS += "<library-path>$(ICU_PATH)/lib" ; }
#BOOST_REGEX_ICU_OPTS += "<library-path>$(ICU_PATH)/lib" ;
} }
# ECHO "BOOST_REGEX_ICU_OPTS =" $(BOOST_REGEX_ICU_OPTS) ; # ECHO "BOOST_REGEX_ICU_OPTS =" $(BOOST_REGEX_ICU_OPTS) ;
} }

83
test/auto-link-test/Jamfile
View File

@ -6,6 +6,32 @@
# it is not generally applicable. # it is not generally applicable.
# #
R_SOURCE =
basic_tests.cpp
main.cpp
test_alt.cpp
test_anchors.cpp
test_asserts.cpp
test_backrefs.cpp
test_deprecated.cpp
test_emacs.cpp
test_escapes.cpp
test_grep.cpp
test_locale.cpp
test_mfc.cpp
test_non_greedy_repeats.cpp
test_perl_ex.cpp
test_replace.cpp
test_sets.cpp
test_simple_repeats.cpp
test_tricky_cases.cpp
test_icu.cpp
test_unicode.cpp
test_overloads.cpp
test_operators.cpp
;
subproject libs/regex/test/auto-link-test ; subproject libs/regex/test/auto-link-test ;
# bring in the rules for testing # bring in the rules for testing
@ -14,10 +40,8 @@ import testing ;
run run
# sources # sources
<template>../../build/regex-options <template>../../build/regex-options
../regress/parse.cpp <template>../../build/regex-test-options
../regress/regress.cpp ../regress/$(R_SOURCE)
../regress/tests.cpp
<lib>../../../test/build/boost_prg_exec_monitor
: :
: # input files : # input files
../regress/tests.txt ../regress/tests.txt
@ -26,26 +50,6 @@ run
<define>BOOST_LIB_DIAGNOSTIC=1 <define>BOOST_LIB_DIAGNOSTIC=1
: # program name : # program name
regex_regress regex_regress
;
run
# sources
<template>../../build/regex-options
../regress/parse.cpp
../regress/regress.cpp
../regress/tests.cpp
<lib>../../../test/build/boost_prg_exec_monitor
:
: # input files
../regress/tests.txt
: # requirements
<library-path>../../../../stage/lib
<define>TEST_UNICODE=1
<define>BOOST_LIB_DIAGNOSTIC=1
: # program name
wide_regex_regress
; ;
# and now the dll versions: # and now the dll versions:
@ -53,10 +57,8 @@ run
run run
# sources # sources
<template>../../build/regex-options <template>../../build/regex-options
../regress/parse.cpp <template>../../build/regex-test-options
../regress/regress.cpp ../regress/$(R_SOURCE)
../regress/tests.cpp
<lib>../../../test/build/boost_prg_exec_monitor
: :
: # input files : # input files
../regress/tests.txt ../regress/tests.txt
@ -67,28 +69,9 @@ run
<define>BOOST_LIB_DIAGNOSTIC=1 <define>BOOST_LIB_DIAGNOSTIC=1
: # program name : # program name
regex_regress_dll regex_regress_dll
;
run
# sources
<template>../../build/regex-options
../regress/parse.cpp
../regress/regress.cpp
../regress/tests.cpp
<lib>../../../test/build/boost_prg_exec_monitor
:
: # input files
../regress/tests.txt
: # requirements
<define>BOOST_ALL_DYN_LINK=1
<runtime-link>dynamic
<library-path>../../../../stage/lib
<define>TEST_UNICODE=1
<define>BOOST_LIB_DIAGNOSTIC=1
: # program name
wide_regex_regress_dll
; ;