From 977d07a3ae47ef204665d1eda2d642e5064724f3 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 24 Jun 2019 12:01:19 +0200 Subject: Split build system into library and driver --- build2/test/common.cxx | 4 ++-- build2/test/common.hxx | 6 +++--- build2/test/init.cxx | 8 ++++---- build2/test/init.hxx | 6 +++--- build2/test/module.hxx | 6 +++--- build2/test/operation.hxx | 6 +++--- build2/test/rule.cxx | 12 ++++++------ build2/test/rule.hxx | 8 ++++---- build2/test/script/builtin.cxx | 2 +- build2/test/script/builtin.hxx | 4 ++-- build2/test/script/lexer.hxx | 6 +++--- build2/test/script/lexer.test.cxx | 4 ++-- build2/test/script/parser.cxx | 6 ++++-- build2/test/script/parser.hxx | 8 ++++---- build2/test/script/parser.test.cxx | 10 +++++----- build2/test/script/regex.hxx | 4 ++-- build2/test/script/runner.cxx | 6 +++--- build2/test/script/runner.hxx | 4 ++-- build2/test/script/script.cxx | 4 ++-- build2/test/script/script.hxx | 6 +++--- build2/test/script/token.hxx | 6 +++--- build2/test/target.hxx | 6 +++--- 22 files changed, 67 insertions(+), 65 deletions(-) (limited to 'build2/test') diff --git a/build2/test/common.cxx b/build2/test/common.cxx index 161ba94..bbfd489 100644 --- a/build2/test/common.cxx +++ b/build2/test/common.cxx @@ -4,8 +4,8 @@ #include -#include -#include +#include +#include using namespace std; diff --git a/build2/test/common.hxx b/build2/test/common.hxx index f5d31c3..7ee72bd 100644 --- a/build2/test/common.hxx +++ b/build2/test/common.hxx @@ -5,10 +5,10 @@ #ifndef BUILD2_TEST_COMMON_HXX #define BUILD2_TEST_COMMON_HXX -#include -#include +#include +#include -#include +#include namespace build2 { diff --git a/build2/test/init.cxx b/build2/test/init.cxx index 342add7..725d557 100644 --- a/build2/test/init.cxx +++ b/build2/test/init.cxx @@ -4,10 +4,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/build2/test/init.hxx b/build2/test/init.hxx index 2ef0af7..f429645 100644 --- a/build2/test/init.hxx +++ b/build2/test/init.hxx @@ -5,10 +5,10 @@ #ifndef BUILD2_TEST_INIT_HXX #define BUILD2_TEST_INIT_HXX -#include -#include +#include +#include -#include +#include namespace build2 { diff --git a/build2/test/module.hxx b/build2/test/module.hxx index 02ba492..0c32fb9 100644 --- a/build2/test/module.hxx +++ b/build2/test/module.hxx @@ -5,10 +5,10 @@ #ifndef BUILD2_TEST_MODULE_HXX #define BUILD2_TEST_MODULE_HXX -#include -#include +#include +#include -#include +#include #include #include diff --git a/build2/test/operation.hxx b/build2/test/operation.hxx index 9b5f8db..09b954e 100644 --- a/build2/test/operation.hxx +++ b/build2/test/operation.hxx @@ -5,10 +5,10 @@ #ifndef BUILD2_TEST_OPERATION_HXX #define BUILD2_TEST_OPERATION_HXX -#include -#include +#include +#include -#include +#include namespace build2 { diff --git a/build2/test/rule.cxx b/build2/test/rule.cxx index a67ceff..7cb830c 100644 --- a/build2/test/rule.cxx +++ b/build2/test/rule.cxx @@ -4,11 +4,11 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -548,7 +548,7 @@ namespace build2 diag_frame::stack_guard dsg (ds); r = perform_script_impl (t, ts, wd, *this); }, - diag_frame::stack, + diag_frame::stack (), ref (r), cref (t), cref (ts), diff --git a/build2/test/rule.hxx b/build2/test/rule.hxx index 81952f9..2f0ef53 100644 --- a/build2/test/rule.hxx +++ b/build2/test/rule.hxx @@ -5,11 +5,11 @@ #ifndef BUILD2_TEST_RULE_HXX #define BUILD2_TEST_RULE_HXX -#include -#include +#include +#include -#include -#include +#include +#include #include diff --git a/build2/test/script/builtin.cxx b/build2/test/script/builtin.cxx index e4eb895..14ea267 100644 --- a/build2/test/script/builtin.cxx +++ b/build2/test/script/builtin.cxx @@ -15,7 +15,7 @@ #include // fdopen_mode, fdstream_mode #include -#include // sched +#include // sched #include diff --git a/build2/test/script/builtin.hxx b/build2/test/script/builtin.hxx index 2c6c0c5..af7c809 100644 --- a/build2/test/script/builtin.hxx +++ b/build2/test/script/builtin.hxx @@ -7,8 +7,8 @@ #include -#include -#include +#include +#include namespace build2 { diff --git a/build2/test/script/lexer.hxx b/build2/test/script/lexer.hxx index 5ab0cc0..ad1c386 100644 --- a/build2/test/script/lexer.hxx +++ b/build2/test/script/lexer.hxx @@ -5,10 +5,10 @@ #ifndef BUILD2_TEST_SCRIPT_LEXER_HXX #define BUILD2_TEST_SCRIPT_LEXER_HXX -#include -#include +#include +#include -#include +#include #include diff --git a/build2/test/script/lexer.test.cxx b/build2/test/script/lexer.test.cxx index 56418b7..c9905ec 100644 --- a/build2/test/script/lexer.test.cxx +++ b/build2/test/script/lexer.test.cxx @@ -5,8 +5,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/build2/test/script/parser.cxx b/build2/test/script/parser.cxx index 2ae0b05..59b950f 100644 --- a/build2/test/script/parser.cxx +++ b/build2/test/script/parser.cxx @@ -6,7 +6,7 @@ #include -#include // sched, keep_going +#include // sched, keep_going #include #include @@ -3013,7 +3013,9 @@ namespace build2 // If the scope was executed synchronously, check the status // and bail out if we weren't asked to keep going. // - const diag_frame* df (diag_frame::stack); // UBSan workaround. + // UBSan workaround. + // + const diag_frame* df (diag_frame::stack ()); if (!sched.async (task_count, [] (const diag_frame* ds, scope& s, diff --git a/build2/test/script/parser.hxx b/build2/test/script/parser.hxx index 9ca0cf1..dfa1126 100644 --- a/build2/test/script/parser.hxx +++ b/build2/test/script/parser.hxx @@ -5,11 +5,11 @@ #ifndef BUILD2_TEST_SCRIPT_PARSER_HXX #define BUILD2_TEST_SCRIPT_PARSER_HXX -#include -#include +#include +#include -#include -#include +#include +#include #include #include diff --git a/build2/test/script/parser.test.cxx b/build2/test/script/parser.test.cxx index ea5da0a..352941a 100644 --- a/build2/test/script/parser.test.cxx +++ b/build2/test/script/parser.test.cxx @@ -5,12 +5,12 @@ #include #include -#include -#include +#include +#include -#include -#include // reset() -#include +#include +#include // reset() +#include #include diff --git a/build2/test/script/regex.hxx b/build2/test/script/regex.hxx index 70de7ee..500c21b 100644 --- a/build2/test/script/regex.hxx +++ b/build2/test/script/regex.hxx @@ -12,8 +12,8 @@ #include // make_unsigned, enable_if, is_* #include -#include -#include +#include +#include namespace build2 { diff --git a/build2/test/script/runner.cxx b/build2/test/script/runner.cxx index 0d3716f..9031211 100644 --- a/build2/test/script/runner.cxx +++ b/build2/test/script/runner.cxx @@ -10,9 +10,9 @@ #include #include // fdopen_mode, fdnull(), fddup() -#include -#include -#include +#include +#include +#include #include diff --git a/build2/test/script/runner.hxx b/build2/test/script/runner.hxx index 843ff52..5f70dcc 100644 --- a/build2/test/script/runner.hxx +++ b/build2/test/script/runner.hxx @@ -5,8 +5,8 @@ #ifndef BUILD2_TEST_SCRIPT_RUNNER_HXX #define BUILD2_TEST_SCRIPT_RUNNER_HXX -#include -#include +#include +#include #include diff --git a/build2/test/script/script.cxx b/build2/test/script/script.cxx index 865c798..8e6351f 100644 --- a/build2/test/script/script.cxx +++ b/build2/test/script/script.cxx @@ -6,8 +6,8 @@ #include -#include -#include +#include +#include using namespace std; diff --git a/build2/test/script/script.hxx b/build2/test/script/script.hxx index 4da9d97..cc162cb 100644 --- a/build2/test/script/script.hxx +++ b/build2/test/script/script.hxx @@ -7,10 +7,10 @@ #include -#include -#include +#include +#include -#include +#include #include diff --git a/build2/test/script/token.hxx b/build2/test/script/token.hxx index d239787..c79ef1b 100644 --- a/build2/test/script/token.hxx +++ b/build2/test/script/token.hxx @@ -5,10 +5,10 @@ #ifndef BUILD2_TEST_SCRIPT_TOKEN_HXX #define BUILD2_TEST_SCRIPT_TOKEN_HXX -#include -#include +#include +#include -#include +#include namespace build2 { diff --git a/build2/test/target.hxx b/build2/test/target.hxx index b8b2d3d..6cd07b9 100644 --- a/build2/test/target.hxx +++ b/build2/test/target.hxx @@ -5,10 +5,10 @@ #ifndef BUILD2_TEST_TARGET_HXX #define BUILD2_TEST_TARGET_HXX -#include -#include +#include +#include -#include +#include namespace build2 { -- cgit v1.1