diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2017-04-24 16:09:07 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2017-04-24 16:09:07 +0300 |
| commit | 3dbfc8124a092c0a218b0bef5454063bc86c1e3e (patch) | |
| tree | 849d8adb3d646abbad9c932394c296c6cdf80625 | |
| parent | 566ac9e3dfb5d05ab83f81f81adf3810a8f69ebe (diff) | |
Add support for build-email package manifest value
| -rw-r--r-- | bpkg/manifest | 2 | ||||
| -rw-r--r-- | bpkg/manifest.cxx | 13 | ||||
| -rw-r--r-- | tests/manifest/testscript | 3 |
3 files changed, 18 insertions, 0 deletions
diff --git a/bpkg/manifest b/bpkg/manifest index 8ad9512..f638592 100644 --- a/bpkg/manifest +++ b/bpkg/manifest @@ -233,6 +233,7 @@ namespace bpkg // email // package-email + // build-email // class email: public std::string { @@ -339,6 +340,7 @@ namespace bpkg butl::optional<url_type> package_url; email_type email; butl::optional<email_type> package_email; + butl::optional<email_type> build_email; std::vector<dependency_alternatives> dependencies; std::vector<requirement_alternatives> requirements; diff --git a/bpkg/manifest.cxx b/bpkg/manifest.cxx index 107c2fe..2236d3a 100644 --- a/bpkg/manifest.cxx +++ b/bpkg/manifest.cxx @@ -848,6 +848,15 @@ namespace bpkg package_email = email_type (move (v), move (c)); } + else if (n == "build-email") + { + if (build_email) + bad_name ("build email redefinition"); + + string c (split_comment (v)); + + build_email = email_type (move (v), move (c)); + } else if (n == "priority") { if (priority) @@ -1242,6 +1251,10 @@ namespace bpkg s.next ("package-email", add_comment (*package_email, package_email->comment)); + if (build_email) + s.next ("build-email", + add_comment (*build_email, build_email->comment)); + for (const auto& d: dependencies) s.next ("depends", (d.conditional diff --git a/tests/manifest/testscript b/tests/manifest/testscript index 99fff14..870d48d 100644 --- a/tests/manifest/testscript +++ b/tests/manifest/testscript @@ -28,6 +28,8 @@ email: libfoo-users@example.org; Public mailing list, posts by non-members\ are allowed but moderated. package-email: libfoo-1.2.3+2@example.org; Bug reports are welcome. + build-email: libfoo-builds@example.org; Mailing list for bbot notification\ + emails. depends: libz depends: libgnutls <= 1.2.3 | libopenssl >= 2.3.4 depends: ? libboost-regex >= 1.52.0; Only if C++ compiler does not support\ @@ -49,6 +51,7 @@ tags: c++, xml, modern url: http://www.example.org/projects/libbar/ email: libbar-users@example.org + build-email: depends: libbaz (1- 2-) | libbaz [3 4-) | libbaz (5 6] | libbaz [7 8] location: bar/libbar-3.4A.5+6.tbz sha256sum: d4b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 |