From 9891b20350021ce41a950645dd76df20a45c92cc Mon Sep 17 00:00:00 2001 From: Boris Kolpackov 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: .loaded and .configured. Also implement variable visibility (the above two variables are limited to project). --- build/context.cxx | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'build/context.cxx') diff --git a/build/context.cxx b/build/context.cxx index 699cc3c..7f30c81 100644 --- a/build/context.cxx +++ b/build/context.cxx @@ -39,7 +39,7 @@ namespace build targets.clear (); scopes.clear (); - variable_pool.clear (); + var_pool.clear (); // Reset meta/operation tables. Note that the order should match // the id constants in . @@ -59,22 +59,22 @@ namespace build // Enter builtin variables. // - variable_pool.find ("work", dir_path_type); - variable_pool.find ("home", dir_path_type); + var_pool.find ("work", dir_path_type); + var_pool.find ("home", dir_path_type); - variable_pool.find ("src_root", dir_path_type); - variable_pool.find ("out_root", dir_path_type); - variable_pool.find ("src_base", dir_path_type); - variable_pool.find ("out_base", dir_path_type); + var_pool.find ("src_root", dir_path_type); + var_pool.find ("out_root", dir_path_type); + var_pool.find ("src_base", dir_path_type); + var_pool.find ("out_base", dir_path_type); - variable_pool.find ("project", string_type); - variable_pool.find ("amalgamation", dir_path_type); + var_pool.find ("project", string_type); + var_pool.find ("amalgamation", dir_path_type); // Shouldn't be typed since the value requires pre-processing. // - variable_pool.find ("subprojects", nullptr, '='); + var_pool.find ("subprojects", nullptr, '='); - variable_pool.find ("extension", string_type); + var_pool.find ("extension", string_type); // Create global scope. For Win32 this is not a "real" root path. // On POSIX, however, this is a real path. See the comment in -- cgit v1.1