aboutsummaryrefslogtreecommitdiff
path: root/build2/b.cxx
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-07-04 19:12:15 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2019-07-05 14:24:43 +0300
commit57b10c06925d0bdf6ffb38488ee908f085109e95 (patch)
treef2103684d319650c3302aef9d7a70dd64ff2a347 /build2/b.cxx
parent30b4eda196e090aa820d312e6a9435a4ae84c303 (diff)
Move config, dist, test, and install modules into library
Diffstat (limited to 'build2/b.cxx')
-rw-r--r--build2/b.cxx23
1 files changed, 9 insertions, 14 deletions
diff --git a/build2/b.cxx b/build2/b.cxx
index 4a446ac..a76a8e4 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -42,19 +42,17 @@
#include <libbuild2/parser.hxx>
-#include <build2/b-options.hxx>
+#include <libbuild2/dist/init.hxx>
+#include <libbuild2/test/init.hxx>
+#include <libbuild2/config/init.hxx>
+#include <libbuild2/install/init.hxx>
-#include <build2/config/utility.hxx> // config::save_variable()
-#include <build2/config/operation.hxx> // config::preprocess_create()
+#include <build2/b-options.hxx>
using namespace butl;
using namespace std;
-#include <build2/config/init.hxx>
#include <build2/version/init.hxx>
-#include <build2/test/init.hxx>
-#include <build2/dist/init.hxx>
-#include <build2/install/init.hxx>
#include <build2/in/init.hxx>
@@ -439,14 +437,11 @@ main (int argc, char* argv[])
using mf = module_functions;
auto& bm (builtin_modules);
- bm["config"] = mf {&config::boot, &config::init};
-
- config_save_variable = &config::save_variable;
- config_preprocess_create = &config::preprocess_create;
-
- bm["dist"] = mf {&dist::boot, &dist::init};
+ bm["config"] = config::build2_config_load ();
+ bm["dist"] = dist::build2_dist_load ();
bm["test"] = test::build2_test_load ();
- bm["install"] = mf {&install::boot, &install::init};
+ bm["install"] = install::build2_install_load ();
+
bm["version"] = mf {&version::boot, &version::init};
bm["in.base"] = mf {nullptr, &in::base_init};