diff options
Diffstat (limited to 'libbuild2/install')
| -rw-r--r-- | libbuild2/install/operation.cxx | 3 | ||||
| -rw-r--r-- | libbuild2/install/rule.cxx | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/libbuild2/install/operation.cxx b/libbuild2/install/operation.cxx index 52e8c94..6ae2819 100644 --- a/libbuild2/install/operation.cxx +++ b/libbuild2/install/operation.cxx @@ -37,6 +37,7 @@ namespace build2 0, "install", "install", + "install", "installing", "installed", "has nothing to install", // We cannot "be installed". @@ -61,6 +62,7 @@ namespace build2 uninstall_id, 0, "uninstall", + "install", "uninstall", "uninstalling", "uninstalled", @@ -79,6 +81,7 @@ namespace build2 update_id, // Note: not update_for_install_id. install_id, op_update.name, + nullptr, // Outer operation variable is always used. op_update.name_do, op_update.name_doing, op_update.name_did, diff --git a/libbuild2/install/rule.cxx b/libbuild2/install/rule.cxx index b8d716d..77da466 100644 --- a/libbuild2/install/rule.cxx +++ b/libbuild2/install/rule.cxx @@ -125,7 +125,7 @@ namespace build2 // // Note: not the same as lookup_install() above. // - auto l ((*pt)["install"]); + auto l ((*pt)["install"]); //@@??? if (l && cast<path> (l).string () == "false") { l5 ([&]{trace << "ignoring " << *pt << " (not installable)";}); @@ -245,7 +245,7 @@ namespace build2 // // Note: not the same as lookup_install() above. // - auto l ((*mt)["install"]); + auto l ((*mt)["install"]); //@@ if (l && cast<path> (l).string () == "false") { l5 ([&]{trace << "ignoring " << *mt << " (not installable)";}); @@ -291,7 +291,7 @@ namespace build2 if (p.is_a<exe> ()) { // Feels like one day this should be unified with include (see - // context::var_include). + // context::var_include). @@ Isn't it now? // if (p.vars.empty () || cast_empty<path> (p.vars["install"]).string () != "true") @@ -381,7 +381,7 @@ namespace build2 // // Note: not the same as lookup_install() above. // - auto l ((*pt)["install"]); + auto l ((*pt)["install"]); //@@ if (l && cast<path> (l).string () == "false") { l5 ([&]{trace << "ignoring " << *pt << " (not installable)";}); @@ -1033,7 +1033,7 @@ namespace build2 // if (!tp.empty ()) { - install_target (t, cast<path> (t["install"]), 1); + install_target (t, cast<path> (t["install"]), 1); //@@ r |= target_state::changed; } @@ -1298,7 +1298,7 @@ namespace build2 target_state r (target_state::unchanged); if (!tp.empty ()) - r |= uninstall_target (t, cast<path> (t["install"]), 1); + r |= uninstall_target (t, cast<path> (t["install"]), 1); //@@ // Then installable ad hoc group members, if any. To be anally precise, // we would have to do it in reverse, but that's not easy (it's a |