aboutsummaryrefslogtreecommitdiff
path: root/bdep/init.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-04-28 16:41:02 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-04-28 16:41:02 +0200
commitb2d5f82512d0118a0668ce02f1a0730c3dcd50b8 (patch)
treeb470b17e276a67164212065f164823aa30b5165f /bdep/init.cxx
parent77a9dc17b487123dc1aaf5c41b539d9abfe32dee (diff)
Implement auto-synchronization via build system hook
Diffstat (limited to 'bdep/init.cxx')
-rw-r--r--bdep/init.cxx24
1 files changed, 7 insertions, 17 deletions
diff --git a/bdep/init.cxx b/bdep/init.cxx
index 1875c42..303c475 100644
--- a/bdep/init.cxx
+++ b/bdep/init.cxx
@@ -18,14 +18,13 @@ namespace bdep
{
shared_ptr<configuration>
cmd_init_config (const configuration_name_options& o,
+ const configuration_add_options& ao,
const dir_path& prj,
database& db,
const dir_path& cfg,
cli::scanner& args,
bool ca,
- bool cc,
- optional<bool> cd,
- optional<bool> cf)
+ bool cc)
{
const char* m (!ca ? "--config-create" :
!cc ? "--config-add" : nullptr);
@@ -52,8 +51,8 @@ namespace bdep
}
return ca
- ? cmd_config_add ( prj, db, cfg, move (nm), cd, cf, move (id))
- : cmd_config_create (o, prj, db, cfg, args, move (nm), cd, cf, move (id));
+ ? cmd_config_add ( ao, prj, db, cfg, move (nm), move (id))
+ : cmd_config_create (o, ao, prj, db, cfg, args, move (nm), move (id));
}
void
@@ -117,7 +116,7 @@ namespace bdep
db.update (c);
t.commit ();
- cmd_sync (o, prj, c);
+ cmd_sync (o, prj, c, false /* implicit */);
}
}
@@ -181,25 +180,16 @@ namespace bdep
configurations cfgs;
if (ca || cc)
{
- optional<bool> cd;
- if (o.default_ () || o.no_default ())
- cd = o.default_ () && !o.no_default ();
-
- optional<bool> cf;
- if (o.forward () || o.no_forward ())
- cf = o.forward () && !o.no_forward ();
-
cfgs.push_back (
cmd_init_config (
o,
+ o,
prj,
db,
ca ? o.config_add () : o.config_create (),
args,
ca,
- cc,
- cd,
- cf));
+ cc));
// Fall through.
}