diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2020-09-29 21:14:08 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2020-10-01 17:03:23 +0300 |
| commit | aaa67b496c2abf1816aeadc83beac5ea8e2f681f (patch) | |
| tree | 42db89be9065fc519a1a310490d686943c7c5f46 | |
| parent | b937ec2bf461ec06bf601e854f694e86060eba59 (diff) | |
Adapt to adding ext_mods parameter to butl::b_info()
| -rw-r--r-- | bdep/project.cxx | 9 | ||||
| -rw-r--r-- | bdep/project.hxx | 2 | ||||
| -rw-r--r-- | bdep/publish.cxx | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/bdep/project.cxx b/bdep/project.cxx index 9467be1..936a78f 100644 --- a/bdep/project.cxx +++ b/bdep/project.cxx @@ -408,11 +408,12 @@ namespace bdep } package_info - package_b_info (const common_options& o, const dir_path& d) + package_b_info (const common_options& o, const dir_path& d, bool ext_mods) { try { return b_info (d, + ext_mods, verb, [] (const char* const args[], size_t n) { @@ -436,7 +437,7 @@ namespace bdep standard_version package_version (const common_options& o, const dir_path& d) { - package_info pi (package_b_info (o, d)); + package_info pi (package_b_info (o, d, false /* ext_mods */)); if (pi.version.empty ()) fail << "empty version for package directory " << d; @@ -455,7 +456,9 @@ namespace bdep // Note: the package directory inside the configuration is a bit of an // assumption. // - package_info pi (package_b_info (o, (dir_path (cfg) /= p.string ()))); + package_info pi (package_b_info (o, + (dir_path (cfg) /= p.string ()), + false /* ext_mods */)); if (pi.version.empty ()) fail << "empty version for package " << p; diff --git a/bdep/project.hxx b/bdep/project.hxx index 609c144..35b9441 100644 --- a/bdep/project.hxx +++ b/bdep/project.hxx @@ -273,7 +273,7 @@ namespace bdep using package_info = butl::b_project_info; package_info - package_b_info (const common_options&, const dir_path&); + package_b_info (const common_options&, const dir_path&, bool ext_mods); } #endif // BDEP_PROJECT_HXX diff --git a/bdep/publish.cxx b/bdep/publish.cxx index e5e6f26..d39cbcc 100644 --- a/bdep/publish.cxx +++ b/bdep/publish.cxx @@ -873,7 +873,7 @@ namespace bdep { dir_path d (prj / pl.path); - package_info pi (package_b_info (o, d)); + package_info pi (package_b_info (o, d, false /* ext_mods */)); if (pi.src_root == pi.out_root) fail << "package " << pl.name << " source directory is not forwarded" << |