diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2019-06-24 12:01:19 +0200 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-07-01 18:13:55 +0300 |
commit | 977d07a3ae47ef204665d1eda2d642e5064724f3 (patch) | |
tree | 525a3d6421f61ce789b690191d3c30fc09be3517 /build2/test/script | |
parent | 7161b24963dd9da4d218f92c736b77c35c328a2d (diff) |
Split build system into library and driver
Diffstat (limited to 'build2/test/script')
-rw-r--r-- | build2/test/script/builtin.cxx | 2 | ||||
-rw-r--r-- | build2/test/script/builtin.hxx | 4 | ||||
-rw-r--r-- | build2/test/script/lexer.hxx | 6 | ||||
-rw-r--r-- | build2/test/script/lexer.test.cxx | 4 | ||||
-rw-r--r-- | build2/test/script/parser.cxx | 6 | ||||
-rw-r--r-- | build2/test/script/parser.hxx | 8 | ||||
-rw-r--r-- | build2/test/script/parser.test.cxx | 10 | ||||
-rw-r--r-- | build2/test/script/regex.hxx | 4 | ||||
-rw-r--r-- | build2/test/script/runner.cxx | 6 | ||||
-rw-r--r-- | build2/test/script/runner.hxx | 4 | ||||
-rw-r--r-- | build2/test/script/script.cxx | 4 | ||||
-rw-r--r-- | build2/test/script/script.hxx | 6 | ||||
-rw-r--r-- | build2/test/script/token.hxx | 6 |
13 files changed, 36 insertions, 34 deletions
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 <libbutl/fdstream.mxx> // fdopen_mode, fdstream_mode #include <libbutl/filesystem.mxx> -#include <build2/context.hxx> // sched +#include <libbuild2/context.hxx> // sched #include <build2/test/script/script.hxx> 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 <map> -#include <build2/types.hxx> -#include <build2/utility.hxx> +#include <libbuild2/types.hxx> +#include <libbuild2/utility.hxx> 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 <build2/types.hxx> -#include <build2/utility.hxx> +#include <libbuild2/types.hxx> +#include <libbuild2/utility.hxx> -#include <build2/lexer.hxx> +#include <libbuild2/lexer.hxx> #include <build2/test/script/token.hxx> 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 <cassert> #include <iostream> -#include <build2/types.hxx> -#include <build2/utility.hxx> +#include <libbuild2/types.hxx> +#include <libbuild2/utility.hxx> #include <build2/test/script/token.hxx> #include <build2/test/script/lexer.hxx> 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 <sstream> -#include <build2/context.hxx> // sched, keep_going +#include <libbuild2/context.hxx> // sched, keep_going #include <build2/test/script/lexer.hxx> #include <build2/test/script/runner.hxx> @@ -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 <build2/types.hxx> -#include <build2/utility.hxx> +#include <libbuild2/types.hxx> +#include <libbuild2/utility.hxx> -#include <build2/parser.hxx> -#include <build2/diagnostics.hxx> +#include <libbuild2/parser.hxx> +#include <libbuild2/diagnostics.hxx> #include <build2/test/script/token.hxx> #include <build2/test/script/script.hxx> 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 <cassert> #include <iostream> -#include <build2/types.hxx> -#include <build2/utility.hxx> +#include <libbuild2/types.hxx> +#include <libbuild2/utility.hxx> -#include <build2/target.hxx> -#include <build2/context.hxx> // reset() -#include <build2/scheduler.hxx> +#include <libbuild2/target.hxx> +#include <libbuild2/context.hxx> // reset() +#include <libbuild2/scheduler.hxx> #include <build2/test/target.hxx> 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 <type_traits> // make_unsigned, enable_if, is_* #include <unordered_set> -#include <build2/types.hxx> -#include <build2/utility.hxx> +#include <libbuild2/types.hxx> +#include <libbuild2/utility.hxx> 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 <libbutl/regex.mxx> #include <libbutl/fdstream.mxx> // fdopen_mode, fdnull(), fddup() -#include <build2/variable.hxx> -#include <build2/filesystem.hxx> -#include <build2/diagnostics.hxx> +#include <libbuild2/variable.hxx> +#include <libbuild2/filesystem.hxx> +#include <libbuild2/diagnostics.hxx> #include <build2/test/common.hxx> 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 <build2/types.hxx> -#include <build2/utility.hxx> +#include <libbuild2/types.hxx> +#include <libbuild2/utility.hxx> #include <build2/test/script/script.hxx> 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 <sstream> -#include <build2/target.hxx> -#include <build2/algorithm.hxx> +#include <libbuild2/target.hxx> +#include <libbuild2/algorithm.hxx> 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 <set> -#include <build2/types.hxx> -#include <build2/utility.hxx> +#include <libbuild2/types.hxx> +#include <libbuild2/utility.hxx> -#include <build2/variable.hxx> +#include <libbuild2/variable.hxx> #include <build2/test/target.hxx> 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 <build2/types.hxx> -#include <build2/utility.hxx> +#include <libbuild2/types.hxx> +#include <libbuild2/utility.hxx> -#include <build2/token.hxx> +#include <libbuild2/token.hxx> namespace build2 { |