Don't print the configuration header in help for empty configuration

[builder.git] / source / config.cpp

diff --git a/source/config.cpp b/source/config.cpp
index 194bf0d184f7a2922ee2c172fc49ec480fe7f7d0..75784e370d19525bef4e391ffd15d80ff873279a 100644 (file)
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -18,54 +18,10 @@ Config::Config(SourcePackage &p):
 
 void Config::add_option(const string &n, const string &v, const string &d)
 {
-       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;
-       }
-
-       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);
+       Option opt(n, v, d);
+       if(pending_options.count(n))
+               opt.value = pending_options[n];
+       options.insert(OptionMap::value_type(n, opt));
 }
 
 bool Config::set_option(const string &opt, const string &val)
@@ -76,20 +32,34 @@ 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();
@@ -100,11 +70,25 @@ void Config::load()
        }
 }
 
+void Config::save() const
+{
+       if(!changed)
+               return;
+
+       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 string &n, const string &v, const string &d):
        name(n),
-       defv(v),
-       descr(d),
+       default_value(v),
+       description(d),
        value(v)
 { }
 
@@ -117,5 +101,8 @@ 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;
 }