diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2019-02-27 23:06:46 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-02-28 20:18:39 +0300 |
| commit | d4aef182ebc55091c02659b7549487d928eaec28 (patch) | |
| tree | 881d1d8bedbc7f88fe22a9437cce6433cfd7122d /mod/mod-build-force.cxx | |
| parent | 8054f2973d453b71806f52f0bb30725cb31d64dd (diff) | |
Build packages for different toolchains having same version but different names
Diffstat (limited to 'mod/mod-build-force.cxx')
| -rw-r--r-- | mod/mod-build-force.cxx | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/mod/mod-build-force.cxx b/mod/mod-build-force.cxx index f94cf75..2c6ac64 100644 --- a/mod/mod-build-force.cxx +++ b/mod/mod-build-force.cxx @@ -118,16 +118,22 @@ handle (request& rq, response& rs) version package_version (parse_version (params.version (), "package version")); - version toolchain_version (parse_version (params.toolchain_version (), - "toolchain version")); + string& config (params.configuration ()); - string& c (params.configuration ()); - - if (c.empty ()) + if (config.empty ()) throw invalid_argument ("no configuration name"); + string& toolchain_name (params.toolchain_name ()); + + if (toolchain_name.empty ()) + throw invalid_argument ("no toolchain name"); + + version toolchain_version (parse_version (params.toolchain_version (), + "toolchain version")); + id = build_id (package_id (move (tenant), move (p), package_version), - move (c), + move (config), + move (toolchain_name), toolchain_version); } catch (const invalid_argument& e) |