Skip to content
This repository has been archived by the owner on May 31, 2023. It is now read-only.

Commit

Permalink
Eradicate the boost regex library
Browse files Browse the repository at this point in the history
  • Loading branch information
Gregory W. Chicares committed Oct 2, 2021
1 parent 11464e0 commit 368ee55
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 230 deletions.
85 changes: 25 additions & 60 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,12 @@ bin_PROGRAMS = \
ihs_crc_comp \
product_files \
rate_table_tool \
test_coding_rules \
wx_test

if !LMI_MSW
bin_PROGRAMS += test_coding_rules
endif

# MD5 !! 'objects.make' copies lmi_md5sum$(EXEEXT) to $localbindir,
# which is not a standard autotools directory. This doesn't matter
# for production, because lmi itself no longer calls an external
Expand Down Expand Up @@ -244,7 +247,6 @@ libskeleton_la_LIBADD = \
libwx_new.la \
$(XMLWRAPP_LIBS) \
$(GTK_LIBS) \
$(BOOST_LIBS) \
$(WXPDFDOC_LIBS) \
$(WX_LIBS)

Expand All @@ -263,7 +265,6 @@ lmi_wx_LDADD = \
libwx_new.la \
$(XMLWRAPP_LIBS) \
$(GTK_LIBS) \
$(BOOST_LIBS) \
$(WXPDFDOC_LIBS) \
$(WX_LIBS)
if LMI_MSW
Expand All @@ -285,8 +286,7 @@ lmi_cli_SOURCES = \
lmi_cli_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
lmi_cli_LDADD = \
liblmi.la \
$(XMLWRAPP_LIBS) \
$(BOOST_LIBS)
$(XMLWRAPP_LIBS)

wx_test_SOURCES = \
main_wx_test.cpp \
Expand All @@ -311,7 +311,6 @@ wx_test_LDADD = \
libwx_new.la \
$(XMLWRAPP_LIBS) \
$(GTK_LIBS) \
$(BOOST_LIBS) \
$(WXPDFDOC_LIBS) \
$(WX_LIBS)

Expand Down Expand Up @@ -419,8 +418,6 @@ libantediluvian_la_SOURCES = \
libantediluvian_la_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
libantediluvian_la_CFLAGS = $(AM_CFLAGS)
libantediluvian_la_LDFLAGS = -no-undefined $(AM_LDFLAGS)
libantediluvian_la_LIBADD = \
$(BOOST_LIBS)

liblmi_la_SOURCES = \
authenticity.cpp \
Expand Down Expand Up @@ -470,8 +467,7 @@ liblmi_la_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
liblmi_la_CFLAGS = $(AM_CFLAGS)
liblmi_la_LDFLAGS = -no-undefined $(AM_LDFLAGS)
liblmi_la_LIBADD = \
$(XMLWRAPP_LIBS) \
$(BOOST_LIBS)
$(XMLWRAPP_LIBS)

libcgi_la_SOURCES = \
alert_cgi.cpp \
Expand All @@ -498,7 +494,6 @@ lmi_md5sum_SOURCES = \
md5sum_cli.cpp
lmi_md5sum_CXXFLAGS = $(AM_CXXFLAGS) $(BOOST_INCLUDE_FLAGS)
lmi_md5sum_LDADD = \
$(BOOST_LIBS) \
libmain_auxiliary_common.la

# MD5 !! Remove "timer.cpp" below.
Expand All @@ -517,7 +512,6 @@ generate_passkey_SOURCES = \
timer.cpp
generate_passkey_CXXFLAGS = $(AM_CXXFLAGS)
generate_passkey_LDADD = \
$(BOOST_LIBS) \
libmain_auxiliary_common.la

elapsed_time_SOURCES = \
Expand All @@ -533,16 +527,14 @@ antediluvian_cgi_CXXFLAGS = $(AM_CXXFLAGS) $(BOOST_INCLUDE_FLAGS)
antediluvian_cgi_LDADD = \
libcgi.la \
libantediluvian.la \
$(CGICC_LIBS) \
$(BOOST_LIBS)
$(CGICC_LIBS)

antediluvian_cli_SOURCES = \
$(cli_sources)
antediluvian_cli_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
antediluvian_cli_LDADD = \
libantediluvian.la \
liblmi.la \
$(BOOST_LIBS) \
$(XMLWRAPP_LIBS)

ihs_crc_comp_SOURCES = ihs_crc_comp.cpp
Expand All @@ -562,7 +554,6 @@ product_files_SOURCES = \
my_tier.cpp
product_files_LDADD = \
liblmi.la \
$(BOOST_LIBS) \
$(XMLWRAPP_LIBS)

rate_table_tool_SOURCES = \
Expand All @@ -573,7 +564,6 @@ rate_table_tool_SOURCES = \
rate_table_tool.cpp
rate_table_tool_LDADD = \
liblmi.la \
$(BOOST_LIBS) \
$(XMLWRAPP_LIBS)

test_coding_rules_SOURCES = \
Expand All @@ -586,10 +576,10 @@ test_coding_rules_SOURCES = \
my_test_coding_rules.cpp \
sigfpe.cpp \
test_coding_rules.cpp
test_coding_rules_CXXFLAGS = $(AM_CXXFLAGS) $(BOOST_INCLUDE_FLAGS)
test_coding_rules_CXXFLAGS = $(AM_CXXFLAGS) $(BOOST_INCLUDE_FLAGS) $(PCRE2_CFLAGS)
test_coding_rules_LDADD = \
libmain_auxiliary_common.la \
$(BOOST_LIBS)
$(PCRE2_LIBS)

# unit tests
libtest_common_la_SOURCES = \
Expand Down Expand Up @@ -619,15 +609,13 @@ actuarial_table_test_SOURCES = \
actuarial_table_test_CXXFLAGS = $(AM_CXXFLAGS)
actuarial_table_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS) \
$(XMLWRAPP_LIBS)

alert_test_LDADD = \
libtest_common.la

any_member_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS)
libtest_common.la

assert_lmi_test_LDADD = \
libtest_common.la
Expand All @@ -641,15 +629,13 @@ authenticity_test_SOURCES = \
system_command_non_wx.cpp
authenticity_test_CXXFLAGS = $(AM_CXXFLAGS)
authenticity_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS)
libtest_common.la

bourn_cast_test_LDADD = \
libtest_common.la

cache_file_reads_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS)
libtest_common.la

calendar_date_test_LDADD = \
libtest_common.la
Expand Down Expand Up @@ -679,7 +665,6 @@ configurable_settings_test_SOURCES = \
configurable_settings_test_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
configurable_settings_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS) \
$(XMLWRAPP_LIBS)

contains_test_LDADD = \
Expand Down Expand Up @@ -742,8 +727,7 @@ getopt_test_LDADD = \
libtest_common.la

global_settings_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS)
libtest_common.la

gpt_cf_triad_test_SOURCES = \
commutation_functions.cpp \
Expand All @@ -753,8 +737,7 @@ gpt_cf_triad_test_SOURCES = \
ihs_irc7702.cpp
gpt_cf_triad_test_CXXFLAGS = $(AM_CXXFLAGS)
gpt_cf_triad_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS)
libtest_common.la

gpt_test_SOURCES = \
commutation_functions.cpp \
Expand Down Expand Up @@ -785,8 +768,7 @@ input_seq_test_SOURCES = \
input_sequence_test.cpp
input_seq_test_CXXFLAGS = $(AM_CXXFLAGS)
input_seq_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS)
libtest_common.la

input_test_SOURCES = \
ce_product_name.cpp \
Expand Down Expand Up @@ -825,7 +807,6 @@ input_test_SOURCES = \
input_test_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
input_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS) \
$(XMLWRAPP_LIBS)

interpolate_string_test_SOURCES = \
Expand All @@ -842,8 +823,7 @@ irc7702_tables_test_SOURCES = \
irc7702_tables_test.cpp
irc7702_tables_test_CXXFLAGS = $(AM_CXXFLAGS)
irc7702_tables_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS)
libtest_common.la

irc7702a_test_SOURCES = \
ihs_irc7702a.cpp \
Expand All @@ -854,7 +834,6 @@ irc7702a_test_SOURCES = \
irc7702a_test_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
irc7702a_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS) \
$(XMLWRAPP_LIBS)

istream_to_string_test_LDADD = \
Expand All @@ -879,7 +858,6 @@ ledger_test_SOURCES = \
ledger_test_CXXFLAGS = $(AM_CXXFLAGS)
ledger_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS) \
$(XMLWRAPP_LIBS)

loads_test_SOURCES = \
Expand All @@ -906,17 +884,15 @@ mc_enum_test_SOURCES = \
mc_enum_test_aux.cpp
mc_enum_test_CXXFLAGS = $(AM_CXXFLAGS)
mc_enum_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS)
libtest_common.la

md5sum_test_SOURCES = \
md5.cpp \
md5sum.cpp \
md5sum_test.cpp
md5sum_test_CXXFLAGS = $(AM_CXXFLAGS)
md5sum_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS)
libtest_common.la

miscellany_test_LDADD = \
libtest_common.la
Expand All @@ -936,8 +912,7 @@ name_value_pairs_test_SOURCES = \
name_value_pairs_test.cpp
name_value_pairs_test_CXXFLAGS = $(AM_CXXFLAGS)
name_value_pairs_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS)
libtest_common.la

ncnnnpnn_test_LDADD = \
libtest_common.la
Expand All @@ -946,15 +921,13 @@ null_stream_test_LDADD = \
libtest_common.la

numeric_io_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS)
libtest_common.la

path_utility_test_SOURCES = \
path_utility_test.cpp \
wine_workarounds.cpp
path_utility_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS)
libtest_common.la

premium_tax_test_SOURCES = \
data_directory.cpp \
Expand All @@ -976,16 +949,14 @@ premium_tax_test_SOURCES = \
premium_tax_test_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
premium_tax_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS) \
$(XMLWRAPP_LIBS)

print_matrix_test_SOURCES = \
cso_table.cpp \
print_matrix_test.cpp
print_matrix_test_CXXFLAGS = $(AM_CXXFLAGS)
print_matrix_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS)
libtest_common.la

product_file_test_SOURCES = \
data_directory.cpp \
Expand All @@ -1010,7 +981,6 @@ product_file_test_SOURCES = \
product_file_test_CXXFLAGS = $(AM_CXXFLAGS)
product_file_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS) \
$(XMLWRAPP_LIBS)

progress_meter_test_SOURCES = \
Expand All @@ -1028,12 +998,11 @@ rate_table_test_SOURCES = \
rate_table_test_CXXFLAGS = $(AM_CXXFLAGS)
rate_table_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS) \
$(XMLWRAPP_LIBS)

regex_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS)
$(PCRE2_LIBS)

report_table_test_SOURCES = \
report_table.cpp \
Expand Down Expand Up @@ -1099,12 +1068,10 @@ tn_range_test_SOURCES = \
tn_range_test_aux.cpp
tn_range_test_CXXFLAGS = $(AM_CXXFLAGS)
tn_range_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS)
libtest_common.la

value_cast_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS)
libtest_common.la

vector_test_LDADD = \
libtest_common.la
Expand All @@ -1118,7 +1085,6 @@ xml_serialize_test_SOURCES = \
xml_serialize_test_CXXFLAGS = $(AM_CXXFLAGS) $(XMLWRAPP_CFLAGS)
xml_serialize_test_LDADD = \
libtest_common.la \
$(BOOST_LIBS) \
$(XMLWRAPP_LIBS)

zero_test_LDADD = \
Expand All @@ -1137,7 +1103,6 @@ noinst_HEADERS = \
authenticity.hpp \
basic_tables.hpp \
basic_values.hpp \
boost_regex.hpp \
bourn_cast.hpp \
cache_file_reads.hpp \
calendar_date.hpp \
Expand Down

0 comments on commit 368ee55

Please sign in to comment.