diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2020-03-30 15:30:08 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2020-03-31 07:32:46 +0200 |
| commit | dfb51bc816cde2cb345f8a0300205e6ac95a2065 (patch) | |
| tree | ad5996b87bb3829f7058aa990fab65940b575249 /build2 | |
| parent | 65340a0a897c91b580db1de0bab026a0814c5d74 (diff) | |
Switch to project variable visibility by default
Diffstat (limited to 'build2')
| -rw-r--r-- | build2/b.cxx | 4 | ||||
| -rw-r--r-- | build2/cli/init.cxx | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/build2/b.cxx b/build2/b.cxx index eafa1dc..b74433d 100644 --- a/build2/b.cxx +++ b/build2/b.cxx @@ -1422,7 +1422,7 @@ main (int argc, char* argv[]) for (const variable_override& o: ctx->var_overrides) { - if (o.ovr.visibility != variable_visibility::normal) + if (o.ovr.visibility != variable_visibility::global) continue; // If we have a directory, enter the scope, similar to how we do @@ -1445,7 +1445,7 @@ main (int argc, char* argv[]) { // Ours is either project (%foo) or scope (/foo). // - if (o.ovr.visibility == variable_visibility::normal) + if (o.ovr.visibility == variable_visibility::global) continue; scope& s (o.dir diff --git a/build2/cli/init.cxx b/build2/cli/init.cxx index b0ff4f9..c68a62f 100644 --- a/build2/cli/init.cxx +++ b/build2/cli/init.cxx @@ -41,13 +41,11 @@ namespace build2 { auto& vp (rs.var_pool ()); - // Note: some overridable, some not. + // The special config.cli=false value is recognized as an explicit + // request to leave the module unconfigured. // - // The config.cli=false is recognized as an explicit request to leave - // the module unconfigured. - // - vp.insert<path> ("config.cli", true); - vp.insert<strings> ("config.cli.options", true); + vp.insert<path> ("config.cli"); + vp.insert<strings> ("config.cli.options"); //@@ TODO: split version into componets (it is stdver). // |