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

Merge pull request #215 from grafikrobot/modular

Browse Source 
Add support for modular build structure.
This commit is contained in:
jzmaddock
2024-08-19 09:21:05 +01:00
committed by GitHub
parent cb55913293 1144c1dad8
commit dca0bdcd7e
9 changed files with 1679 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
build.jam Normal file
View File

@ -0,0 +1,30 @@
# Copyright René Ferdinand Rivera Morell 2023-2024
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)
require-b2 5.2 ;
constant boost_dependencies :
/boost/assert//boost_assert
/boost/concept_check//boost_concept_check
/boost/config//boost_config
/boost/predef//boost_predef
/boost/static_assert//boost_static_assert
/boost/throw_exception//boost_throw_exception
/boost/type_traits//boost_type_traits ;
project /boost/regex
: common-requirements
<include>include
;
explicit
[ alias boost_regex : build//boost_regex ]
[ alias all : boost_regex example test ]
;
call-if : boost-library regex
: install boost_regex
;

11
build/Jamfile.v2
View File

@ -7,9 +7,15 @@ import modules ;
import testing ; import testing ;
import errors ; import errors ;
constant boost_dependencies_private :
/boost/core//boost_core
;
project : requirements project : requirements
# default to all warnings on: # default to all warnings on:
<warnings>all <warnings>all
: common-requirements <library>$(boost_dependencies)
: requirements <library>$(boost_dependencies_private)
; ;
local disable-icu = [ MATCH (--disable-icu) : [ modules.peek : ARGV ] ] ; local disable-icu = [ MATCH (--disable-icu) : [ modules.peek : ARGV ] ] ;
@ -153,7 +159,6 @@ lib boost_regex : ../src/$(SOURCES) icu_options
: :
<link>shared:<define>BOOST_REGEX_DYN_LINK=1 <link>shared:<define>BOOST_REGEX_DYN_LINK=1
<toolset>gcc-cygwin:<link>static <toolset>gcc-cygwin:<link>static
: :
<define>BOOST_REGEX_NO_LIB=1
; ;
boost-install boost_regex ;

39
example/Jamfile.v2
View File

@ -5,18 +5,20 @@
project project
: requirements : requirements
<library>/boost/regex//boost_regex
<library>/boost/timer//boost_timer
<threading>multi <threading>multi
<link>shared:<define>BOOST_REGEX_DYN_LINK=1 <link>shared:<define>BOOST_REGEX_DYN_LINK=1
# There are unidentified linker problems on these platforms: # There are unidentified linker problems on these platforms:
<toolset>mipspro-7.4:<link>static <toolset>mipspro-7.4:<link>static
<toolset>sun-5.9:<link>static <toolset>sun-5.9:<link>static
<toolset>msvc:<warnings>all <toolset>msvc:<warnings>all
<toolset>gcc:<warnings>all <toolset>gcc:<warnings>extra
<toolset>gcc:<cxxflags>-Wextra
<define>U_USING_ICU_NAMESPACE=0 <define>U_USING_ICU_NAMESPACE=0
#<toolset>gcc-mw:<link>static #<toolset>gcc-mw:<link>static
#<toolset>gcc-mingw:<link>static #<toolset>gcc-mingw:<link>static
<toolset>gcc-cygwin:<link>static <toolset>gcc-cygwin:<link>static
<define>BOOST_TIMER_ENABLE_DEPRECATED
; ;
rule regex-test-run ( sources + : input * : name * ) rule regex-test-run ( sources + : input * : name * )
@ -26,7 +28,7 @@ rule regex-test-run ( sources + : input * : name * )
# sources # sources
$(sources) $(sources)
# dependencies # dependencies
../build//boost_regex /boost/regex//boost_regex
: # additional args : # additional args
$(input) $(input)
: # test-files : # test-files
@ -37,32 +39,33 @@ rule regex-test-run ( sources + : input * : name * )
] ; ] ;
} }
path-constant HERE : . ;
test-suite regex-examples : test-suite regex-examples :
[ regex-test-run timer/regex_timer.cpp : $(BOOST_ROOT)/libs/regex/example/timer/input_script.txt ] [ regex-test-run timer/regex_timer.cpp /boost/smart_ptr//boost_smart_ptr : $(HERE)/timer/input_script.txt ]
[ regex-test-run grep/grep.cpp ../../program_options/build//boost_program_options/<link>static : -n -b $(BOOST_ROOT)/boost/regex.hpp $(BOOST_ROOT)/boost/type_traits.hpp : test_grep ] [ regex-test-run grep/grep.cpp /boost/program_options//boost_program_options/<link>static : -n -b $(HERE)/../include/boost/regex.hpp : test_grep ]
[ regex-test-run snippets/credit_card_example.cpp ] [ regex-test-run snippets/credit_card_example.cpp ]
[ regex-test-run snippets/mfc_example.cpp ] [ regex-test-run snippets/mfc_example.cpp ]
[ regex-test-run snippets/icu_example.cpp ] [ regex-test-run snippets/icu_example.cpp ]
[ regex-test-run snippets/partial_regex_grep.cpp : $(BOOST_ROOT)/libs/regex/index.htm ] [ regex-test-run snippets/partial_regex_grep.cpp : $(HERE)/../index.htm ]
[ regex-test-run snippets/partial_regex_iterate.cpp : $(BOOST_ROOT)/libs/regex/index.htm ] [ regex-test-run snippets/partial_regex_iterate.cpp : $(HERE)/../index.htm ]
[ regex-test-run snippets/partial_regex_match.cpp : 1234-5678-8765-4 ] [ regex-test-run snippets/partial_regex_match.cpp : 1234-5678-8765-4 ]
[ regex-test-run snippets/regex_grep_example_1.cpp : $(BOOST_ROOT)/boost/regex/v5/regex_token_iterator.hpp ] [ regex-test-run snippets/regex_grep_example_1.cpp : $(HERE)/../include/boost/regex/v5/regex_iterator.hpp ]
[ regex-test-run snippets/regex_grep_example_2.cpp : $(BOOST_ROOT)/boost/regex/v5/regex_token_iterator.hpp ] [ regex-test-run snippets/regex_grep_example_2.cpp : $(HERE)/../include/boost/regex/v5/regex_iterator.hpp ]
[ regex-test-run snippets/regex_grep_example_3.cpp : $(BOOST_ROOT)/boost/regex/v5/regex_token_iterator.hpp ] [ regex-test-run snippets/regex_grep_example_3.cpp : $(HERE)/../include/boost/regex/v5/regex_iterator.hpp ]
[ regex-test-run snippets/regex_grep_example_4.cpp : $(BOOST_ROOT)/boost/regex/v5/regex_token_iterator.hpp ] [ regex-test-run snippets/regex_grep_example_4.cpp : $(HERE)/../include/boost/regex/v5/regex_iterator.hpp ]
[ regex-test-run snippets/regex_match_example.cpp : -auto ] [ regex-test-run snippets/regex_match_example.cpp : -auto ]
[ regex-test-run snippets/regex_merge_example.cpp : $(BOOST_ROOT)/boost/regex/v5/regex_token_iterator.hpp ] [ regex-test-run snippets/regex_merge_example.cpp : $(HERE)/../include/boost/regex/v5/regex_iterator.hpp ]
[ regex-test-run snippets/regex_replace_example.cpp : $(BOOST_ROOT)/boost/regex/v5/regex_token_iterator.hpp ] [ regex-test-run snippets/regex_replace_example.cpp : $(HERE)/../include/boost/regex/v5/regex_iterator.hpp ]
[ regex-test-run snippets/regex_search_example.cpp : $(BOOST_ROOT)/boost/regex/v5/regex_token_iterator.hpp ] [ regex-test-run snippets/regex_search_example.cpp : $(HERE)/../include/boost/regex/v5/regex_iterator.hpp ]
[ regex-test-run snippets/regex_split_example_1.cpp : -auto ] [ regex-test-run snippets/regex_split_example_1.cpp : -auto ]
[ regex-test-run snippets/regex_split_example_2.cpp : $(BOOST_ROOT)/libs/regex/doc/html/index.html ] [ regex-test-run snippets/regex_split_example_2.cpp : $(HERE)/../doc/html/index.html ]
[ regex-test-run snippets/regex_token_iterator_eg_1.cpp : -auto ] [ regex-test-run snippets/regex_token_iterator_eg_1.cpp : -auto ]
[ regex-test-run snippets/regex_token_iterator_eg_2.cpp : $(BOOST_ROOT)/libs/regex/doc/html/index.html ] [ regex-test-run snippets/regex_token_iterator_eg_2.cpp : $(HERE)/../doc/html/index.html ]
[ regex-test-run snippets/regex_iterator_example.cpp : $(BOOST_ROOT)/boost/regex/v5/regex_token_iterator.hpp ] [ regex-test-run snippets/regex_iterator_example.cpp : $(HERE)/../include/boost/regex/v5/regex_iterator.hpp ]
[ run snippets/captures_example.cpp [ run snippets/captures_example.cpp
../test/captures//boost_regex_extra ../test/captures//boost_regex_extra
: : : <threading>multi <define>BOOST_REGEX_MATCH_EXTRA=1 ] : : : <threading>multi <define>BOOST_REGEX_MATCH_EXTRA=1 ]
; ;

18
test/Jamfile.v2
View File

@ -5,6 +5,8 @@
project project
: requirements : requirements
<library>/boost/regex//boost_regex
<library>/boost/detail//boost_detail
<threading>multi <threading>multi
<link>shared:<define>BOOST_REGEX_DYN_LINK=1 <link>shared:<define>BOOST_REGEX_DYN_LINK=1
<toolset>msvc-7.1:<define>TEST_MFC=1 <toolset>msvc-7.1:<define>TEST_MFC=1
@ -20,6 +22,8 @@ project
#<toolset>gcc-mingw:<link>static #<toolset>gcc-mingw:<link>static
#<toolset>gcc-cygwin:<link>static #<toolset>gcc-cygwin:<link>static
<toolset>sun:<link>static <toolset>sun:<link>static
<include>../src
<include>.
; ;
# #
@ -27,7 +31,7 @@ project
# #
rule regex-test ( name : sources + : requirements * : input-files * ) rule regex-test ( name : sources + : requirements * : input-files * )
{ {
return [ run $(sources) ../build//boost_regex return [ run $(sources) /boost/regex//boost_regex
: :
: $(input-files) : $(input-files)
: $(requirements) : $(requirements)
@ -69,7 +73,7 @@ run regress/$(R_SOURCE) ../build//boost_regex ../build//icu_options
: regex_regress ; : regex_regress ;
run regress/$(R_SOURCE) ../build//boost_regex run regress/$(R_SOURCE) ../build//boost_regex
../../thread/build//boost_thread ../build//icu_options /boost/thread//boost_thread ../build//icu_options
: # command line : # command line
: # input files : # input files
: # requirements : # requirements
@ -77,7 +81,7 @@ run regress/$(R_SOURCE) ../build//boost_regex
: regex_regress_threaded ; : regex_regress_threaded ;
run regress/$(R_SOURCE) ../build//boost_regex run regress/$(R_SOURCE) ../build//boost_regex
../../thread/build//boost_thread ../build//icu_options /boost/thread//boost_thread ../build//icu_options
: # command line : # command line
: # input files : # input files
: # requirements : # requirements
@ -99,13 +103,13 @@ run object_cache/object_cache_test.cpp ;
run config_info/regex_config_info.cpp ../build//boost_regex/<link>static : : : <test-info>always_show_run_output ; run config_info/regex_config_info.cpp ../build//boost_regex/<link>static : : : <test-info>always_show_run_output ;
run config_info/regex_config_info.cpp ../build//boost_regex : : : <test-info>always_show_run_output : regex_dll_config_info ; run config_info/regex_config_info.cpp ../build//boost_regex : : : <test-info>always_show_run_output : regex_dll_config_info ;
run collate_info/collate_info.cpp ../build//boost_regex : : : <test-info>always_show_run_output : test_collate_info ; run collate_info/collate_info.cpp ../build//boost_regex : : : <test-info>always_show_run_output : test_collate_info ;
link concepts/concept_check.cpp : <toolset>gcc:<cxxflags>-Wno-deprecated-copy ; link concepts/concept_check.cpp /boost/range//boost_range : <toolset>gcc:<cxxflags>-Wno-deprecated-copy ;
link concepts/concept_check.cpp : <define>BOOST_REGEX_STANDALONE <toolset>gcc:<cxxflags>-Wno-deprecated-copy : standalone_concept_check ; link concepts/concept_check.cpp : <define>BOOST_REGEX_STANDALONE <toolset>gcc:<cxxflags>-Wno-deprecated-copy : standalone_concept_check ;
link concepts/icu_concept_check.cpp : <define>BOOST_REGEX_STANDALONE <toolset>gcc:<cxxflags>-Wno-deprecated-copy ; link concepts/icu_concept_check.cpp : <define>BOOST_REGEX_STANDALONE <toolset>gcc:<cxxflags>-Wno-deprecated-copy ;
link concepts/icu_concept_check.cpp : <toolset>gcc:<cxxflags>-Wno-deprecated-copy : standalone_icu_concept_check ; link concepts/icu_concept_check.cpp : <toolset>gcc:<cxxflags>-Wno-deprecated-copy : standalone_icu_concept_check ;
link concepts/range_concept_check.cpp : <toolset>gcc:<cxxflags>-Wno-deprecated-copy ; link concepts/range_concept_check.cpp : <toolset>gcc:<cxxflags>-Wno-deprecated-copy <library>/boost/range//boost_range ;
run concepts/test_bug_11988.cpp ; run concepts/test_bug_11988.cpp ;
run captures/captures_test.cpp ../build//icu_options : : : <threading>multi <define>BOOST_REGEX_MATCH_EXTRA=1 <define>BOOST_REGEX_NO_LIB=1 : captures_test ; run captures/captures_test.cpp ../build//icu_options /boost/array//boost_array : : : <threading>multi <define>BOOST_REGEX_MATCH_EXTRA=1 <define>BOOST_REGEX_NO_LIB=1 : captures_test ;
run regress/$(R_SOURCE) ./noeh_test//boost_regex_noeh ../build//icu_options : : : <define>BOOST_NO_EXCEPTIONS=1 <exception-handling>off <link>static <runtime-link>shared : regex_regress_noeh ; run regress/$(R_SOURCE) ./noeh_test//boost_regex_noeh ../build//icu_options : : : <define>BOOST_NO_EXCEPTIONS=1 <exception-handling>off <link>static <runtime-link>shared : regex_regress_noeh ;
compile test_consolidated.cpp ; compile test_consolidated.cpp ;
@ -130,4 +134,4 @@ compile test_windows_defs_2.cpp ;
compile test_windows_defs_3.cpp ; compile test_windows_defs_3.cpp ;
compile test_windows_defs_4.cpp ; compile test_windows_defs_4.cpp ;
run issue153.cpp : : : <toolset>msvc:<linkflags>-STACK:2097152 ; run issue153.cpp : : : "<toolset>msvc:<linkflags>-STACK:2097152" ;

2
test/cmake_install_test/CMakeLists.txt
View File

@ -15,4 +15,4 @@ target_link_libraries(quick Boost::regex Boost::core)
enable_testing() enable_testing()
add_test(quick quick) add_test(quick quick)
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>) add_custom_target(check VERBATIM COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)

2
test/cmake_subdir_test/CMakeLists.txt
View File

@ -20,4 +20,4 @@ target_link_libraries(quick Boost::regex Boost::core)
enable_testing() enable_testing()
add_test(quick quick) add_test(quick quick)
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>) add_custom_target(check VERBATIM COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C $<CONFIG>)

1569
test/config_info.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

2
test/config_info/regex_config_info.cpp
View File

@ -19,7 +19,7 @@
#endif #endif
#define main OLD_MAIN #define main OLD_MAIN
#include <libs/config/test/config_info.cpp> #include <config_info.cpp>
#undef main #undef main
#ifndef NEW_MAIN #ifndef NEW_MAIN
# define NEW_MAIN main # define NEW_MAIN main

4
test/test_consolidated.cpp
View File

@ -10,5 +10,5 @@
*/ */
#include <libs/regex/src/posix_api.cpp> #include <posix_api.cpp>
#include <libs/regex/src/wide_posix_api.cpp> #include <wide_posix_api.cpp>