Add support for installation manifest

1 files changed, 60 insertions, 4 deletions

diff --git a/build2/b.cxx b/build2/b.cxx
index 1d6f231..3b5f43a 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -1118,23 +1118,38 @@ main (int argc, char* argv[])
               if (oif->outer_id != 0)
                 outer_oif = lookup (oif->outer_id);
 
+              if (!oparams.empty ())
+              {
+                // Operation parameters belong to outer operation, if any.
+                //
+                auto* i (outer_oif != nullptr ? outer_oif : oif);
+
+                if (i->operation_pre == nullptr)
+                  fail (l) << "unexpected parameters for operation " << i->name;
+              }
+
               // Handle pre/post operations.
               //
               if (auto po = oif->pre_operation)
               {
-                if ((orig_pre_oid = po (ctx, oparams, mid, l)) != 0)
+                if ((orig_pre_oid = po (
+                       ctx,
+                       outer_oif == nullptr ? oparams : values {},
+                       mid,
+                       l)) != 0)
                 {
                   assert (orig_pre_oid != default_id);
                   pre_oif = lookup (orig_pre_oid);
                   pre_oid = pre_oif->id; // De-alias.
                 }
               }
-              else if (!oparams.empty ())
-                fail (l) << "unexpected parameters for operation " << oif->name;
 
               if (auto po = oif->post_operation)
               {
-                if ((orig_post_oid = po (ctx, oparams, mid)) != 0)
+                if ((orig_post_oid = po (
+                       ctx,
+                       outer_oif == nullptr ? oparams : values {},
+                       mid)) != 0)
                 {
                   assert (orig_post_oid != default_id);
                   post_oif = lookup (orig_post_oid);
@@ -1321,6 +1336,12 @@ main (int argc, char* argv[])
 
           ctx.current_operation (*pre_oif, oif);
 
+          if (oif->operation_pre != nullptr)
+            oif->operation_pre (ctx, oparams, false /* inner */, l);
+
+          if (pre_oif->operation_pre != nullptr)
+            pre_oif->operation_pre (ctx, {}, true /* inner */, l);
+
           action a (mid, pre_oid, oid);
 
           {
@@ -1339,6 +1360,12 @@ main (int argc, char* argv[])
               mif->execute (mparams, a, tgs, diag, true /* progress */);
           }
 
+          if (pre_oif->operation_post != nullptr)
+            pre_oif->operation_post (ctx, {}, true /* inner */);
+
+          if (oif->operation_post != nullptr)
+            oif->operation_post (ctx, oparams, false /* inner */);
+
           if (mif->operation_post != nullptr)
             mif->operation_post (ctx, mparams, pre_oid);
 
@@ -1350,6 +1377,15 @@ main (int argc, char* argv[])
 
         ctx.current_operation (*oif, outer_oif);
 
+        if (outer_oif != nullptr && outer_oif->operation_pre != nullptr)
+          outer_oif->operation_pre (ctx, oparams, false /* inner */, l);
+
+        if (oif->operation_pre != nullptr)
+          oif->operation_pre (ctx,
+                              outer_oif == nullptr ? oparams : values {},
+                              true /* inner */,
+                              l);
+
         action a (mid, oid, oif->outer_id);
 
         {
@@ -1368,6 +1404,14 @@ main (int argc, char* argv[])
             mif->execute (mparams, a, tgs, diag, true /* progress */);
         }
 
+        if (oif->operation_post != nullptr)
+          oif->operation_post (ctx,
+                               outer_oif == nullptr ? oparams : values {},
+                               true /* inner */);
+
+        if (outer_oif != nullptr && outer_oif->operation_post != nullptr)
+          outer_oif->operation_post (ctx, oparams, false /* inner */);
+
         if (post_oid != 0)
         {
           tgs.reset ();
@@ -1380,6 +1424,12 @@ main (int argc, char* argv[])
 
           ctx.current_operation (*post_oif, oif);
 
+          if (oif->operation_pre != nullptr)
+            oif->operation_pre (ctx, oparams, false /* inner */, l);
+
+          if (post_oif->operation_pre != nullptr)
+            post_oif->operation_pre (ctx, {}, true /* inner */, l);
+
           action a (mid, post_oid, oid);
 
           {
@@ -1398,6 +1448,12 @@ main (int argc, char* argv[])
               mif->execute (mparams, a, tgs, diag, true /* progress */);
           }
 
+          if (post_oif->operation_post != nullptr)
+            post_oif->operation_post (ctx, {}, true /* inner */);
+
+          if (oif->operation_post != nullptr)
+            oif->operation_post (ctx, oparams, false /* inner */);
+
           if (mif->operation_post != nullptr)
             mif->operation_post (ctx, mparams, post_oid);