Subject: [Boost-commit] svn:boost r57231 - in sandbox/SCons: libs/regex/test tools/scons
From: loonycyborg_at_[hidden]
Date: 2009-10-29 13:41:24
Author: loonycyborg
Date: 2009-10-29 13:41:23 EDT (Thu, 29 Oct 2009)
New Revision: 57231
URL: http://svn.boost.org/trac/boost/changeset/57231
Log:
Implemented the remaining boost.regex regression test.
Text files modified:
sandbox/SCons/libs/regex/test/SConscript | 7 ++++++-
sandbox/SCons/tools/scons/boost-libs.py | 17 +++++++++--------
2 files changed, 15 insertions(+), 9 deletions(-)
Modified: sandbox/SCons/libs/regex/test/SConscript
==============================================================================
--- sandbox/SCons/libs/regex/test/SConscript (original)
+++ sandbox/SCons/libs/regex/test/SConscript 2009-10-29 13:41:23 EDT (Thu, 29 Oct 2009)
@@ -30,7 +30,7 @@
threaded_env.Append(CPPDEFINES = "TEST_THREADS", OBJPREFIX = "threaded_")
threaded_env.BoostUseLib("thread")
threaded_env.BoostRunTest("regex_regress_threaded", regress_sources)
-env.BoostRunTest("posix_api_check", "c_compiler_checks/posix_api_check.c")
+env.BoostRunTest("posix_api_check", "c_compiler_checks/posix_api_check.c", LINK = "$CXX")
env.BoostCompileTest("wide_posix_api_check", "c_compiler_checks/wide_posix_api_check.c")
env.BoostRunTest("posix_api_check_cpp", "c_compiler_checks/posix_api_check.cpp", OBJPREFIX = "cpp_")
env.BoostRunTest("wide_posix_api_check_cpp", "c_compiler_checks/wide_posix_api_check.cpp", OBJPREFIX = "cpp_")
@@ -47,3 +47,8 @@
concepts/concept_check
concepts/icu_concept_check
"""))
+regex_extra_env = env.Clone()
+regex_extra_env.Append(CPPDEFINES = ["BOOST_REGEX_MATCH_EXTRA"])
+regex_extra = regex_extra_env.BoostLibrary("regex_extra",
+ Glob("../src/*.cpp"), OBJPREFIX = "captures_", make_aliases = False)
+regex_extra_env.BoostRunTest("captures/captures_test", LIBS = [regex_extra])
Modified: sandbox/SCons/tools/scons/boost-libs.py
==============================================================================
--- sandbox/SCons/tools/scons/boost-libs.py (original)
+++ sandbox/SCons/tools/scons/boost-libs.py 2009-10-29 13:41:23 EDT (Thu, 29 Oct 2009)
@@ -2,18 +2,19 @@
import distutils.sysconfig
from SCons.Script import AddOption, COMMAND_LINE_TARGETS, BUILD_TARGETS
-def BoostLibrary(env, lib, sources):
+def BoostLibrary(env, lib, sources, make_aliases = True, **kw):
if env["LINK_DYNAMIC"]:
- lib_node = env.SharedLibrary("boost_" + lib + env["BOOST_SUFFIX"], sources)
+ lib_node = env.SharedLibrary("boost_" + lib + env["BOOST_SUFFIX"], sources, **kw)
else:
- lib_node = env.StaticLibrary("boost_" + lib + env["BOOST_SUFFIX"], sources)
+ lib_node = env.StaticLibrary("boost_" + lib + env["BOOST_SUFFIX"], sources, **kw)
- if env.GetOption("stage"):
- env.Alias(lib, env.Install(env.Dir("$stagedir", "#"), lib_node))
- env.Default(env.Alias(lib, lib_node))
+ if make_aliases:
+ if env.GetOption("stage"):
+ env.Alias(lib, env.Install(env.Dir("$stagedir", "#"), lib_node))
+ env.Default(env.Alias(lib, lib_node))
- if env.GetOption("install"):
- env.Alias(lib, env.Install("$prefix/lib", lib_node))
+ if env.GetOption("install"):
+ env.Alias(lib, env.Install("$prefix/lib", lib_node))
return lib_node
def BoostUseLib(env, lib):