changed(false)
{ }
-void Config::add_option(const string &n, const string &v, const string &d)
+const Config::Option &Config::add_option(const Feature &f)
{
- options.insert(OptionMap::value_type(n, Option(n, v, d)));
-}
-
-const Config::Option &Config::get_option(const string &name) const
-{
- return get_item(options, name);
-}
-
-bool Config::is_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;
- }
+ Option opt(f);
+ InputOptions::const_iterator i = pending_options.find(opt.name);
+ if(i!=pending_options.end())
+ opt.value = i->second;
- 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)
- return;
-
- FS::Path fn = package.get_source()/".config";
-
- IO::BufferedFile out(fn.str(), IO::M_WRITE);
-
- for(OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i)
- IO::print(out, "option \"%s\" \"%s\";\n", i->second.name, i->second.value);
+ return options.insert(OptionMap::value_type(opt.name, opt)).first->second;
}
bool Config::set_option(const string &opt, const string &val)
if(i!=options.end())
{
if(i->second.value!=val)
+ {
result = true;
+ changed = true;
+ mtime = Time::now();
+ }
i->second.value = val;
}
return result;
}
-void Config::load()
+bool Config::is_option(const string &name) const
{
- FS::Path fn = package.get_source()/".config";
+ return options.count(name);
+}
+const Config::Option &Config::get_option(const string &name) const
+{
+ return get_item(options, name);
+}
+
+void Config::load()
+{
+ FS::Path fn = package.get_source_directory()/".config";
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::save() const
+{
+ if(!changed)
+ return;
-Config::Option::Option(const string &n, const string &v, const string &d):
- name(n),
- defv(v),
- descr(d),
- value(v)
-{ }
+ FS::Path fn = package.get_source_directory()/".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)
+ IO::print(out, "option \"%s\" \"%s\";\n", i->second.name, i->second.value);
+}
+
+
+Config::Option::Option(const Feature &f):
+ Feature(f),
+ value(default_value)
+{
+ name = "with_"+name;
+}
Config::Loader::Loader(Config &c):
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;
}