aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2022-05-06 10:45:02 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2022-05-06 10:45:02 +0200
commite8457a85edaa072d043e01b629bc0c124251a9c0 (patch)
tree9e0d8d9202ae59485c39f91fcc60c2b4b5f7a6fc
parent6c5cc813b3ff2bf0295a62f9632e4b0034bbb8fb (diff)
Minor terminology fix in diagnostics and comments
-rw-r--r--libbuild2/cc/compile-rule.cxx2
-rw-r--r--libbuild2/dist/init.cxx2
-rw-r--r--libbuild2/dist/operation.cxx4
-rw-r--r--libbuild2/dyndep.cxx4
-rw-r--r--libbuild2/file.hxx2
-rw-r--r--libbuild2/scope.cxx2
6 files changed, 8 insertions, 8 deletions
diff --git a/libbuild2/cc/compile-rule.cxx b/libbuild2/cc/compile-rule.cxx
index 8e1cc81..f5d50ec 100644
--- a/libbuild2/cc/compile-rule.cxx
+++ b/libbuild2/cc/compile-rule.cxx
@@ -3193,7 +3193,7 @@ namespace build2
// And here is another problem: if we have an already generated header
// in src and the one in out does not yet exist, then the compiler will
// pick the one in src and we won't even notice. Note that this is not
- // only an issue with mixing in- and out-of-tree builds (which does feel
+ // only an issue with mixing in and out of source builds (which does feel
// wrong but is oh so convenient): this is also a problem with
// pre-generated headers, a technique we use to make installing the
// generator by end-users optional by shipping pre-generated headers.
diff --git a/libbuild2/dist/init.cxx b/libbuild2/dist/init.cxx
index 8837f77..2b2aaa4 100644
--- a/libbuild2/dist/init.cxx
+++ b/libbuild2/dist/init.cxx
@@ -57,7 +57,7 @@ namespace build2
// The bootstrap distribution mode. Note that it can only be specified
// as a global override and is thus marked as unsaved in init(). Unlike
- // the normal load distribution mode, we can do in-source and multiple
+ // the normal load distribution mode, we can do in source and multiple
// projects at once.
//
// Note also that other config.dist.* variables can only be specified as
diff --git a/libbuild2/dist/operation.cxx b/libbuild2/dist/operation.cxx
index b8ff57d..01ac7eb 100644
--- a/libbuild2/dist/operation.cxx
+++ b/libbuild2/dist/operation.cxx
@@ -646,8 +646,8 @@ namespace build2
fail << "dist meta-operation target must be project root directory";
if (rs->out_eq_src ())
- fail << "in-tree distribution of target " << t <<
- info << "distribution requires out-of-tree build";
+ fail << "in source distribution of target " << t <<
+ info << "distribution requires out of source build";
dist_project (*rs, &t, prog);
}
diff --git a/libbuild2/dyndep.cxx b/libbuild2/dyndep.cxx
index 55b02ed..61fa8cb 100644
--- a/libbuild2/dyndep.cxx
+++ b/libbuild2/dyndep.cxx
@@ -350,7 +350,7 @@ namespace build2
prev_ = nullptr;
}
- // See if this path is inside a project with an out-of-tree build and is
+ // See if this path is inside a project with an out of source build and is
// in the out directory tree.
//
const scope& bs (ctx_.scopes.find_out (d));
@@ -520,7 +520,7 @@ namespace build2
l6 ([&]{trace << "no target with target type " << tt.name;});
}
- // Note: we can't do this because of the in-source builds where there
+ // Note: we can't do this because of the in source builds where there
// won't be explicit targets for non-generated files.
//
// This should be harmless, however, since in our world generated file
diff --git a/libbuild2/file.hxx b/libbuild2/file.hxx
index 43cd1ff..0582a8c 100644
--- a/libbuild2/file.hxx
+++ b/libbuild2/file.hxx
@@ -55,7 +55,7 @@ namespace build2
find_src_root (const dir_path&, optional<bool>& altn);
// The same as above but for project's out. Note that we also check whether
- // a directory happens to be src_root, in case this is an in-tree build with
+ // a directory happens to be src_root, in case this is an in source build with
// the result returned as the second half of the pair. Note also that if the
// input is normalized/actualized, then the output will be as well.
//
diff --git a/libbuild2/scope.cxx b/libbuild2/scope.cxx
index 91aee12..814d876 100644
--- a/libbuild2/scope.cxx
+++ b/libbuild2/scope.cxx
@@ -822,7 +822,7 @@ namespace build2
}
dir_path out;
- if (src && sd != od) // If in-source build, then out must be empty.
+ if (src && sd != od) // If in source build, then out must be empty.
{
out = o.dir.relative () ? od / o.dir : move (o.dir);
out.normalize ();