diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2018-01-20 13:46:11 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2018-02-03 14:35:45 +0200 |
| commit | 934f2a9a90c5cad3cdc8a66b50c17827a3ddbcee (patch) | |
| tree | f35f106e5369e98350327c79080c571195234c0b /build2/bin/init.cxx | |
| parent | 280f4a5bf787587227ca193cd59c6bd74091db70 (diff) | |
Get rid of action rule override semantics
Instead we now have two more or less separate match states for outer and
inner parts of an action.
Diffstat (limited to 'build2/bin/init.cxx')
| -rw-r--r-- | build2/bin/init.cxx | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/build2/bin/init.cxx b/build2/bin/init.cxx index d9f3c0e..565936f 100644 --- a/build2/bin/init.cxx +++ b/build2/bin/init.cxx @@ -11,6 +11,10 @@ #include <build2/diagnostics.hxx> #include <build2/config/utility.hxx> + +#include <build2/test/module.hxx> + +#include <build2/install/rule.hxx> #include <build2/install/utility.hxx> #include <build2/bin/rule.hxx> @@ -456,17 +460,24 @@ namespace build2 r.insert<libu> (perform_update_id, "bin.libu", fail_); r.insert<libu> (perform_clean_id, "bin.libu", fail_); - r.insert<lib> (perform_update_id, "bin.lib", lib_); - r.insert<lib> (perform_clean_id, "bin.lib", lib_); - - // Configure members. + // Similar to alias. // - r.insert<lib> (configure_update_id, "bin.lib", lib_); + r.insert<lib> (perform_id, 0, "bin.lib", lib_); + r.insert<lib> (configure_id, 0, "bin.lib", lib_); + // Treat as a see through group for install and test. + // if (install_loaded) { - r.insert<lib> (perform_install_id, "bin.lib", lib_); - r.insert<lib> (perform_uninstall_id, "bin.lib", lib_); + auto& gr (install::group_rule::instance); + + r.insert<lib> (perform_install_id, "bin.lib", gr); + r.insert<lib> (perform_uninstall_id, "bin.lib", gr); + } + + if (const test::module* m = rs.modules.lookup<test::module> ("test")) + { + r.insert<lib> (perform_test_id, "bin.lib", m->group_rule ()); } } |