diff options
| -rw-r--r-- | bpkg/package-skeleton.cxx | 3 | ||||
| -rw-r--r-- | bpkg/pkg-build.cxx | 6 | ||||
| -rw-r--r-- | bpkg/pkg-configure.cxx | 32 |
3 files changed, 6 insertions, 35 deletions
diff --git a/bpkg/package-skeleton.cxx b/bpkg/package-skeleton.cxx index e6a0be9..9459d9b 100644 --- a/bpkg/package-skeleton.cxx +++ b/bpkg/package-skeleton.cxx @@ -486,7 +486,8 @@ namespace bpkg // @@ One potentially-bogus config variable could be config.*.develop. // Would have been nice not to drag it around if not used by the // package. And, could be helpful to warn that configuration variable - // does not exist. + // does not exist. But we cannot do it consistently since we don't + // always load the skeleton. // for (const variable& var: rs.ctx.var_pool) { diff --git a/bpkg/pkg-build.cxx b/bpkg/pkg-build.cxx index df58951..9c10817 100644 --- a/bpkg/pkg-build.cxx +++ b/bpkg/pkg-build.cxx @@ -2812,7 +2812,7 @@ namespace bpkg postponed_configurations& postponed_cfgs, postponed_positions& postponed_poss, // - // @@ TMP This will probably be gone (see below). + // @@ TMP-K This will probably be gone (see below). // bool force_configured = false, @@ -3060,7 +3060,7 @@ namespace bpkg // Bail out if this is a configured non-system package and no recursive // collection is required nor the collection is forced. // - // @@ TMP Forcing collection will probably be gone when we implement + // @@ TMP-K Forcing collection will probably be gone when we implement // complete negotiation implementation since we will recognize the // need to recollect by the presence of the respective config vars, // etc. @@ -6317,7 +6317,7 @@ namespace bpkg pc = &postponed_cfgs[ci]; - // @@ TMP: "shadow" seems no longer correct. + // @@ TMP-K: "shadow" seems no longer correct. // l5 ([&]{trace << "cfg-negotiation of " << *pc << " failed due " << "to dependent " << e.dependent << ", adding " diff --git a/bpkg/pkg-configure.cxx b/bpkg/pkg-configure.cxx index 477ead0..93f8602 100644 --- a/bpkg/pkg-configure.cxx +++ b/bpkg/pkg-configure.cxx @@ -365,7 +365,7 @@ namespace bpkg l4 ([&]{trace << "src_root: " << src_root << ", " << "out_root: " << out_root;}); - bool disfigured (ps.disfigure_); // @@ TMP pass explicitly. + bool disfigured (ps.disfigure_); // @@ TMP-K pass explicitly. // Verify all our prerequisites are configured and populate the // prerequisites list. @@ -424,36 +424,6 @@ namespace bpkg dvar += "**'"; } - // @@ TMP remove when settled done. - // -#if 0 - // Deduce the configuration variables which are not reflected anymore - // and disfigure them. - // - for (const config_variable& cv: p->config_variables) - { - if (cv.source == config_source::reflect) - { - const vector<config_variable>& ss (cpr.config_sources); - auto i (find_if (ss.begin (), ss.end (), - [&cv] (const config_variable& v) - { - return v.name == cv.name; - })); - - if (i == ss.end ()) - { - if (dvar.empty ()) - dvar = "config.config.disfigure="; - else - dvar += ' '; - - dvar += cv.name; - } - } - } -#endif - // Configure. // try |