From 41a31b0a61464fd506166887f621100364e67276 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 4 Nov 2019 09:37:30 +0200 Subject: Add support for configuration exporting and importing The new config.export variable specifies the alternative file to write the configuration to as part of the configure meta-operation. For example: $ b configure: proj/ config.export=proj-config.build The config.export value "applies" only to the projects on whose root scope it is specified or if it is a global override (the latter is a bit iffy but we allow it, for example, to dump everything to stdout). This means that in order to save a subproject's configuration we will have to use a scope-specific override (since the default will apply to the outermost amalgamation). For example: $ b configure: subproj/ subproj/config.export=.../subproj-config.build This could be somewhat unnatural but then it will be the amalgamation whose configuration we normally want to export. The new config.import variable specifies additional configuration files to be loaded after the project's default config.build, if any. For example: $ b create: cfg/,cc config.import=my-config.build Similar to config.export, the config.import value "applies" only to the project on whose root scope it is specified or if it is a global override. This allows the use of the standard override "positioning" machinery (i.e., where the override applies) to decide where the extra configuration files are loaded. The resulting semantics is quite natural and consistent with command line variable overrides, for example: $ b config.import=.../config.build # outermost amalgamation $ b ./config.import=.../config.build # this project $ b !config.import=.../config.build # every project Both config.export and config.import recognize the special `-` file name as an instruction to write/read to/from stdout/stdin, respectively. For example: $ b configure: src-prj/ config.export=- | b configure: dst-prj/ config.import=- --- libbuild2/dist/operation.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libbuild2/dist') diff --git a/libbuild2/dist/operation.cxx b/libbuild2/dist/operation.cxx index 391f7d8..ad829df 100644 --- a/libbuild2/dist/operation.cxx +++ b/libbuild2/dist/operation.cxx @@ -75,7 +75,7 @@ namespace build2 // For now we assume all the targets are from the same project. // - const target& t (ts[0].as_target ()); + const target& t (ts[0].as ()); const scope* rs (t.base_scope ().root_scope ()); if (rs == nullptr) @@ -118,7 +118,7 @@ namespace build2 // for (const action_target& at: ts) { - const target& t (at.as_target ()); + const target& t (at.as ()); if (rs != t.base_scope ().root_scope ()) fail << "target " << t << " is from a different project" << @@ -353,7 +353,7 @@ namespace build2 for (size_t i (0), n (files.size ()); i != n; ++i) { - const file& t (*files[i].as_target ().is_a ()); + const file& t (*files[i].as ().is_a ()); // Figure out where this file is inside the target directory. // -- cgit v1.1