From bf959a7fc119f9156c4b84c9d0a10900d9153f8d Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 27 Jul 2017 14:45:05 +0200 Subject: Initial infrastructure for utility libraries --- build2/bin/init.cxx | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'build2/bin/init.cxx') diff --git a/build2/bin/init.cxx b/build2/bin/init.cxx index 71c580b..fb9dd71 100644 --- a/build2/bin/init.cxx +++ b/build2/bin/init.cxx @@ -24,8 +24,7 @@ namespace build2 { namespace bin { - static const obj_rule obj_; - static const bmi_rule bmi_; + static const fail_rule fail_; static const lib_rule lib_; // Default config.bin.*.lib values. @@ -368,10 +367,17 @@ namespace build2 t.insert (); t.insert (); + t.insert (); + t.insert (); + t.insert (); + t.insert (); + t.insert (); t.insert (); t.insert (); + // Note: libu*{} are not installable. + // if (install_loaded) { install_path (bs, dir_path ("lib")); // Install in install.lib. @@ -422,22 +428,25 @@ namespace build2 { auto& r (bs.rules); - r.insert (perform_update_id, "bin.obj", obj_); - r.insert (perform_clean_id, "bin.obj", obj_); + r.insert (perform_update_id, "bin.obj", fail_); + r.insert (perform_clean_id, "bin.obj", fail_); + + r.insert (perform_update_id, "bin.bmi", fail_); + r.insert (perform_clean_id, "bin.bmi", fail_); - r.insert (perform_update_id, "bin.bmi", bmi_); - r.insert (perform_clean_id, "bin.bmi", bmi_); + r.insert (perform_update_id, "bin.libu", fail_); + r.insert (perform_clean_id, "bin.libu", fail_); r.insert (perform_update_id, "bin.lib", lib_); - r.insert (perform_clean_id, "bin.lib", lib_); + r.insert (perform_clean_id, "bin.lib", lib_); - // Configure member. + // Configure members. // r.insert (configure_update_id, "bin.lib", lib_); if (install_loaded) { - r.insert (perform_install_id, "bin.lib", lib_); + r.insert (perform_install_id, "bin.lib", lib_); r.insert (perform_uninstall_id, "bin.lib", lib_); } } -- cgit v1.1