From 9891b20350021ce41a950645dd76df20a45c92cc Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 2 Dec 2015 11:37:15 +0200
Subject: Implement optional module loading

The syntax is:

using? cli

Now each module use results in two bool variables: <module>.loaded and
<module>.configured.

Also implement variable visibility (the above two variables are limited
to project).
---
 build/test/module.cxx | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'build/test/module.cxx')

diff --git a/build/test/module.cxx b/build/test/module.cxx
index deda6e9..167c09b 100644
--- a/build/test/module.cxx
+++ b/build/test/module.cxx
@@ -21,12 +21,13 @@ namespace build
   {
     static rule rule_;
 
-    extern "C" void
+    extern "C" bool
     test_init (scope& r,
                scope& b,
                const location& l,
-               unique_ptr<build::module>&,
-               bool first)
+               unique_ptr<module>&,
+               bool first,
+               bool)
     {
       tracer trace ("test::init");
 
@@ -36,7 +37,7 @@ namespace build
       if (!first)
       {
         warn (l) << "multiple test module initializations";
-        return;
+        return true;
       }
 
       const dir_path& out_root (r.out_path ());
@@ -66,13 +67,15 @@ namespace build
       // Enter module variables.
       //
       {
-        variable_pool.find ("test", bool_type);
-        variable_pool.find ("test.input", name_type);
-        variable_pool.find ("test.output", name_type);
-        variable_pool.find ("test.roundtrip", name_type);
-        variable_pool.find ("test.options", strings_type);
-        variable_pool.find ("test.arguments", strings_type);
+        var_pool.find ("test", bool_type);
+        var_pool.find ("test.input", name_type);
+        var_pool.find ("test.output", name_type);
+        var_pool.find ("test.roundtrip", name_type);
+        var_pool.find ("test.options", strings_type);
+        var_pool.find ("test.arguments", strings_type);
       }
+
+      return true;
     }
   }
 }
-- 
cgit v1.1