diff options
Diffstat (limited to 'libbuild2')
34 files changed, 84 insertions, 84 deletions
diff --git a/libbuild2/adhoc-rule-cxx.cxx b/libbuild2/adhoc-rule-cxx.cxx index 83029ca..df6467f 100644 --- a/libbuild2/adhoc-rule-cxx.cxx +++ b/libbuild2/adhoc-rule-cxx.cxx @@ -3,7 +3,7 @@ #include <libbuild2/adhoc-rule-cxx.hxx> -#include <libbutl/filesystem.mxx> // file_time() +#include <libbutl/filesystem.hxx> // file_time() #include <libbuild2/file.hxx> #include <libbuild2/scope.hxx> diff --git a/libbuild2/adhoc-rule-regex-pattern.cxx b/libbuild2/adhoc-rule-regex-pattern.cxx index 9550527..89a4766 100644 --- a/libbuild2/adhoc-rule-regex-pattern.cxx +++ b/libbuild2/adhoc-rule-regex-pattern.cxx @@ -3,7 +3,7 @@ #include <libbuild2/adhoc-rule-regex-pattern.hxx> -#include <libbutl/regex.mxx> +#include <libbutl/regex.hxx> #include <libbuild2/algorithm.hxx> diff --git a/libbuild2/build/script/parser.cxx b/libbuild2/build/script/parser.cxx index 43ec0d5..e55eca1 100644 --- a/libbuild2/build/script/parser.cxx +++ b/libbuild2/build/script/parser.cxx @@ -3,7 +3,7 @@ #include <libbuild2/build/script/parser.hxx> -#include <libbutl/builtin.mxx> +#include <libbutl/builtin.hxx> #include <libbuild2/function.hxx> #include <libbuild2/algorithm.hxx> diff --git a/libbuild2/build/script/runner.cxx b/libbuild2/build/script/runner.cxx index 2a59505..51139d4 100644 --- a/libbuild2/build/script/runner.cxx +++ b/libbuild2/build/script/runner.cxx @@ -3,7 +3,7 @@ #include <libbuild2/build/script/runner.hxx> -#include <libbutl/filesystem.mxx> // try_rmdir() +#include <libbutl/filesystem.hxx> // try_rmdir() #include <libbuild2/target.hxx> #include <libbuild2/script/run.hxx> diff --git a/libbuild2/build/script/script.cxx b/libbuild2/build/script/script.cxx index 14dd9e1..f4f8da8 100644 --- a/libbuild2/build/script/script.cxx +++ b/libbuild2/build/script/script.cxx @@ -3,7 +3,7 @@ #include <libbuild2/build/script/script.hxx> -#include <libbutl/filesystem.mxx> +#include <libbutl/filesystem.hxx> #include <libbuild2/target.hxx> diff --git a/libbuild2/cc/guess.cxx b/libbuild2/cc/guess.cxx index 298d081..69e8219 100644 --- a/libbuild2/cc/guess.cxx +++ b/libbuild2/cc/guess.cxx @@ -1687,7 +1687,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.mxx>, we need something in the + // <libbutl/target-triplet.hxx>, we need something in the // CPU-VENDOR-OS-ABI form. // // The CPU part is fairly straightforward with x86 mapped to 'i386' diff --git a/libbuild2/cc/lexer.hxx b/libbuild2/cc/lexer.hxx index dc392c6..81e0d97 100644 --- a/libbuild2/cc/lexer.hxx +++ b/libbuild2/cc/lexer.hxx @@ -4,8 +4,8 @@ #ifndef LIBBUILD2_CC_LEXER_HXX #define LIBBUILD2_CC_LEXER_HXX -#include <libbutl/sha256.mxx> -#include <libbutl/char-scanner.mxx> +#include <libbutl/sha256.hxx> +#include <libbutl/char-scanner.hxx> #include <libbuild2/types.hxx> #include <libbuild2/utility.hxx> diff --git a/libbuild2/cc/link-rule.cxx b/libbuild2/cc/link-rule.cxx index d8f22d4..d2ffb04 100644 --- a/libbuild2/cc/link-rule.cxx +++ b/libbuild2/cc/link-rule.cxx @@ -6,7 +6,7 @@ #include <cstdlib> // exit() #include <cstring> // strlen() -#include <libbutl/filesystem.mxx> // file_exists(), path_search() +#include <libbutl/filesystem.hxx> // file_exists(), path_search() #include <libbuild2/depdb.hxx> #include <libbuild2/scope.hxx> diff --git a/libbuild2/config/module.hxx b/libbuild2/config/module.hxx index 543c486..82b79be 100644 --- a/libbuild2/config/module.hxx +++ b/libbuild2/config/module.hxx @@ -6,7 +6,7 @@ #include <cstring> // strncmp() -#include <libbutl/prefix-map.mxx> +#include <libbutl/prefix-map.hxx> #include <libbuild2/types.hxx> #include <libbuild2/utility.hxx> diff --git a/libbuild2/context.cxx b/libbuild2/context.cxx index 924c370..36b70b8 100644 --- a/libbuild2/context.cxx +++ b/libbuild2/context.cxx @@ -29,7 +29,7 @@ using namespace butl; namespace build2 { // Create global scope. Note that the empty path is a prefix for any other - // path. See the comment in <libbutl/prefix-map.mxx> for details. + // path. See the comment in <libbutl/prefix-map.hxx> for details. // static inline scope& create_global_scope (scope_map& m) diff --git a/libbuild2/diagnostics.cxx b/libbuild2/diagnostics.cxx index ee4651d..4d2d7ce 100644 --- a/libbuild2/diagnostics.cxx +++ b/libbuild2/diagnostics.cxx @@ -5,7 +5,7 @@ #include <cstring> // strchr() -#include <libbutl/process-io.mxx> +#include <libbutl/process-io.hxx> #include <libbuild2/scope.hxx> #include <libbuild2/action.hxx> diff --git a/libbuild2/diagnostics.hxx b/libbuild2/diagnostics.hxx index 1290634..f3d9db4 100644 --- a/libbuild2/diagnostics.hxx +++ b/libbuild2/diagnostics.hxx @@ -4,7 +4,7 @@ #ifndef LIBBUILD2_DIAGNOSTICS_HXX #define LIBBUILD2_DIAGNOSTICS_HXX -#include <libbutl/diagnostics.mxx> +#include <libbutl/diagnostics.hxx> #include <libbuild2/types.hxx> #include <libbuild2/forward.hxx> diff --git a/libbuild2/dist/operation.cxx b/libbuild2/dist/operation.cxx index edb8162..7a85119 100644 --- a/libbuild2/dist/operation.cxx +++ b/libbuild2/dist/operation.cxx @@ -3,8 +3,8 @@ #include <libbuild2/dist/operation.hxx> -#include <libbutl/sha1.mxx> -#include <libbutl/sha256.mxx> +#include <libbutl/sha1.hxx> +#include <libbutl/sha256.hxx> #include <libbuild2/file.hxx> #include <libbuild2/dump.hxx> diff --git a/libbuild2/filesystem.hxx b/libbuild2/filesystem.hxx index 26544bc..ee7ba9a 100644 --- a/libbuild2/filesystem.hxx +++ b/libbuild2/filesystem.hxx @@ -4,7 +4,7 @@ #ifndef LIBBUILD2_FILESYSTEM_HXX #define LIBBUILD2_FILESYSTEM_HXX -#include <libbutl/filesystem.mxx> +#include <libbutl/filesystem.hxx> #include <libbuild2/types.hxx> #include <libbuild2/utility.hxx> @@ -13,7 +13,7 @@ #include <libbuild2/export.hxx> -// Higher-level filesystem utilities built on top of <libbutl/filesystem.mxx>. +// Higher-level filesystem utilities built on top of <libbutl/filesystem.hxx>. // // Compared to the libbutl's versions, these handle errors and issue // diagnostics. Some of them also print the corresponding command line @@ -27,7 +27,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.mxx> + // detailed enum from <libbutl/filesystem.hxx> // template <typename T> struct fs_status diff --git a/libbuild2/functions-filesystem.cxx b/libbuild2/functions-filesystem.cxx index 696b1cf..ef7bfc5 100644 --- a/libbuild2/functions-filesystem.cxx +++ b/libbuild2/functions-filesystem.cxx @@ -1,7 +1,7 @@ // file : libbuild2/functions-filesystem.cxx -*- C++ -*- // license : MIT; see accompanying LICENSE file -#include <libbutl/filesystem.mxx> +#include <libbutl/filesystem.hxx> #include <libbuild2/function.hxx> #include <libbuild2/variable.hxx> diff --git a/libbuild2/functions-path.cxx b/libbuild2/functions-path.cxx index b0acc63..b7c9a8d 100644 --- a/libbuild2/functions-path.cxx +++ b/libbuild2/functions-path.cxx @@ -1,7 +1,7 @@ // file : libbuild2/functions-path.cxx -*- C++ -*- // license : MIT; see accompanying LICENSE file -#include <libbutl/path-pattern.mxx> +#include <libbutl/path-pattern.hxx> #include <libbuild2/function.hxx> #include <libbuild2/variable.hxx> diff --git a/libbuild2/functions-process.cxx b/libbuild2/functions-process.cxx index c18d949..c4e5c24 100644 --- a/libbuild2/functions-process.cxx +++ b/libbuild2/functions-process.cxx @@ -1,8 +1,8 @@ // file : libbuild2/functions-process.cxx -*- C++ -*- // license : MIT; see accompanying LICENSE file -#include <libbutl/regex.mxx> -#include <libbutl/builtin.mxx> +#include <libbutl/regex.hxx> +#include <libbutl/builtin.hxx> #include <libbuild2/function.hxx> #include <libbuild2/variable.hxx> diff --git a/libbuild2/functions-regex.cxx b/libbuild2/functions-regex.cxx index 46d71ba..2f0d122 100644 --- a/libbuild2/functions-regex.cxx +++ b/libbuild2/functions-regex.cxx @@ -3,7 +3,7 @@ #include <sstream> -#include <libbutl/regex.mxx> +#include <libbutl/regex.hxx> #include <libbuild2/function.hxx> #include <libbuild2/variable.hxx> @@ -612,7 +612,7 @@ namespace build2 // is always untyped, regardless of the argument type. // // Substitution escape sequences are extended with a subset of Perl - // sequences (see libbutl/regex.mxx for details). + // sequences (see libbutl/regex.hxx for details). // // The following flags are supported: // @@ -687,7 +687,7 @@ namespace build2 // value to string prior to matching. // // Substitution escape sequences are extended with a subset of Perl - // sequences (see libbutl/regex.mxx for details). + // sequences (see libbutl/regex.hxx for details). // // The following flags are supported: // @@ -716,7 +716,7 @@ namespace build2 // elements optionally separated with a delimiter. // // Substitution escape sequences are extended with a subset of Perl - // sequences (see libbutl/regex.mxx for details). + // sequences (see libbutl/regex.hxx for details). // // The following flags are supported: // @@ -761,7 +761,7 @@ namespace build2 // of transformed elements, omitting the empty ones. // // Substitution escape sequences are extended with a subset of Perl - // sequences (see libbutl/regex.mxx for details). + // sequences (see libbutl/regex.hxx for details). // // The following flags are supported: // diff --git a/libbuild2/install/init.cxx b/libbuild2/install/init.cxx index 6f83015..50c0a05 100644 --- a/libbuild2/install/init.cxx +++ b/libbuild2/install/init.cxx @@ -3,7 +3,7 @@ #include <libbuild2/install/init.hxx> -#include <libbutl/command.mxx> // command_substitute() +#include <libbutl/command.hxx> // command_substitute() #include <libbuild2/scope.hxx> #include <libbuild2/target.hxx> diff --git a/libbuild2/install/rule.cxx b/libbuild2/install/rule.cxx index 5092d42..d678940 100644 --- a/libbuild2/install/rule.cxx +++ b/libbuild2/install/rule.cxx @@ -4,7 +4,7 @@ #include <libbuild2/install/rule.hxx> #include <libbuild2/install/utility.hxx> // resolve_dir() declaration -#include <libbutl/filesystem.mxx> // dir_exists(), file_exists() +#include <libbutl/filesystem.hxx> // dir_exists(), file_exists() #include <libbuild2/scope.hxx> #include <libbuild2/target.hxx> diff --git a/libbuild2/lexer.hxx b/libbuild2/lexer.hxx index cc42219..148666e 100644 --- a/libbuild2/lexer.hxx +++ b/libbuild2/lexer.hxx @@ -6,9 +6,9 @@ #include <stack> -#include <libbutl/utf8.mxx> -#include <libbutl/unicode.mxx> -#include <libbutl/char-scanner.mxx> +#include <libbutl/utf8.hxx> +#include <libbutl/unicode.hxx> +#include <libbutl/char-scanner.hxx> #include <libbuild2/types.hxx> #include <libbuild2/utility.hxx> diff --git a/libbuild2/operation.hxx b/libbuild2/operation.hxx index e115ac0..d80a01c 100644 --- a/libbuild2/operation.hxx +++ b/libbuild2/operation.hxx @@ -4,7 +4,7 @@ #ifndef LIBBUILD2_OPERATION_HXX #define LIBBUILD2_OPERATION_HXX -#include <libbutl/string-table.mxx> +#include <libbutl/string-table.hxx> #include <libbuild2/types.hxx> #include <libbuild2/forward.hxx> diff --git a/libbuild2/parser.cxx b/libbuild2/parser.cxx index a0d1d7a..75c7e2c 100644 --- a/libbuild2/parser.cxx +++ b/libbuild2/parser.cxx @@ -6,7 +6,7 @@ #include <sstream> #include <iostream> // cout -#include <libbutl/filesystem.mxx> // path_search +#include <libbutl/filesystem.hxx> // path_search #include <libbuild2/rule.hxx> #include <libbuild2/dump.hxx> diff --git a/libbuild2/rule-map.hxx b/libbuild2/rule-map.hxx index c4cdb9f..20895f3 100644 --- a/libbuild2/rule-map.hxx +++ b/libbuild2/rule-map.hxx @@ -4,7 +4,7 @@ #ifndef LIBBUILD2_RULE_MAP_HXX #define LIBBUILD2_RULE_MAP_HXX -#include <libbutl/prefix-map.mxx> +#include <libbutl/prefix-map.hxx> #include <libbuild2/types.hxx> #include <libbuild2/forward.hxx> diff --git a/libbuild2/script/run.cxx b/libbuild2/script/run.cxx index f122ae5..91fc9ac 100644 --- a/libbuild2/script/run.cxx +++ b/libbuild2/script/run.cxx @@ -11,10 +11,10 @@ #include <ios> // streamsize -#include <libbutl/regex.mxx> -#include <libbutl/builtin.mxx> -#include <libbutl/fdstream.mxx> // fdopen_mode, fddup() -#include <libbutl/filesystem.mxx> // path_search() +#include <libbutl/regex.hxx> +#include <libbutl/builtin.hxx> +#include <libbutl/fdstream.hxx> // fdopen_mode, fddup() +#include <libbutl/filesystem.hxx> // path_search() #include <libbuild2/filesystem.hxx> #include <libbuild2/diagnostics.hxx> diff --git a/libbuild2/target.hxx b/libbuild2/target.hxx index a5940ab..5f0165e 100644 --- a/libbuild2/target.hxx +++ b/libbuild2/target.hxx @@ -8,7 +8,7 @@ #include <type_traits> // aligned_storage #include <unordered_map> -#include <libbutl/multi-index.mxx> // map_iterator_adapter +#include <libbutl/multi-index.hxx> // map_iterator_adapter #include <libbuild2/types.hxx> #include <libbuild2/forward.hxx> diff --git a/libbuild2/target.txx b/libbuild2/target.txx index c34adde..5b48ad1 100644 --- a/libbuild2/target.txx +++ b/libbuild2/target.txx @@ -1,7 +1,7 @@ // file : libbuild2/target.txx -*- C++ -*- // license : MIT; see accompanying LICENSE file -#include <libbutl/filesystem.mxx> // dir_iterator +#include <libbutl/filesystem.hxx> // dir_iterator #include <libbuild2/scope.hxx> #include <libbuild2/diagnostics.hxx> diff --git a/libbuild2/types.hxx b/libbuild2/types.hxx index e3cacce..99cc0dc 100644 --- a/libbuild2/types.hxx +++ b/libbuild2/types.hxx @@ -44,21 +44,21 @@ #include <stdexcept> // logic_error, invalid_argument, runtime_error #include <system_error> -#include <libbutl/path.mxx> -#include <libbutl/path-map.mxx> -#include <libbutl/regex.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/project-name.mxx> -#include <libbutl/target-triplet.mxx> -#include <libbutl/semantic-version.mxx> -#include <libbutl/standard-version.mxx> +#include <libbutl/path.hxx> +#include <libbutl/path-map.hxx> +#include <libbutl/regex.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/project-name.hxx> +#include <libbutl/target-triplet.hxx> +#include <libbutl/semantic-version.hxx> +#include <libbutl/standard-version.hxx> #include <libbuild2/export.hxx> @@ -102,8 +102,8 @@ namespace build2 using std::multiset; using std::array; using std::vector; - using butl::vector_view; // <libbutl/vector-view.mxx> - using butl::small_vector; // <libbutl/small-vector.mxx> + using butl::vector_view; // <libbutl/vector-view.hxx> + using butl::small_vector; // <libbutl/small-vector.hxx> using std::istream; using std::ostream; @@ -112,7 +112,7 @@ namespace build2 // Regex. // - // Note that <libbutl/regex.mxx> includes an ostream insertion operator for + // Note that <libbutl/regex.hxx> includes an ostream insertion operator for // regex_error which prints cleaned up message, if any. // using std::regex; @@ -266,17 +266,17 @@ namespace build2 using std::system_error; using io_error = std::ios_base::failure; - // <libbutl/optional.mxx> + // <libbutl/optional.hxx> // using butl::optional; using butl::nullopt; - // <libbutl/const-ptr.mxx> + // <libbutl/const-ptr.hxx> // using butl::const_ptr; - // <libbutl/path.mxx> - // <libbutl/path-map.mxx> + // <libbutl/path.hxx> + // <libbutl/path-map.hxx> // using butl::path; using path_traits = path::traits_type; @@ -315,7 +315,7 @@ namespace build2 using paths = std::vector<path>; using dir_paths = std::vector<dir_path>; - // <libbutl/timestamp.mxx> + // <libbutl/timestamp.hxx> // using butl::system_clock; using butl::timestamp; @@ -327,11 +327,11 @@ namespace build2 using butl::to_string; using butl::operator<<; - // <libbutl/sha256.mxx> + // <libbutl/sha256.hxx> // using butl::sha256; - // <libbutl/process.mxx> + // <libbutl/process.hxx> using butl::process; using butl::process_env; using butl::process_path; @@ -379,7 +379,7 @@ namespace build2 process_path_ex () = default; }; - // <libbutl/fdstream.mxx> + // <libbutl/fdstream.hxx> // using butl::auto_fd; using butl::fdpipe; @@ -390,21 +390,21 @@ namespace build2 using butl::fdselect_state; using butl::fdselect_set; - // <libbutl/target-triplet.mxx> + // <libbutl/target-triplet.hxx> // using butl::target_triplet; - // <libbutl/semantic-version.mxx> + // <libbutl/semantic-version.hxx> // using butl::semantic_version; using butl::parse_semantic_version; - // <libbutl/standard-version.mxx> + // <libbutl/standard-version.hxx> // using butl::standard_version; using butl::standard_version_constraint; - // <libbutl/project-name.mxx> + // <libbutl/project-name.hxx> // using butl::project_name; diff --git a/libbuild2/utility.hxx b/libbuild2/utility.hxx index c7ee2f4..f9f1daa 100644 --- a/libbuild2/utility.hxx +++ b/libbuild2/utility.hxx @@ -15,9 +15,9 @@ #include <libbutl/ft/lang.hxx> -#include <libbutl/utility.mxx> // combine_hash(), reverse_iterate(), etc -#include <libbutl/fdstream.mxx> -#include <libbutl/path-pattern.mxx> +#include <libbutl/utility.hxx> // combine_hash(), reverse_iterate(), etc +#include <libbutl/fdstream.hxx> +#include <libbutl/path-pattern.hxx> #include <libbuild2/types.hxx> #include <libbuild2/forward.hxx> @@ -54,7 +54,7 @@ namespace build2 using std::stoul; using std::stoull; - // <libbutl/utility.mxx> + // <libbutl/utility.hxx> // using butl::reverse_iterate; using butl::compare_c_string; @@ -88,12 +88,12 @@ namespace build2 using butl::eof; - // <libbutl/fdstream.mxx> + // <libbutl/fdstream.hxx> // using butl::open_file_or_stdin; using butl::open_file_or_stdout; - // <libbutl/path-pattern.mxx> + // <libbutl/path-pattern.hxx> // using butl::path_pattern; diff --git a/libbuild2/variable.cxx b/libbuild2/variable.cxx index 0cf6528..6f2812c 100644 --- a/libbuild2/variable.cxx +++ b/libbuild2/variable.cxx @@ -5,7 +5,7 @@ #include <cstring> // memcmp() -#include <libbutl/path-pattern.mxx> +#include <libbutl/path-pattern.hxx> #include <libbuild2/target.hxx> #include <libbuild2/diagnostics.hxx> diff --git a/libbuild2/variable.hxx b/libbuild2/variable.hxx index df0cb77..54d573b 100644 --- a/libbuild2/variable.hxx +++ b/libbuild2/variable.hxx @@ -7,8 +7,8 @@ #include <type_traits> // aligned_storage #include <unordered_map> -#include <libbutl/prefix-map.mxx> -#include <libbutl/multi-index.mxx> // map_key +#include <libbutl/prefix-map.hxx> +#include <libbutl/multi-index.hxx> // map_key #include <libbuild2/types.hxx> #include <libbuild2/forward.hxx> diff --git a/libbuild2/version/init.cxx b/libbuild2/version/init.cxx index ced9c68..05d5fe0 100644 --- a/libbuild2/version/init.cxx +++ b/libbuild2/version/init.cxx @@ -3,7 +3,7 @@ #include <libbuild2/version/init.hxx> -#include <libbutl/manifest-parser.mxx> +#include <libbutl/manifest-parser.hxx> #include <libbuild2/scope.hxx> #include <libbuild2/variable.hxx> diff --git a/libbuild2/version/snapshot-git.cxx b/libbuild2/version/snapshot-git.cxx index e766bc9..2ae3f5b 100644 --- a/libbuild2/version/snapshot-git.cxx +++ b/libbuild2/version/snapshot-git.cxx @@ -3,7 +3,7 @@ #include <ctime> // time_t -#include <libbutl/sha1.mxx> +#include <libbutl/sha1.hxx> #include <libbuild2/version/snapshot.hxx> diff --git a/libbuild2/version/utility.cxx b/libbuild2/version/utility.cxx index 5e2375d..9fec7ec 100644 --- a/libbuild2/version/utility.cxx +++ b/libbuild2/version/utility.cxx @@ -3,8 +3,8 @@ #include <libbuild2/version/utility.hxx> -#include <libbutl/manifest-parser.mxx> -#include <libbutl/manifest-serializer.mxx> +#include <libbutl/manifest-parser.hxx> +#include <libbutl/manifest-serializer.hxx> #include <libbuild2/context.hxx> #include <libbuild2/filesystem.hxx> // path_perms() |