diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2021-08-03 09:55:32 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2021-08-03 09:55:32 +0200 |
| commit | 164d7ce1bb116b4e8df488030689d7868155969e (patch) | |
| tree | 8c8d6f9fdc655c0a43641aa4c1e93cd53b3fdc20 /bpkg | |
| parent | ca6ac5f217f3217a2e2b5d07bf8448e0e6887447 (diff) | |
Rename --config-uuid to --uuid in bpkg-cfg-create
Diffstat (limited to 'bpkg')
| -rw-r--r-- | bpkg/cfg-create.cli | 10 | ||||
| -rw-r--r-- | bpkg/cfg-create.cxx | 2 | ||||
| -rw-r--r-- | bpkg/options-types.hxx | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/bpkg/cfg-create.cli b/bpkg/cfg-create.cli index 6bf5598..29cb2a4 100644 --- a/bpkg/cfg-create.cli +++ b/bpkg/cfg-create.cli @@ -60,10 +60,10 @@ namespace bpkg build build-time dependencies. Each configuration is assigned an automatically-generated UUID unless one - is specified with the \cb{--config-uuid} option. This UUID is used to - check the integrity of configuration links. For convenience of referring - to linked configurations, a configuration can also be assigned a name - with the \cb{--name} option. + is specified with the \cb{--uuid} option. This UUID is used to check the + integrity of configuration links. For convenience of referring to linked + configurations, a configuration can also be assigned a name with the + \cb{--name} option. A configuration also has a type specified with the \cb{--type} option. Three predefined types are \cb{target}, \cb{host}, and \cb{build2}. If @@ -143,7 +143,7 @@ namespace bpkg of type \cb{target} is created." } - uuid --config-uuid + uuid_type --uuid { "<uuid>", "Use the specified UUID as the configuration id instead of generating diff --git a/bpkg/cfg-create.cxx b/bpkg/cfg-create.cxx index 61d1ef8..09d8e79 100644 --- a/bpkg/cfg-create.cxx +++ b/bpkg/cfg-create.cxx @@ -269,7 +269,7 @@ namespace bpkg vars, o.existing (), o.wipe (), - o.config_uuid_specified () ? o.config_uuid () : optional<uuid> (), + o.uuid_specified () ? o.uuid () : optional<uuid> (), (o.host_config_specified () ? o.host_config () : optional<dir_path> ()), diff --git a/bpkg/options-types.hxx b/bpkg/options-types.hxx index 876f0a5..8e8cbf1 100644 --- a/bpkg/options-types.hxx +++ b/bpkg/options-types.hxx @@ -8,8 +8,12 @@ #include <cassert> #include <utility> // move() +#include <bpkg/types.hxx> + namespace bpkg { + using uuid_type = uuid; + enum class auth { none, |