diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2015-08-27 15:11:40 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2015-08-27 15:11:40 +0200 |
| commit | fd689eb883655dcb29e505b041cd02fac01f0bac (patch) | |
| tree | 0d85ec32d95a1c96eaa7eff28734b900c44dd3ca /build/cli | |
| parent | 7f2d06258d57e39940e8fa959336da0ea66fe37f (diff) | |
Dist module/meta-operation initial implementation
Diffstat (limited to 'build/cli')
| -rw-r--r-- | build/cli/module.cxx | 20 | ||||
| -rw-r--r-- | build/cli/rule.cxx | 2 |
2 files changed, 9 insertions, 13 deletions
diff --git a/build/cli/module.cxx b/build/cli/module.cxx index 7702589..efc9ff2 100644 --- a/build/cli/module.cxx +++ b/build/cli/module.cxx @@ -61,21 +61,17 @@ namespace build { auto& rs (base.rules); - rs.insert<cli_cxx> (default_id, "cli.compile", compile_); - rs.insert<cli_cxx> (update_id, "cli.compile", compile_); - rs.insert<cli_cxx> (clean_id, "cli.compile", compile_); + rs.insert<cli_cxx> (perform_id, update_id, "cli", compile_); + rs.insert<cli_cxx> (perform_id, clean_id, "cli", compile_); - rs.insert<cxx::hxx> (default_id, "cli.compile", compile_); - rs.insert<cxx::hxx> (update_id, "cli.compile", compile_); - rs.insert<cxx::hxx> (clean_id, "cli.compile", compile_); + rs.insert<cxx::hxx> (perform_id, update_id, "cli", compile_); + rs.insert<cxx::hxx> (perform_id, clean_id, "cli", compile_); - rs.insert<cxx::cxx> (default_id, "cli.compile", compile_); - rs.insert<cxx::cxx> (update_id, "cli.compile", compile_); - rs.insert<cxx::cxx> (clean_id, "cli.compile", compile_); + rs.insert<cxx::cxx> (perform_id, update_id, "cli", compile_); + rs.insert<cxx::cxx> (perform_id, clean_id, "cli", compile_); - rs.insert<cxx::ixx> (default_id, "cli.compile", compile_); - rs.insert<cxx::ixx> (update_id, "cli.compile", compile_); - rs.insert<cxx::ixx> (clean_id, "cli.compile", compile_); + rs.insert<cxx::ixx> (perform_id, update_id, "cli", compile_); + rs.insert<cxx::ixx> (perform_id, clean_id, "cli", compile_); } // Enter module variables. diff --git a/build/cli/rule.cxx b/build/cli/rule.cxx index a892d7c..b3c57f1 100644 --- a/build/cli/rule.cxx +++ b/build/cli/rule.cxx @@ -172,7 +172,7 @@ namespace build { case perform_update_id: return &perform_update; case perform_clean_id: return &perform_clean; - default: return default_recipe; // Forward to prerequisites. + default: assert (false); return default_recipe; } } else |