aboutsummaryrefslogtreecommitdiff
path: root/build/cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-12-02 11:37:15 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-12-02 11:37:15 +0200
commit9891b20350021ce41a950645dd76df20a45c92cc (patch)
tree0cd27041b0c3413e17b9319ae99e87c5e745b1ff /build/cxx
parent74212589a797ca75e55f92a522e198915c0dbaf6 (diff)
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).
Diffstat (limited to 'build/cxx')
-rw-r--r--build/cxx/module7
-rw-r--r--build/cxx/module.cxx67
2 files changed, 42 insertions, 32 deletions
diff --git a/build/cxx/module b/build/cxx/module
index dcadcdd..a3bd436 100644
--- a/build/cxx/module
+++ b/build/cxx/module
@@ -6,14 +6,17 @@
#define BUILD_CXX_MODULE
#include <build/types>
+#include <build/utility>
+
#include <build/module>
namespace build
{
namespace cxx
{
- extern "C" void
- cxx_init (scope&, scope&, const location&, std::unique_ptr<module>&, bool);
+ extern "C" bool
+ cxx_init (
+ scope&, scope&, const location&, unique_ptr<module>&, bool, bool);
}
}
diff --git a/build/cxx/module.cxx b/build/cxx/module.cxx
index eda3593..4c0e493 100644
--- a/build/cxx/module.cxx
+++ b/build/cxx/module.cxx
@@ -27,12 +27,13 @@ namespace build
{
namespace cxx
{
- extern "C" void
+ extern "C" bool
cxx_init (scope& r,
scope& b,
- const location& l,
+ const location& loc,
std::unique_ptr<module>&,
- bool first)
+ bool first,
+ bool)
{
tracer trace ("cxx::init");
level5 ([&]{trace << "for " << b.out_path ();});
@@ -40,8 +41,12 @@ namespace build
// Initialize the bin module. Only do this if it hasn't already
// been loaded so that we don't overwrite user's bin.* settings.
//
- if (b.find_target_type ("obj") == nullptr)
- load_module ("bin", r, b, l);
+ {
+ auto l (b["bin.loaded"]);
+
+ if (!l || !as<bool> (*l))
+ load_module (false, "bin", r, b, loc);
+ }
// Register target types.
//
@@ -105,31 +110,31 @@ namespace build
//
if (first)
{
- variable_pool.find ("config.cxx", string_type); //@@ VAR type
-
- variable_pool.find ("config.cxx.poptions", strings_type);
- variable_pool.find ("config.cxx.coptions", strings_type);
- variable_pool.find ("config.cxx.loptions", strings_type);
- variable_pool.find ("config.cxx.libs", strings_type);
-
- variable_pool.find ("cxx.poptions", strings_type);
- variable_pool.find ("cxx.coptions", strings_type);
- variable_pool.find ("cxx.loptions", strings_type);
- variable_pool.find ("cxx.libs", strings_type);
-
- variable_pool.find ("cxx.export.poptions", strings_type);
- variable_pool.find ("cxx.export.coptions", strings_type);
- variable_pool.find ("cxx.export.loptions", strings_type);
- variable_pool.find ("cxx.export.libs", strings_type);
-
- variable_pool.find ("cxx.std", string_type);
-
- variable_pool.find ("h.ext", string_type);
- variable_pool.find ("c.ext", string_type);
- variable_pool.find ("hxx.ext", string_type);
- variable_pool.find ("ixx.ext", string_type);
- variable_pool.find ("txx.ext", string_type);
- variable_pool.find ("cxx.ext", string_type);
+ var_pool.find ("config.cxx", string_type); //@@ VAR type
+
+ var_pool.find ("config.cxx.poptions", strings_type);
+ var_pool.find ("config.cxx.coptions", strings_type);
+ var_pool.find ("config.cxx.loptions", strings_type);
+ var_pool.find ("config.cxx.libs", strings_type);
+
+ var_pool.find ("cxx.poptions", strings_type);
+ var_pool.find ("cxx.coptions", strings_type);
+ var_pool.find ("cxx.loptions", strings_type);
+ var_pool.find ("cxx.libs", strings_type);
+
+ var_pool.find ("cxx.export.poptions", strings_type);
+ var_pool.find ("cxx.export.coptions", strings_type);
+ var_pool.find ("cxx.export.loptions", strings_type);
+ var_pool.find ("cxx.export.libs", strings_type);
+
+ var_pool.find ("cxx.std", string_type);
+
+ var_pool.find ("h.ext", string_type);
+ var_pool.find ("c.ext", string_type);
+ var_pool.find ("hxx.ext", string_type);
+ var_pool.find ("ixx.ext", string_type);
+ var_pool.find ("txx.ext", string_type);
+ var_pool.find ("cxx.ext", string_type);
}
// Configure.
@@ -220,6 +225,8 @@ namespace build
path<txx> (b, dir_path ("include"));
path<h> (b, dir_path ("include"));
}
+
+ return true;
}
}
}