diff options
Diffstat (limited to 'bpkg')
-rw-r--r-- | bpkg/auth | 2 | ||||
-rw-r--r-- | bpkg/bpkg.cli | 34 | ||||
-rw-r--r-- | bpkg/bpkg.cxx | 28 | ||||
-rw-r--r-- | bpkg/buildfile | 8 | ||||
-rw-r--r-- | bpkg/cfg-add | 19 | ||||
-rw-r--r-- | bpkg/cfg-fetch | 19 | ||||
-rw-r--r-- | bpkg/package | 2 | ||||
-rw-r--r-- | bpkg/pkg-build.cli | 4 | ||||
-rw-r--r-- | bpkg/pkg-build.cxx | 4 | ||||
-rw-r--r-- | bpkg/pkg-fetch.cli | 2 | ||||
-rw-r--r-- | bpkg/pkg-fetch.cxx | 4 | ||||
-rw-r--r-- | bpkg/rep-add | 19 | ||||
-rw-r--r-- | bpkg/rep-add.cli (renamed from bpkg/cfg-add.cli) | 14 | ||||
-rw-r--r-- | bpkg/rep-add.cxx (renamed from bpkg/cfg-add.cxx) | 10 | ||||
-rw-r--r-- | bpkg/rep-fetch | 19 | ||||
-rw-r--r-- | bpkg/rep-fetch.cli (renamed from bpkg/cfg-fetch.cli) | 14 | ||||
-rw-r--r-- | bpkg/rep-fetch.cxx (renamed from bpkg/cfg-fetch.cxx) | 18 |
17 files changed, 109 insertions, 111 deletions
@@ -28,7 +28,7 @@ namespace bpkg // // Note that one drawback of doing this as part of an existing transaction // is that if things go south and the transaction gets aborted, then all the - // user's confirmations will be lost. For example, cfg-fetch could fail + // user's confirmations will be lost. For example, rep-fetch could fail // because it was unable to fetch some prerequisite repositories. // shared_ptr<const certificate> diff --git a/bpkg/bpkg.cli b/bpkg/bpkg.cli index 107ef0a..13299b3 100644 --- a/bpkg/bpkg.cli +++ b/bpkg/bpkg.cli @@ -155,16 +155,26 @@ namespace bpkg "\l{bpkg-cfg-create(1)} \- create configuration" } - bool cfg-add|add + bool rep-info { - "<rep>", - "\l{bpkg-cfg-add(1)} \- add repository to configuration", - "" + "\l{bpkg-rep-info(1)} \- print repository information" } - bool cfg-fetch|fetch + bool rep-add|add { - "\l{bpkg-cfg-fetch(1)} \- fetch list of available packages" + "\l{bpkg-rep-add(1)} \- add repository to configuration" + } + + bool rep-fetch|fetch + { + "\l{bpkg-rep-fetch(1)} \- fetch list of available packages" + } + + bool rep-create + { + "[<dir>]", + "\l{bpkg-rep-create(1)} \- create repository", + "" } bool pkg-status|status @@ -238,18 +248,6 @@ namespace bpkg { "\l{bpkg-pkg-purge(1)} \- purge package" } - - bool rep-info - { - "\l{bpkg-rep-info(1)} \- print repository information" - } - - bool rep-create - { - "[<dir>]", - "\l{bpkg-rep-create(1)} \- create repository", - "" - } }; // Make sure these don't conflict with command names above. diff --git a/bpkg/bpkg.cxx b/bpkg/bpkg.cxx index c94dde9..561e32e 100644 --- a/bpkg/bpkg.cxx +++ b/bpkg/bpkg.cxx @@ -16,6 +16,8 @@ // #include <bpkg/help> +#include <bpkg/cfg-create> + #include <bpkg/pkg-build> #include <bpkg/pkg-clean> #include <bpkg/pkg-configure> @@ -31,12 +33,10 @@ #include <bpkg/pkg-update> #include <bpkg/pkg-verify> -#include <bpkg/cfg-add> -#include <bpkg/cfg-create> -#include <bpkg/cfg-fetch> - -#include <bpkg/rep-info> +#include <bpkg/rep-add> #include <bpkg/rep-create> +#include <bpkg/rep-fetch> +#include <bpkg/rep-info> using namespace std; using namespace bpkg; @@ -205,6 +205,12 @@ try break; \ } + // cfg-* commands + // +#define CFG_COMMAND(CMD) COMMAND_IMPL(cfg_, "cfg-", CMD) + + CFG_COMMAND (create); + // pkg-* commands // #define PKG_COMMAND(CMD) COMMAND_IMPL(pkg_, "pkg-", CMD) @@ -224,20 +230,14 @@ try PKG_COMMAND (update); PKG_COMMAND (verify); - // cfg-* commands - // -#define CFG_COMMAND(CMD) COMMAND_IMPL(cfg_, "cfg-", CMD) - - CFG_COMMAND (add); - CFG_COMMAND (create); - CFG_COMMAND (fetch); - // rep-* commands // #define REP_COMMAND(CMD) COMMAND_IMPL(rep_, "rep-", CMD) - REP_COMMAND (info); + REP_COMMAND (add); REP_COMMAND (create); + REP_COMMAND (fetch); + REP_COMMAND (info); assert (false); fail << "unhandled command"; diff --git a/bpkg/buildfile b/bpkg/buildfile index 8436c7c..5067780 100644 --- a/bpkg/buildfile +++ b/bpkg/buildfile @@ -13,9 +13,7 @@ exe{bpkg}: \ {hxx cxx}{ auth } \ {hxx }{ bpkg-version } \ { cxx}{ bpkg } {hxx ixx cxx}{ bpkg-options } \ -{hxx cxx}{ cfg-add } {hxx ixx cxx}{ cfg-add-options } \ {hxx cxx}{ cfg-create } {hxx ixx cxx}{ cfg-create-options } \ -{hxx cxx}{ cfg-fetch } {hxx ixx cxx}{ cfg-fetch-options } \ {hxx cxx}{ checksum } \ {hxx ixx cxx}{ common-options } \ {hxx ixx cxx}{ configuration-options } \ @@ -43,7 +41,9 @@ exe{bpkg}: \ {hxx cxx}{ pkg-unpack } {hxx ixx cxx}{ pkg-unpack-options } \ {hxx }{ pkg-update } {hxx ixx cxx}{ pkg-update-options } \ {hxx cxx}{ pkg-verify } {hxx ixx cxx}{ pkg-verify-options } \ +{hxx cxx}{ rep-add } {hxx ixx cxx}{ rep-add-options } \ {hxx cxx}{ rep-create } {hxx ixx cxx}{ rep-create-options } \ +{hxx cxx}{ rep-fetch } {hxx ixx cxx}{ rep-fetch-options } \ {hxx cxx}{ rep-info } {hxx ixx cxx}{ rep-info-options } \ {hxx cxx}{ satisfaction } \ {hxx }{ types } \ @@ -98,8 +98,8 @@ if! $cli.loaded # rep-* command. # -{hxx ixx cxx}{cfg-add-options}: cli{cfg-add} -{hxx ixx cxx}{cfg-fetch-options}: cli{cfg-fetch} +{hxx ixx cxx}{rep-add-options}: cli{rep-add} +{hxx ixx cxx}{rep-fetch-options}: cli{rep-fetch} {hxx ixx cxx}{rep-info-options}: cli{rep-info} {hxx ixx cxx}{rep-create-options}: cli{rep-create} diff --git a/bpkg/cfg-add b/bpkg/cfg-add deleted file mode 100644 index eec8859..0000000 --- a/bpkg/cfg-add +++ /dev/null @@ -1,19 +0,0 @@ -// file : bpkg/cfg-add -*- C++ -*- -// copyright : Copyright (c) 2014-2016 Code Synthesis Ltd -// license : MIT; see accompanying LICENSE file - -#ifndef BPKG_CFG_ADD -#define BPKG_CFG_ADD - -#include <bpkg/types> -#include <bpkg/utility> - -#include <bpkg/cfg-add-options> - -namespace bpkg -{ - int - cfg_add (const cfg_add_options&, cli::scanner& args); -} - -#endif // BPKG_CFG_ADD diff --git a/bpkg/cfg-fetch b/bpkg/cfg-fetch deleted file mode 100644 index 57a4095..0000000 --- a/bpkg/cfg-fetch +++ /dev/null @@ -1,19 +0,0 @@ -// file : bpkg/cfg-fetch -*- C++ -*- -// copyright : Copyright (c) 2014-2016 Code Synthesis Ltd -// license : MIT; see accompanying LICENSE file - -#ifndef BPKG_CFG_FETCH -#define BPKG_CFG_FETCH - -#include <bpkg/types> -#include <bpkg/utility> - -#include <bpkg/cfg-fetch-options> - -namespace bpkg -{ - int - cfg_fetch (const cfg_fetch_options&, cli::scanner& args); -} - -#endif // BPKG_CFG_FETCH diff --git a/bpkg/package b/bpkg/package index 2bfc575..42cf2af 100644 --- a/bpkg/package +++ b/bpkg/package @@ -435,7 +435,7 @@ namespace bpkg // Repository from which this package came. Note that it is not // a pointer to the repository object because it could be wiped - // out (e.g., as a result of cfg-fetch). We call such packages + // out (e.g., as a result of rep-fetch). We call such packages // "orphans". While we can get a list of orphan's prerequisites // (by loading its manifest), we wouldn't know which repository // to use as a base to resolve them. As a result, an orphan that diff --git a/bpkg/pkg-build.cli b/bpkg/pkg-build.cli index e0ec9b1..222519b 100644 --- a/bpkg/pkg-build.cli +++ b/bpkg/pkg-build.cli @@ -25,8 +25,8 @@ namespace bpkg Each package can be specified as just the name (<pkg>) with optional package version (<ver>) in which case the package will be automatically - fetched from one of the repositories. See the \l{bpkg-cfg-add(1)} and - \l{bpkg-cfg-fetch(1)} commands for more information on package + fetched from one of the repositories. See the \l{bpkg-rep-add(1)} and + \l{bpkg-rep-fetch(1)} commands for more information on package repositories. If <ver> is not specified, then the latest available version will be built. To downgrade, the desired version must be specified explicitly. diff --git a/bpkg/pkg-build.cxx b/bpkg/pkg-build.cxx index efb708b..21822f7 100644 --- a/bpkg/pkg-build.cxx +++ b/bpkg/pkg-build.cxx @@ -1042,10 +1042,10 @@ namespace bpkg // if (db.query_value<repository_count> () == 0) dr << info << "configuration " << c << " has no repositories" - << info << "use 'bpkg cfg-add' to add a repository"; + << info << "use 'bpkg rep-add' to add a repository"; else if (db.query_value<available_package_count> () == 0) dr << info << "configuration " << c << " has no available packages" - << info << "use 'bpkg cfg-fetch' to fetch available packages " + << info << "use 'bpkg rep-fetch' to fetch available packages " << "list"; } diff --git a/bpkg/pkg-fetch.cli b/bpkg/pkg-fetch.cli index 562daab..cefb74e 100644 --- a/bpkg/pkg-fetch.cli +++ b/bpkg/pkg-fetch.cli @@ -20,7 +20,7 @@ namespace bpkg \h|DESCRIPTION| The \cb{pkg-fetch} command fetches the archive for the specified package - name and version from one of the repositories (\l{bpkg-cfg-add(1)}). If + name and version from one of the repositories (\l{bpkg-rep-add(1)}). If the \cb{--replace|-r} option is specified, then \cb{pkg-fetch} will replace the archive of a package that is already in the \cb{fetched} or \cb{unpacked} state (\l{bpkg-pkg-status(1)}). Otherwise, \cb{pkg-fetch} diff --git a/bpkg/pkg-fetch.cxx b/bpkg/pkg-fetch.cxx index 8aba4be..0534e65 100644 --- a/bpkg/pkg-fetch.cxx +++ b/bpkg/pkg-fetch.cxx @@ -178,11 +178,11 @@ namespace bpkg if (db.query_value<repository_count> () == 0) fail << "configuration " << c << " has no repositories" << - info << "use 'bpkg cfg-add' to add a repository"; + info << "use 'bpkg rep-add' to add a repository"; if (db.query_value<available_package_count> () == 0) fail << "configuration " << c << " has no available packages" << - info << "use 'bpkg cfg-fetch' to fetch available packages list"; + info << "use 'bpkg rep-fetch' to fetch available packages list"; // Note that here we compare including the revision (unlike, say in // pkg-status). Which means one cannot just specify 1.0.0 and get 1.0.0+1 diff --git a/bpkg/rep-add b/bpkg/rep-add new file mode 100644 index 0000000..7dcb9b0 --- /dev/null +++ b/bpkg/rep-add @@ -0,0 +1,19 @@ +// file : bpkg/rep-add -*- C++ -*- +// copyright : Copyright (c) 2014-2016 Code Synthesis Ltd +// license : MIT; see accompanying LICENSE file + +#ifndef BPKG_REP_ADD +#define BPKG_REP_ADD + +#include <bpkg/types> +#include <bpkg/utility> + +#include <bpkg/rep-add-options> + +namespace bpkg +{ + int + rep_add (const rep_add_options&, cli::scanner& args); +} + +#endif // BPKG_REP_ADD diff --git a/bpkg/cfg-add.cli b/bpkg/rep-add.cli index 8bc17c3..c1130c0 100644 --- a/bpkg/cfg-add.cli +++ b/bpkg/rep-add.cli @@ -1,11 +1,11 @@ -// file : bpkg/cfg-add.cli +// file : bpkg/rep-add.cli // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file include <bpkg/configuration.cli>; "\section=1" -"\name=bpkg-cfg-add" +"\name=bpkg-rep-add" "\summary=add repository to configuration" namespace bpkg @@ -15,18 +15,18 @@ namespace bpkg "\h|SYNOPSIS| - \c{\b{bpkg cfg-add}|\b{add} [<options>] <rep>} + \c{\b{bpkg rep-add}|\b{add} [<options>] <rep>} \h|DESCRIPTION| - The \cb{cfg-add} command adds the specified package repository to the + The \cb{rep-add} command adds the specified package repository to the configuration. Note that it doesn't fetch the list of available packages - for the newly added repository. For that, use the \l{bpkg-cfg-fetch(1)} + for the newly added repository. For that, use the \l{bpkg-rep-fetch(1)} command, normally, after adding all the repositories you wish to use." } - class cfg_add_options: configuration_options + class rep_add_options: configuration_options { - "\h|CFG-ADD OPTIONS|" + "\h|REP-ADD OPTIONS|" }; } diff --git a/bpkg/cfg-add.cxx b/bpkg/rep-add.cxx index 5386fff..da5bd4b 100644 --- a/bpkg/cfg-add.cxx +++ b/bpkg/rep-add.cxx @@ -1,8 +1,8 @@ -// file : bpkg/cfg-add.cxx -*- C++ -*- +// file : bpkg/rep-add.cxx -*- C++ -*- // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <bpkg/cfg-add> +#include <bpkg/rep-add> #include <bpkg/package> #include <bpkg/package-odb> @@ -16,16 +16,16 @@ using namespace butl; namespace bpkg { int - cfg_add (const cfg_add_options& o, cli::scanner& args) + rep_add (const rep_add_options& o, cli::scanner& args) { - tracer trace ("cfg_add"); + tracer trace ("rep_add"); dir_path c (o.directory ()); l4 ([&]{trace << "configuration: " << c;}); if (!args.more ()) fail << "repository location argument expected" << - info << "run 'bpkg help cfg-add' for more information"; + info << "run 'bpkg help rep-add' for more information"; repository_location rl (parse_location (args.next ())); const string& rn (rl.canonical_name ()); diff --git a/bpkg/rep-fetch b/bpkg/rep-fetch new file mode 100644 index 0000000..2adf59a --- /dev/null +++ b/bpkg/rep-fetch @@ -0,0 +1,19 @@ +// file : bpkg/rep-fetch -*- C++ -*- +// copyright : Copyright (c) 2014-2016 Code Synthesis Ltd +// license : MIT; see accompanying LICENSE file + +#ifndef BPKG_REP_FETCH +#define BPKG_REP_FETCH + +#include <bpkg/types> +#include <bpkg/utility> + +#include <bpkg/rep-fetch-options> + +namespace bpkg +{ + int + rep_fetch (const rep_fetch_options&, cli::scanner& args); +} + +#endif // BPKG_REP_FETCH diff --git a/bpkg/cfg-fetch.cli b/bpkg/rep-fetch.cli index 9cc75fd..cada453 100644 --- a/bpkg/cfg-fetch.cli +++ b/bpkg/rep-fetch.cli @@ -1,11 +1,11 @@ -// file : bpkg/cfg-fetch.cli +// file : bpkg/rep-fetch.cli // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file include <bpkg/configuration.cli>; "\section=1" -"\name=bpkg-cfg-fetch" +"\name=bpkg-rep-fetch" "\summary=fetch list of available packages" namespace bpkg @@ -15,18 +15,18 @@ namespace bpkg "\h|SYNOPSIS| - \c{\b{bpkg cfg-fetch}|\b{fetch} [<options>]} + \c{\b{bpkg rep-fetch}|\b{fetch} [<options>]} \h|DESCRIPTION| - The \cb{cfg-fetch} command fetches the list of available packages for all - the repositories that were previously added with the \l{bpkg-cfg-add(1)} + The \cb{rep-fetch} command fetches the list of available packages for all + the repositories that were previously added with the \l{bpkg-rep-add(1)} command as well as all their complement and prerequisite repositories, recursively." } - class cfg_fetch_options: configuration_options + class rep_fetch_options: configuration_options { - "\h|CFG-FETCH OPTIONS|" + "\h|REP-FETCH OPTIONS|" }; } diff --git a/bpkg/cfg-fetch.cxx b/bpkg/rep-fetch.cxx index dfbcc98..fb22986 100644 --- a/bpkg/cfg-fetch.cxx +++ b/bpkg/rep-fetch.cxx @@ -1,8 +1,8 @@ -// file : bpkg/cfg-fetch.cxx -*- C++ -*- +// file : bpkg/rep-fetch.cxx -*- C++ -*- // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd // license : MIT; see accompanying LICENSE file -#include <bpkg/cfg-fetch> +#include <bpkg/rep-fetch> #include <fstream> @@ -21,13 +21,13 @@ using namespace butl; namespace bpkg { static void - cfg_fetch (const configuration_options& co, + rep_fetch (const configuration_options& co, transaction& t, const shared_ptr<repository>& r, const shared_ptr<repository>& root, const string& reason) { - tracer trace ("cfg_fetch(rep)"); + tracer trace ("rep_fetch(rep)"); database& db (t.database ()); tracer_guard tg (db, trace); @@ -152,7 +152,7 @@ namespace bpkg } reason += r->name; - cfg_fetch (co, t, pr, root, reason); + rep_fetch (co, t, pr, root, reason); } // @@ What if we have duplicated? Ideally, we would like to check @@ -254,9 +254,9 @@ namespace bpkg } int - cfg_fetch (const cfg_fetch_options& o, cli::scanner&) + rep_fetch (const rep_fetch_options& o, cli::scanner&) { - tracer trace ("cfg_fetch"); + tracer trace ("rep_fetch"); dir_path c (o.directory ()); l4 ([&]{trace << "configuration: " << c;}); @@ -270,7 +270,7 @@ namespace bpkg if (ua.empty ()) fail << "configuration " << c << " has no repositories" << - info << "use 'bpkg cfg-add' to add a repository"; + info << "use 'bpkg rep-add' to add a repository"; // Clean repositories and available packages. At the end only // repositories that were explicitly added by the user and the @@ -308,7 +308,7 @@ namespace bpkg shared_ptr<repository> r (lp.load ()); if (!r->fetched) // Can already be loaded as a prerequisite/complement. - cfg_fetch (o, t, r, root, ""); // No reason (user-added). + rep_fetch (o, t, r, root, ""); // No reason (user-added). } size_t rcount, pcount; |