From 530e8914ba00ce0e7ee89ba30d2b88f2c09f43c9 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sat, 16 Dec 2017 14:14:15 +0200 Subject: Split stream verbosity into components (path, extension) Use to make sure structured result output always contains absolute target path. --- build2/name.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'build2/name.cxx') diff --git a/build2/name.cxx b/build2/name.cxx index f71c7c1..5621101 100644 --- a/build2/name.cxx +++ b/build2/name.cxx @@ -96,11 +96,11 @@ namespace build2 os << v; }; - uint16_t dv (stream_verb (os)); // Directory verbosity. + uint16_t dv (stream_verb (os).path); // Directory verbosity. auto write_dir = [dv, quote, &os, &write_string] (const dir_path& d) { - const string& s (dv < 2 + const string& s (dv < 1 ? diag_relative (d) : d.representation ()); if (quote) @@ -133,7 +133,7 @@ namespace build2 // Note: relative() may return empty. // - const dir_path& rd (dv < 2 ? relative (n.dir) : n.dir); // Relative. + const dir_path& rd (dv < 1 ? relative (n.dir) : n.dir); // Relative. const dir_path& pd (v ? rd : t ? rd.directory () : dir_path ()); -- cgit v1.1