void Config::add_option(const string &n, const string &v, const string &d)
{
- options.insert(OptionMap::value_type(n, Option(n, v, d)));
+ Option opt(n, v, d);
+ if(pending_options.count(n))
+ opt.value = pending_options[n];
+ options.insert(OptionMap::value_type(n, opt));
}
const Config::Option &Config::get_option(const string &name) const
return options.count(name);
}
-bool Config::update(const StringMap &opts)
-{
- bool changed_now = false;
- for(StringMap::const_iterator i=opts.begin(); i!=opts.end(); ++i)
- {
- if(set_option(i->first, i->second) && i->first!="profile")
- changed_now = true;
- }
-
- if(changed_now)
- {
- mtime = Time::now();
- changed = true;
- }
-
- return changed_now;
-}
-
-void Config::finish()
-{
- for(OptionMap::iterator i=options.begin(); i!=options.end(); ++i)
- i->second.value = package.expand_string(i->second.value);
-}
-
void Config::save() const
{
if(!changed)
FS::Path fn = package.get_source()/".config";
+ package.get_builder().get_logger().log("files", format("Writing %s", fn));
IO::BufferedFile out(fn.str(), IO::M_WRITE);
for(OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i)
if(i!=options.end())
{
if(i->second.value!=val)
+ {
result = true;
+ changed = true;
+ }
i->second.value = val;
}
FS::Stat stat = FS::stat(fn);
if(stat)
{
+ package.get_builder().get_logger().log("files", format("Reading %s", fn));
IO::BufferedFile in(fn.str());
mtime = stat.get_modify_time();
void Config::Loader::option(const string &n, const string &v)
{
- obj.set_option(n, v);
+ if(obj.options.count(n))
+ obj.set_option(n, v);
+ else
+ obj.pending_options[n] = v;
}