diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-22 17:23:49 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-22 17:23:49 +0200 |
| commit | 25eb62acb2bc74f7d1837301987701be3e74540c (patch) | |
| tree | bc7bee8ecde81cc1d95e9b7dfad3b43290c2161b | |
| parent | aeb9a9d66650b55b6b3a39db2b3c8b88367cb306 (diff) | |
Add few extra tracing statements
| -rw-r--r-- | build2/b.cxx | 11 | ||||
| -rw-r--r-- | build2/file.cxx | 10 |
2 files changed, 17 insertions, 4 deletions
diff --git a/build2/b.cxx b/build2/b.cxx index 0522d47..ca7af1c 100644 --- a/build2/b.cxx +++ b/build2/b.cxx @@ -794,10 +794,13 @@ main (int argc, char* argv[]) if (verb >= 5) { trace << "bootstrapped " << tn << ':'; - trace << " out_base: " << out_base; - trace << " src_base: " << src_base; - trace << " out_root: " << out_root; - trace << " src_root: " << src_root; + trace << " out_base: " << out_base; + trace << " src_base: " << src_base; + trace << " out_root: " << out_root; + trace << " src_root: " << src_root; + + if (auto l = rs.vars["amalgamation"]) + trace << " amalgamat: " << cast<dir_path> (l); } const path& bfn (ops.buildfile ()); diff --git a/build2/file.cxx b/build2/file.cxx index 1aa8c9e..56e1600 100644 --- a/build2/file.cxx +++ b/build2/file.cxx @@ -557,10 +557,16 @@ namespace build2 subprojects sps; if (dir_exists (out_root)) + { + l5 ([&]{trace << "looking for subprojects in " << out_root;}); find_subprojects (sps, out_root, out_root, true); + } if (out_root != src_root) + { + l5 ([&]{trace << "looking for subprojects in " << src_root;}); find_subprojects (sps, src_root, src_root, false); + } if (!sps.empty ()) // Keep it NULL if no subprojects. v = move (sps); @@ -798,6 +804,8 @@ namespace build2 { tracer trace ("import"); + l5 ([&]{trace << target << " from " << ibase.out_path ();}); + // If there is no project specified for this target, then our // run will be short and sweet: we simply return it as empty- // project-qualified and let someone else (e.g., a rule) take @@ -826,6 +834,8 @@ namespace build2 // for (scope* r (&iroot);; r = r->parent_scope ()->root_scope ()) { + l5 ([&]{trace << "looking in " << r->out_path ();}); + // First check the amalgamation itself. // if (r != &iroot && cast<string> (r->vars["project"]) == project) |