diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2023-10-26 19:37:02 +0300 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2023-11-02 14:04:09 +0300 |
commit | 87a284335715301fa2cea695386bfcd21a2fe781 (patch) | |
tree | 7eef5599883afd9ab34b897d58596dd19d59bed4 /bpkg/package-skeleton.hxx | |
parent | a72e358d7a2df330f61ad9e73137b18225bdc5cc (diff) |
Load both user and dependent configurations in (pre-)reevaluate modes
Diffstat (limited to 'bpkg/package-skeleton.hxx')
-rw-r--r-- | bpkg/package-skeleton.hxx | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/bpkg/package-skeleton.hxx b/bpkg/package-skeleton.hxx index bc5d25c..04abc0e 100644 --- a/bpkg/package-skeleton.hxx +++ b/bpkg/package-skeleton.hxx @@ -68,7 +68,8 @@ namespace bpkg bool disfigure, const vector<config_variable>* config_srcs, optional<dir_path> src_root, - optional<dir_path> out_root); + optional<dir_path> out_root, + bool load_old_dependent_config); package_key package; @@ -253,6 +254,13 @@ namespace bpkg string var_prefix_; // config.<project> strings config_vars_; + + // Configuration sources for variables in config_vars_ (parallel). Can + // only contain config_source::{user,dependent} entries (see + // load_old_config() for details). + // + vector<config_source> config_var_srcs_; + bool disfigure_; const vector<config_variable>* config_srcs_; // NULL if nothing to do or // already done. @@ -260,6 +268,8 @@ namespace bpkg dir_path src_root_; // Must be absolute and normalized. dir_path out_root_; // If empty, the same as src_root_. + bool load_old_dependent_config_; + bool created_ = false; bool verified_ = false; bool loaded_old_config_; |