New configuration logic, iteration 1

4 files changed, 13 insertions, 13 deletions

diff --git a/build2/test/module b/build2/test/module
index 8736851..756b4f6 100644
--- a/build2/test/module
+++ b/build2/test/module
@@ -15,11 +15,11 @@ namespace build2
   namespace test
   {
     extern "C" void
-    test_boot (scope&, const location&, unique_ptr<module>&);
+    test_boot (scope&, const location&, unique_ptr<module_base>&);
 
     extern "C" bool
     test_init (
-      scope&, scope&, const location&, unique_ptr<module>&, bool, bool);
+      scope&, scope&, const location&, unique_ptr<module_base>&, bool, bool);
   }
 }
 
diff --git a/build2/test/module.cxx b/build2/test/module.cxx
index d5f6430..3ae9996 100644
--- a/build2/test/module.cxx
+++ b/build2/test/module.cxx
@@ -22,7 +22,7 @@ namespace build2
     static rule rule_;
 
     extern "C" void
-    test_boot (scope& root, const location&, unique_ptr<module>&)
+    test_boot (scope& root, const location&, unique_ptr<module_base>&)
     {
       tracer trace ("test::boot");
 
@@ -38,12 +38,12 @@ namespace build2
       {
         auto& v (var_pool);
 
-        // @@ OVR
-
-        v.insert<bool> ("test");
-        v.insert<name> ("test.input");
-        v.insert<name> ("test.output");
-        v.insert<name> ("test.roundtrip");
+        // Note: none are overridable.
+        //
+        v.insert<bool>    ("test");
+        v.insert<name>    ("test.input");
+        v.insert<name>    ("test.output");
+        v.insert<name>    ("test.roundtrip");
         v.insert<strings> ("test.options");
         v.insert<strings> ("test.arguments");
       }
@@ -53,7 +53,7 @@ namespace build2
     test_init (scope& root,
                scope&,
                const location& l,
-               unique_ptr<module>&,
+               unique_ptr<module_base>&,
                bool first,
                bool)
     {
diff --git a/build2/test/operation.cxx b/build2/test/operation.cxx
index dc213cf..a63c409 100644
--- a/build2/test/operation.cxx
+++ b/build2/test/operation.cxx
@@ -20,6 +20,7 @@ namespace build2
     }
 
     operation_info test {
+      test_id,
       "test",
       "test",
       "testing",
diff --git a/build2/test/rule.cxx b/build2/test/rule.cxx
index 75bae4a..ccf52e0 100644
--- a/build2/test/rule.cxx
+++ b/build2/test/rule.cxx
@@ -96,7 +96,6 @@ namespace build2
       // We should have either arguments or input/roundtrip. Again, use
       // lookup depth to figure out who takes precedence.
       //
-      //@@ OVR
       auto ip (t.find ("test.input"));
       auto op (t.find ("test.output"));
       auto rp (t.find ("test.roundtrip"));
@@ -307,7 +306,7 @@ namespace build2
 
       // Do we have options?
       //
-      if (auto l = t["test.options"]) //@@ OVR
+      if (auto l = t["test.options"])
         append_options (args, cast<strings> (l));
 
       // Do we have input?
@@ -323,7 +322,7 @@ namespace build2
       //
       else
       {
-        if (auto l = t["test.arguments"]) //@@ OVR
+        if (auto l = t["test.arguments"])
           append_options (args, cast<strings> (l));
       }