From 7c5d099c8d1142ffd2c05863169a624c2711eb1c Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 31 Jul 2018 09:15:45 +0200 Subject: Extract project from manifest in bdep-publish --- bdep/publish.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'bdep/publish.cxx') diff --git a/bdep/publish.cxx b/bdep/publish.cxx index eb4979d..bea883e 100644 --- a/bdep/publish.cxx +++ b/bdep/publish.cxx @@ -702,7 +702,7 @@ namespace bdep { package_name name; standard_version version; - string project; + package_name project; string section; // alpha|beta|stable (or --section) path archive; @@ -713,6 +713,7 @@ namespace bdep for (package_location& pl: pkg_locs) { package_name n (move (pl.name)); + package_name p (pl.project ? move (*pl.project) : n); standard_version v (package_version (o, cfg, n)); @@ -723,8 +724,6 @@ namespace bdep if (v.snapshot ()) fail << "package " << n << " version " << v << " is a snapshot"; - string p (prj.leaf ().string ()); // @@ TODO/TMP - // Per semver we treat zero major versions as alpha. // string s (o.section_specified () ? o.section () : @@ -755,9 +754,8 @@ namespace bdep if (i != 0) dr << '\n'; - // While currently the control repository is the same for all - // packages, this could change in the future (e.g., multi-project - // publishing). + // Currently the control repository is the same for all packages, but + // this could change in the future (e.g., multi-project publishing). // dr << " package: " << p.name << '\n' << " version: " << p.version << '\n' -- cgit v1.1