diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2019-10-24 15:16:42 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2019-10-24 15:16:42 +0200 |
| commit | f96f707ae4598e2ecc616a6e2aa47ace943c7eb5 (patch) | |
| tree | e8ebc2fbece9a67b2533a8fc166a9384a73d9e19 /bdep/project.cxx | |
| parent | 04be612dead00c36c8c6ff748c252e8e5d3b1e5c (diff) | |
Add --forward option to bdep-submit
This option instructs the submit command to use each package's forwarded
configuration in order to prepare the distributions. This help with setups
where there is no single configuration that had all the packages (such as
a build system module project).
Diffstat (limited to 'bdep/project.cxx')
| -rw-r--r-- | bdep/project.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/bdep/project.cxx b/bdep/project.cxx index 7f80c9f..d8cfc8a 100644 --- a/bdep/project.cxx +++ b/bdep/project.cxx @@ -5,7 +5,6 @@ #include <bdep/project.hxx> #include <bdep/project-odb.hxx> -#include <libbutl/b.mxx> #include <libbutl/manifest-parser.mxx> #include <libbpkg/manifest.hxx> @@ -406,10 +405,8 @@ namespace bdep } } - // Obtain build2 project info for package source or output directories. - // - static b_project_info - package_info (const common_options& o, const dir_path& d) + package_info + package_b_info (const common_options& o, const dir_path& d) { try { @@ -437,7 +434,7 @@ namespace bdep standard_version package_version (const common_options& o, const dir_path& d) { - b_project_info pi (package_info (o, d)); + package_info pi (package_b_info (o, d)); if (pi.version.empty ()) fail << "empty version for package directory " << d; @@ -456,7 +453,7 @@ namespace bdep // Note: the package directory inside the configuration is a bit of an // assumption. // - b_project_info pi (package_info (o, (dir_path (cfg) /= p.string ()))); + package_info pi (package_b_info (o, (dir_path (cfg) /= p.string ()))); if (pi.version.empty ()) fail << "empty version for package " << p; |