diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2017-10-03 23:39:34 +0300 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2017-10-03 23:39:34 +0300 |
commit | 182d743d15810d2a8393ed7fa5d565cf3a394694 (patch) | |
tree | 9091af1cab7432db5331366f09a05cd5357a6764 | |
parent | 09839eea3a69e258555eb4ef6d05cd4799ccd7a0 (diff) | |
download | build2-182d743d15810d2a8393ed7fa5d565cf3a394694.tar.gz build2-182d743d15810d2a8393ed7fa5d565cf3a394694.tar.xz build2-182d743d15810d2a8393ed7fa5d565cf3a394694.zip |
Adapt to modularization of libbutl
33 files changed, 69 insertions, 69 deletions
diff --git a/build2/b.cxx b/build2/b.cxx index 746d5fdd..94c62796 100644 --- a/build2/b.cxx +++ b/build2/b.cxx @@ -15,8 +15,8 @@ #include <typeinfo> #include <iostream> // cout -#include <libbutl/pager.hxx> -#include <libbutl/fdstream.hxx> // stderr_fd(), fdterm() +#include <libbutl/pager.mxx> +#include <libbutl/fdstream.mxx> // stderr_fd(), fdterm() #include <build2/types.hxx> #include <build2/utility.hxx> diff --git a/build2/cc/compile.hxx b/build2/cc/compile.hxx index e744f53f..9d85763a 100644 --- a/build2/cc/compile.hxx +++ b/build2/cc/compile.hxx @@ -5,7 +5,7 @@ #ifndef BUILD2_CC_COMPILE_HXX #define BUILD2_CC_COMPILE_HXX -#include <libbutl/path-map.hxx> +#include <libbutl/path-map.mxx> #include <build2/types.hxx> #include <build2/utility.hxx> diff --git a/build2/cc/guess.cxx b/build2/cc/guess.cxx index 0e157a5c..da5be972 100644 --- a/build2/cc/guess.cxx +++ b/build2/cc/guess.cxx @@ -959,7 +959,7 @@ namespace build2 // Now we need to map x86, x64, and ARM to the target triplets. The // problem is, there aren't any established ones so we got to invent // them ourselves. Based on the discussion in - // <libbutl/target-triplet.hxx>, we need something in the + // <libbutl/target-triplet.mxx>, we need something in the // CPU-VENDOR-OS-ABI form. // // The CPU part is fairly straightforward with x86 mapped to 'i386' (or diff --git a/build2/cc/lexer.hxx b/build2/cc/lexer.hxx index 9dab12bc..2adf48cd 100644 --- a/build2/cc/lexer.hxx +++ b/build2/cc/lexer.hxx @@ -5,8 +5,8 @@ #ifndef BUILD2_CC_LEXER_HXX #define BUILD2_CC_LEXER_HXX -#include <libbutl/sha256.hxx> -#include <libbutl/char-scanner.hxx> +#include <libbutl/sha256.mxx> +#include <libbutl/char-scanner.mxx> #include <build2/types.hxx> #include <build2/utility.hxx> diff --git a/build2/cc/link.cxx b/build2/cc/link.cxx index 2f2ff76b..4ab2873d 100644 --- a/build2/cc/link.cxx +++ b/build2/cc/link.cxx @@ -7,8 +7,8 @@ #include <map> #include <cstdlib> // exit() -#include <libbutl/path-map.hxx> -#include <libbutl/filesystem.hxx> // file_exists() +#include <libbutl/path-map.mxx> +#include <libbutl/filesystem.mxx> // file_exists() #include <build2/depdb.hxx> #include <build2/scope.hxx> diff --git a/build2/config/module.hxx b/build2/config/module.hxx index 1f481811..fa29b621 100644 --- a/build2/config/module.hxx +++ b/build2/config/module.hxx @@ -7,7 +7,7 @@ #include <map> -#include <libbutl/prefix-map.hxx> +#include <libbutl/prefix-map.mxx> #include <build2/types.hxx> #include <build2/utility.hxx> diff --git a/build2/context.cxx b/build2/context.cxx index f7f24486..32af1c29 100644 --- a/build2/context.cxx +++ b/build2/context.cxx @@ -247,7 +247,7 @@ namespace build2 operation_table.insert ("uninstall"); // Create global scope. Note that the empty path is a prefix for any other - // path. See the comment in <libbutl/prefix-map.hxx> for details. + // path. See the comment in <libbutl/prefix-map.mxx> for details. // auto make_global_scope = [&sm] () -> scope& { diff --git a/build2/depdb.cxx b/build2/depdb.cxx index c74536cf..ee96efa2 100644 --- a/build2/depdb.cxx +++ b/build2/depdb.cxx @@ -4,7 +4,7 @@ #include <build2/depdb.hxx> -#include <libbutl/filesystem.hxx> // file_mtime() +#include <libbutl/filesystem.mxx> // file_mtime() using namespace std; using namespace butl; diff --git a/build2/diagnostics.cxx b/build2/diagnostics.cxx index 7b5663ae..b1f2796c 100644 --- a/build2/diagnostics.cxx +++ b/build2/diagnostics.cxx @@ -6,7 +6,7 @@ #include <cstring> // strchr() -#include <libbutl/process-io.hxx> +#include <libbutl/process-io.mxx> using namespace std; diff --git a/build2/diagnostics.hxx b/build2/diagnostics.hxx index 40ddd0c7..dc963525 100644 --- a/build2/diagnostics.hxx +++ b/build2/diagnostics.hxx @@ -5,7 +5,7 @@ #ifndef BUILD2_DIAGNOSTICS_HXX #define BUILD2_DIAGNOSTICS_HXX -#include <libbutl/diagnostics.hxx> +#include <libbutl/diagnostics.mxx> #include <build2/types.hxx> #include <build2/utility.hxx> diff --git a/build2/dist/operation.cxx b/build2/dist/operation.cxx index 01339b4d..f42217e4 100644 --- a/build2/dist/operation.cxx +++ b/build2/dist/operation.cxx @@ -4,7 +4,7 @@ #include <build2/dist/operation.hxx> -#include <libbutl/filesystem.hxx> // path_match() +#include <libbutl/filesystem.mxx> // path_match() #include <build2/file.hxx> #include <build2/dump.hxx> diff --git a/build2/filesystem.hxx b/build2/filesystem.hxx index 4ef4caff..8d1a7f00 100644 --- a/build2/filesystem.hxx +++ b/build2/filesystem.hxx @@ -5,12 +5,12 @@ #ifndef BUILD2_FILESYSTEM_HXX #define BUILD2_FILESYSTEM_HXX -#include <libbutl/filesystem.hxx> +#include <libbutl/filesystem.mxx> #include <build2/types.hxx> #include <build2/utility.hxx> -// Higher-level filesystem utilities built on top of <libbutl/filesystem.hxx>. +// Higher-level filesystem utilities built on top of <libbutl/filesystem.mxx>. // namespace build2 { @@ -19,7 +19,7 @@ namespace build2 // The dual interface wrapper for the {mk,rm}{file,dir}() functions // below that allows you to use it as a true/false return or a more - // detailed enum from <libbutl/filesystem.hxx> + // detailed enum from <libbutl/filesystem.mxx> // template <typename T> struct fs_status diff --git a/build2/functions-filesystem.cxx b/build2/functions-filesystem.cxx index d9e74b7a..84b414ee 100644 --- a/build2/functions-filesystem.cxx +++ b/build2/functions-filesystem.cxx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <libbutl/filesystem.hxx> +#include <libbutl/filesystem.mxx> #include <build2/function.hxx> #include <build2/variable.hxx> diff --git a/build2/functions-regex.cxx b/build2/functions-regex.cxx index 3185b853..da5cad9b 100644 --- a/build2/functions-regex.cxx +++ b/build2/functions-regex.cxx @@ -4,7 +4,7 @@ #include <sstream> -#include <libbutl/regex.hxx> +#include <libbutl/regex.mxx> #include <build2/function.hxx> #include <build2/variable.hxx> diff --git a/build2/install/rule.cxx b/build2/install/rule.cxx index 928384af..f7643637 100644 --- a/build2/install/rule.cxx +++ b/build2/install/rule.cxx @@ -4,7 +4,7 @@ #include <build2/install/rule.hxx> -#include <libbutl/filesystem.hxx> // dir_exists(), file_exists() +#include <libbutl/filesystem.mxx> // dir_exists(), file_exists() #include <build2/scope.hxx> #include <build2/target.hxx> diff --git a/build2/lexer.hxx b/build2/lexer.hxx index e91e7309..d88d5ba9 100644 --- a/build2/lexer.hxx +++ b/build2/lexer.hxx @@ -7,7 +7,7 @@ #include <stack> -#include <libbutl/char-scanner.hxx> +#include <libbutl/char-scanner.mxx> #include <build2/types.hxx> #include <build2/utility.hxx> diff --git a/build2/operation.hxx b/build2/operation.hxx index 06a67814..24340ddd 100644 --- a/build2/operation.hxx +++ b/build2/operation.hxx @@ -5,7 +5,7 @@ #ifndef BUILD2_OPERATION_HXX #define BUILD2_OPERATION_HXX -#include <libbutl/string-table.hxx> +#include <libbutl/string-table.mxx> #include <build2/types.hxx> #include <build2/utility.hxx> diff --git a/build2/parser.cxx b/build2/parser.cxx index 5188b39e..fb47ff63 100644 --- a/build2/parser.cxx +++ b/build2/parser.cxx @@ -6,7 +6,7 @@ #include <iostream> // cout -#include <libbutl/filesystem.hxx> // path_search(), path_match() +#include <libbutl/filesystem.mxx> // path_search(), path_match() #include <build2/file.hxx> #include <build2/scope.hxx> diff --git a/build2/rule-map.hxx b/build2/rule-map.hxx index 4afe3d4e..f63d4b99 100644 --- a/build2/rule-map.hxx +++ b/build2/rule-map.hxx @@ -7,7 +7,7 @@ #include <map> -#include <libbutl/prefix-map.hxx> +#include <libbutl/prefix-map.mxx> #include <build2/types.hxx> #include <build2/utility.hxx> diff --git a/build2/scope.hxx b/build2/scope.hxx index 028dbce5..ad1b2956 100644 --- a/build2/scope.hxx +++ b/build2/scope.hxx @@ -8,7 +8,7 @@ #include <unordered_set> #include <unordered_map> -#include <libbutl/path-map.hxx> +#include <libbutl/path-map.mxx> #include <build2/types.hxx> #include <build2/utility.hxx> diff --git a/build2/search.cxx b/build2/search.cxx index 66f13a9e..892141aa 100644 --- a/build2/search.cxx +++ b/build2/search.cxx @@ -4,7 +4,7 @@ #include <build2/search.hxx> -#include <libbutl/filesystem.hxx> // file_mtime() +#include <libbutl/filesystem.mxx> // file_mtime() #include <build2/scope.hxx> #include <build2/target.hxx> diff --git a/build2/target-key.hxx b/build2/target-key.hxx index 0c935809..b7335eb4 100644 --- a/build2/target-key.hxx +++ b/build2/target-key.hxx @@ -7,7 +7,7 @@ #include <map> -#include <libbutl/utility.hxx> // compare_c_string +#include <libbutl/utility.mxx> // compare_c_string #include <build2/types.hxx> #include <build2/utility.hxx> diff --git a/build2/target.cxx b/build2/target.cxx index 7ff995d4..d3af0c5c 100644 --- a/build2/target.cxx +++ b/build2/target.cxx @@ -4,7 +4,7 @@ #include <build2/target.hxx> -#include <libbutl/filesystem.hxx> // file_mtime() +#include <libbutl/filesystem.mxx> // file_mtime() #include <build2/file.hxx> #include <build2/scope.hxx> diff --git a/build2/target.hxx b/build2/target.hxx index 62e77792..ddff33b5 100644 --- a/build2/target.hxx +++ b/build2/target.hxx @@ -9,7 +9,7 @@ #include <type_traits> // aligned_storage #include <unordered_map> -#include <libbutl/multi-index.hxx> // map_iterator_adapter +#include <libbutl/multi-index.mxx> // map_iterator_adapter #include <build2/types.hxx> #include <build2/utility.hxx> diff --git a/build2/target.txx b/build2/target.txx index d2afd597..a91166cc 100644 --- a/build2/target.txx +++ b/build2/target.txx @@ -2,7 +2,7 @@ // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <libbutl/filesystem.hxx> // dir_iterator +#include <libbutl/filesystem.mxx> // dir_iterator #include <build2/scope.hxx> #include <build2/diagnostics.hxx> diff --git a/build2/test/script/builtin.cxx b/build2/test/script/builtin.cxx index ca47ad22..80954a1d 100644 --- a/build2/test/script/builtin.cxx +++ b/build2/test/script/builtin.cxx @@ -8,10 +8,10 @@ #include <ostream> #include <sstream> -#include <libbutl/regex.hxx> -#include <libbutl/path-io.hxx> // use default operator<< implementation -#include <libbutl/fdstream.hxx> // fdopen_mode, fdstream_mode -#include <libbutl/filesystem.hxx> // mkdir_status +#include <libbutl/regex.mxx> +#include <libbutl/path-io.mxx> // use default operator<< implementation +#include <libbutl/fdstream.mxx> // fdopen_mode, fdstream_mode +#include <libbutl/filesystem.mxx> // mkdir_status #include <build2/test/script/script.hxx> diff --git a/build2/test/script/runner.cxx b/build2/test/script/runner.cxx index a4ead93f..1c1a15c2 100644 --- a/build2/test/script/runner.cxx +++ b/build2/test/script/runner.cxx @@ -7,8 +7,8 @@ #include <set> #include <ios> // streamsize -#include <libbutl/regex.hxx> -#include <libbutl/fdstream.hxx> // fdopen_mode, fdnull(), fddup() +#include <libbutl/regex.mxx> +#include <libbutl/fdstream.mxx> // fdopen_mode, fdnull(), fddup() #include <build2/variable.hxx> #include <build2/filesystem.hxx> diff --git a/build2/types.hxx b/build2/types.hxx index 374a3ebf..f65d0540 100644 --- a/build2/types.hxx +++ b/build2/types.hxx @@ -33,17 +33,17 @@ #include <stdexcept> // logic_error, invalid_argument, runtime_error #include <system_error> -#include <libbutl/path.hxx> -#include <libbutl/sha256.hxx> -#include <libbutl/process.hxx> -#include <libbutl/fdstream.hxx> -#include <libbutl/optional.hxx> -#include <libbutl/const-ptr.hxx> -#include <libbutl/timestamp.hxx> -#include <libbutl/vector-view.hxx> -#include <libbutl/small-vector.hxx> -#include <libbutl/target-triplet.hxx> -#include <libbutl/standard-version.hxx> +#include <libbutl/path.mxx> +#include <libbutl/sha256.mxx> +#include <libbutl/process.mxx> +#include <libbutl/fdstream.mxx> +#include <libbutl/optional.mxx> +#include <libbutl/const-ptr.mxx> +#include <libbutl/timestamp.mxx> +#include <libbutl/vector-view.mxx> +#include <libbutl/small-vector.mxx> +#include <libbutl/target-triplet.mxx> +#include <libbutl/standard-version.mxx> namespace build2 { @@ -74,8 +74,8 @@ namespace build2 using std::array; using std::vector; - using butl::vector_view; // <libbutl/vector-view.hxx> - using butl::small_vector; // <libbutl/small-vector.hxx> + using butl::vector_view; // <libbutl/vector-view.mxx> + using butl::small_vector; // <libbutl/small-vector.mxx> using strings = vector<string>; using cstrings = vector<const char*>; @@ -143,16 +143,16 @@ namespace build2 using std::system_error; using io_error = std::ios_base::failure; - // <libbutl/optional.hxx> + // <libbutl/optional.mxx> // using butl::optional; using butl::nullopt; - // <libbutl/const-ptr.hxx> + // <libbutl/const-ptr.mxx> // using butl::const_ptr; - // <libbutl/path.hxx> + // <libbutl/path.mxx> // using butl::path; using butl::dir_path; @@ -182,7 +182,7 @@ namespace build2 using paths = std::vector<path>; using dir_paths = std::vector<dir_path>; - // <libbutl/timestamp.hxx> + // <libbutl/timestamp.mxx> // using butl::system_clock; using butl::timestamp; @@ -192,12 +192,12 @@ namespace build2 using butl::timestamp_nonexistent; using butl::operator<<; - // <libbutl/sha256.hxx> + // <libbutl/sha256.mxx> // using butl::sha256; - // <libbutl/process.hxx> - // <libbutl/fdstream.hxx> + // <libbutl/process.mxx> + // <libbutl/fdstream.mxx> // using butl::process; using butl::process_path; @@ -207,11 +207,11 @@ namespace build2 using butl::ifdstream; using butl::ofdstream; - // <libbutl/target-triplet.hxx> + // <libbutl/target-triplet.mxx> // using butl::target_triplet; - // <libbutl/standard-version.hxx> + // <libbutl/standard-version.mxx> // using butl::standard_version; using butl::standard_version_constraint; diff --git a/build2/utility.hxx b/build2/utility.hxx index 57d5f714..389d6cc5 100644 --- a/build2/utility.hxx +++ b/build2/utility.hxx @@ -16,7 +16,7 @@ #include <libbutl/ft/lang.hxx> -#include <libbutl/utility.hxx> // combine_hash(), reverse_iterate(), case*(), +#include <libbutl/utility.mxx> // combine_hash(), reverse_iterate(), case*(), // etc #include <unordered_set> @@ -53,7 +53,7 @@ namespace build2 using std::stoul; using std::stoull; - // <libbutl/utility.hxx> + // <libbutl/utility.mxx> // using butl::reverse_iterate; using butl::compare_c_string; diff --git a/build2/variable.hxx b/build2/variable.hxx index 5ef67fdf..9f7a82c1 100644 --- a/build2/variable.hxx +++ b/build2/variable.hxx @@ -10,8 +10,8 @@ #include <type_traits> // aligned_storage #include <unordered_map> -#include <libbutl/prefix-map.hxx> -#include <libbutl/multi-index.hxx> // map_key +#include <libbutl/prefix-map.mxx> +#include <libbutl/multi-index.mxx> // map_key #include <build2/types.hxx> #include <build2/utility.hxx> diff --git a/build2/version/init.cxx b/build2/version/init.cxx index c6acf887..7d086423 100644 --- a/build2/version/init.cxx +++ b/build2/version/init.cxx @@ -4,8 +4,8 @@ #include <build2/version/init.hxx> -#include <libbutl/manifest-parser.hxx> -#include <libbutl/manifest-serializer.hxx> +#include <libbutl/manifest-parser.mxx> +#include <libbutl/manifest-serializer.mxx> #include <build2/scope.hxx> #include <build2/context.hxx> diff --git a/old-tests/depdb/driver.cxx b/old-tests/depdb/driver.cxx index 2439b60e..b2b74a87 100644 --- a/old-tests/depdb/driver.cxx +++ b/old-tests/depdb/driver.cxx @@ -4,7 +4,7 @@ #include <iostream> -#include <libbutl/filesystem.hxx> +#include <libbutl/filesystem.mxx> #include <build2/types.hxx> #include <build2/utility.hxx> diff --git a/tests/test/script/runner/driver.cxx b/tests/test/script/runner/driver.cxx index 43bb66b6..c22e7e72 100644 --- a/tests/test/script/runner/driver.cxx +++ b/tests/test/script/runner/driver.cxx @@ -11,10 +11,10 @@ #include <iostream> #include <exception> -#include <libbutl/path.hxx> -#include <libbutl/optional.hxx> -#include <libbutl/fdstream.hxx> -#include <libbutl/filesystem.hxx> +#include <libbutl/path.mxx> +#include <libbutl/optional.mxx> +#include <libbutl/fdstream.mxx> +#include <libbutl/filesystem.mxx> using namespace std; using namespace butl; |