aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bdep/ci.cxx12
-rw-r--r--bdep/project.cxx8
-rw-r--r--bdep/project.hxx3
-rw-r--r--bdep/publish.cxx4
4 files changed, 14 insertions, 13 deletions
diff --git a/bdep/ci.cxx b/bdep/ci.cxx
index e6acf98..3569feb 100644
--- a/bdep/ci.cxx
+++ b/bdep/ci.cxx
@@ -347,7 +347,9 @@ namespace bdep
{
// Add a package to the list and suppressing duplicates.
//
- auto add_package = [&o, &pkgs] (package_name n, const dir_path& d)
+ auto add_package = [&pkgs] (package_name n,
+ const dir_path& d,
+ package_info&& pi)
{
auto i (find_if (pkgs.begin (),
pkgs.end (),
@@ -356,8 +358,6 @@ namespace bdep
if (i != pkgs.end ())
return;
- package_info pi (package_b_info (o, d, false /* ext_mods */));
-
// Verify the package version, unless it is standard and thus is
// already verified.
//
@@ -380,13 +380,13 @@ namespace bdep
for (package_location& p: pp.packages)
{
dir_path d (pp.project / p.path);
- package_info pi (package_b_info (o, d, false /* ext_mods */));
+ package_info pi (package_b_info (o, d, b_info_flags::none));
if (pi.src_root == pi.out_root)
fail << "package " << p.name << " source directory is not forwarded" <<
info << "package source directory is " << d;
- add_package (p.name, d);
+ add_package (p.name, d, move (pi));
}
}
else
@@ -425,7 +425,7 @@ namespace bdep
package_info pi (package_b_info (o,
dir_path (c->path) /= n.string (),
- false /* ext_mods */));
+ b_info_flags::none));
verify_package_info (pi, n);
diff --git a/bdep/project.cxx b/bdep/project.cxx
index d671286..864e677 100644
--- a/bdep/project.cxx
+++ b/bdep/project.cxx
@@ -486,12 +486,12 @@ namespace bdep
}
package_info
- package_b_info (const common_options& o, const dir_path& d, bool ext_mods)
+ package_b_info (const common_options& o, const dir_path& d, b_info_flags fl)
{
try
{
return b_info (d,
- ext_mods,
+ fl,
verb,
[] (const char* const args[], size_t n)
{
@@ -515,7 +515,7 @@ namespace bdep
standard_version
package_version (const common_options& o, const dir_path& d)
{
- package_info pi (package_b_info (o, d, false /* ext_mods */));
+ package_info pi (package_b_info (o, d, b_info_flags::none));
if (pi.version.empty ())
fail << "package in directory " << d << " does not use standard version";
@@ -536,7 +536,7 @@ namespace bdep
//
package_info pi (package_b_info (o,
(dir_path (cfg) /= p.string ()),
- false /* ext_mods */));
+ b_info_flags::none));
verify_package_info (pi, p);
return move (pi.version);
diff --git a/bdep/project.hxx b/bdep/project.hxx
index e789fc2..c40fe61 100644
--- a/bdep/project.hxx
+++ b/bdep/project.hxx
@@ -297,9 +297,10 @@ namespace bdep
// Obtain build2 project info for package source or output directory.
//
using package_info = butl::b_project_info;
+ using butl::b_info_flags;
package_info
- package_b_info (const common_options&, const dir_path&, bool ext_mods);
+ package_b_info (const common_options&, const dir_path&, b_info_flags);
// Verify that the package name matches what we expect it to be and the
// package uses a standard version.
diff --git a/bdep/publish.cxx b/bdep/publish.cxx
index 9a6fcfd..c358add 100644
--- a/bdep/publish.cxx
+++ b/bdep/publish.cxx
@@ -173,7 +173,7 @@ namespace bdep
// way to deduce it and thus it needs to be specified explicitly.
//
string s; // Section.
- package_info pi (package_b_info (o, d, false /* ext_mods */));
+ package_info pi (package_b_info (o, d, b_info_flags::none));
if (!pi.version.empty ()) // Does the package use the standard version?
{
@@ -1017,7 +1017,7 @@ namespace bdep
{
dir_path d (prj / pl.path);
- package_info pi (package_b_info (o, d, false /* ext_mods */));
+ package_info pi (package_b_info (o, d, b_info_flags::none));
if (pi.src_root == pi.out_root)
fail << "package " << pl.name << " source directory is not forwarded" <<