aboutsummaryrefslogtreecommitdiff
path: root/bdep/bdep.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-05-10 06:43:44 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-05-10 06:43:44 +0200
commite3133aa9628858bcfe414f95731831b5962358c7 (patch)
tree0c892fa9a8b84c664e92f1874327d3faeeaab31a /bdep/bdep.cxx
parent8432e7eede97c2bb324c7b6578eaf9a1a2ae4282 (diff)
Support passing additional arguments to pkg-build in sync, init, new
Diffstat (limited to 'bdep/bdep.cxx')
-rw-r--r--bdep/bdep.cxx12
1 files changed, 8 insertions, 4 deletions
diff --git a/bdep/bdep.cxx b/bdep/bdep.cxx
index 82a4259..f25bed3 100644
--- a/bdep/bdep.cxx
+++ b/bdep/bdep.cxx
@@ -61,7 +61,7 @@ cfg_name (...)
template <typename O>
static O
-init (const common_options& co, cli::scanner& scan, strings& args)
+init (const common_options& co, cli::group_scanner& scan, strings& args)
{
O o;
static_cast<common_options&> (o) = co;
@@ -100,7 +100,9 @@ init (const common_options& co, cli::scanner& scan, strings& args)
// Fall through.
}
- args.push_back (scan.next ());
+ // Copy over the argument including the group.
+ //
+ scan_argument (args, scan);
}
// Global initializations.
@@ -159,7 +161,8 @@ try
<< system_error (errno, generic_category ()); // Sanitize.
#endif
- argv_file_scanner scan (argc, argv, "--options-file");
+ argv_file_scanner argv_scan (argc, argv, "--options-file");
+ group_scanner scan (argv_scan);
// First parse common options and --version/--help.
//
@@ -177,7 +180,8 @@ try
}
strings argsv; // To be filled by parse() above.
- vector_scanner args (argsv);
+ vector_scanner vect_args (argsv);
+ group_scanner args (vect_args);
const common_options& co (o);