4 files changed, 30 insertions, 18 deletions

diff --git a/libbuild2/version/rule.cxx b/libbuild2/version/rule.cxx
index 1799666..65c1117 100644
--- a/libbuild2/version/rule.cxx
+++ b/libbuild2/version/rule.cxx
@@ -93,6 +93,12 @@ namespace build2
       if (!fi)
         l5 ([&]{trace << "no in file prerequisite for target " << t;});
 
+      // If we match, derive the file name early as recommended by the in
+      // rule.
+      //
+      if (fm && fi)
+        t.derive_path ();
+
       return fm && fi;
     }
 
@@ -115,6 +121,7 @@ namespace build2
             const target& t,
             const string& n,
             optional<uint64_t> flags,
+            const substitution_map* smap,
             const optional<string>& null) const
     {
       assert (!flags);
@@ -138,8 +145,7 @@ namespace build2
                              a,
                              t,
                              p == string::npos ? n : string (n, p + 1),
-                             nullopt,
-                             null);
+                             nullopt, smap, null);
       }
 
       string pn (n, 0, p);
@@ -241,13 +247,13 @@ namespace build2
 
             if (mav->snapshot ())
             {
-              r += (p ? "(" : "");
+              if (p) r += '(';
 
               r += cmp (vm, " < ", mav->version) + " || (";
               r += cmp (vm, " == ", mav->version) + " && ";
-              r += cmp (sm, (mao ? " < " : " <= "), mav->snapshot_sn) + ")";
+              r += cmp (sm, (mao ? " < " : " <= "), mav->snapshot_sn) + ')';
 
-              r += (p ? ")" : "");
+              if (p) r += ')';
             }
             else
               r = cmp (vm, (mao ? " < " : " <= "), mav->version);
@@ -261,13 +267,13 @@ namespace build2
 
             if (miv->snapshot ())
             {
-              r += (p ? "(" : "");
+              if (p) r += '(';
 
               r += cmp (vm, " > ", miv->version) + " || (";
               r += cmp (vm, " == ", miv->version) + " && ";
-              r += cmp (sm, (mio ? " > " : " >= "), miv->snapshot_sn) + ")";
+              r += cmp (sm, (mio ? " > " : " >= "), miv->snapshot_sn) + ')';
 
-              r += (p ? ")" : "");
+              if (p) r += ')';
             }
             else
               r = cmp (vm, (mio ? " > " : " >= "), miv->version);
diff --git a/libbuild2/version/rule.hxx b/libbuild2/version/rule.hxx
index ba673e5..0bdc090 100644
--- a/libbuild2/version/rule.hxx
+++ b/libbuild2/version/rule.hxx
@@ -20,7 +20,7 @@ namespace build2
     class in_rule: public in::rule
     {
     public:
-      in_rule (): rule ("version.in 2", "version.in") {}
+      in_rule (): rule ("version.in 2", "version") {}
 
       virtual bool
       match (action, target&) const override;
@@ -34,6 +34,7 @@ namespace build2
               const target&,
               const string&,
               optional<uint64_t>,
+              const substitution_map*,
               const optional<string>&) const override;
     };
 
diff --git a/libbuild2/version/snapshot-git.cxx b/libbuild2/version/snapshot-git.cxx
index 2ae3f5b..ab0224a 100644
--- a/libbuild2/version/snapshot-git.cxx
+++ b/libbuild2/version/snapshot-git.cxx
@@ -21,7 +21,7 @@ namespace build2
     static global_cache<snapshot, dir_path> cache;
 
     snapshot
-    extract_snapshot_git (dir_path rep_root)
+    extract_snapshot_git (context& ctx, dir_path rep_root)
     {
       if (const snapshot* r = cache.find (rep_root))
         return *r;
@@ -82,7 +82,11 @@ namespace build2
       args[args_i + 1] = "--porcelain";
       args[args_i + 2] = nullptr;
 
+      // @@ PERF: redo with custom stream reading code (then could also
+      //    get rid of context).
+      //
       r.committed = run<string> (
+        ctx,
         3 /* verbosity */,
         pp,
         args,
@@ -108,7 +112,8 @@ namespace build2
       // (reluctantly) assume that the only reason git cat-file fails is if
       // there is no HEAD (that we equal with the "new repository" condition
       // which is, strictly speaking, might not be the case either). So we
-      // suppress any diagnostics, and handle non-zero exit code.
+      // suppress any diagnostics, and handle non-zero exit code (and so no
+      // diagnostics buffering is needed, plus we are in the load phase).
       //
       string data;
 
@@ -117,12 +122,12 @@ namespace build2
       args[args_i + 2] = "HEAD";
       args[args_i + 3] = nullptr;
 
-      process pr (run_start (3     /* verbosity */,
+      process pr (run_start (3       /* verbosity */,
                              pp,
                              args,
-                             0     /* stdin  */,
-                             -1    /* stdout */,
-                             false /* error  */));
+                             0       /* stdin  */,
+                             -1      /* stdout */,
+                             1       /* stderr (to stdout) */));
 
       string l;
       try
@@ -201,7 +206,7 @@ namespace build2
         // that.
       }
 
-      if (run_finish_code (args, pr, l))
+      if (run_finish_code (args, pr, l, 2 /* verbosity */))
       {
         if (r.sn == 0)
           fail << "unable to extract git commit id/date for " << rep_root;
diff --git a/libbuild2/version/snapshot.cxx b/libbuild2/version/snapshot.cxx
index d20e633..000bcba 100644
--- a/libbuild2/version/snapshot.cxx
+++ b/libbuild2/version/snapshot.cxx
@@ -12,7 +12,7 @@ namespace build2
   namespace version
   {
     snapshot
-    extract_snapshot_git (dir_path);
+    extract_snapshot_git (context&, dir_path);
 
     static const path git (".git");
 
@@ -46,7 +46,7 @@ namespace build2
         if (butl::entry_exists (d / git,
                                 true /* follow_symlinks */,
                                 true /* ignore_errors */))
-          return extract_snapshot_git (move (d));
+          return extract_snapshot_git (rs.ctx, move (d));
       }
 
       return snapshot ();