Save caches before starting the build

[builder.git] / source / config.cpp

diff --git a/source/config.cpp b/source/config.cpp
index dd5cda148dea67a838e73d0d720fb47cdea6c966..36e7870683b3bfed9e1474306ee8adde2ce13a84 100644 (file)
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -1,14 +1,6 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <msp/core/except.h>
+#include <msp/core/maputils.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
-#include <msp/io/except.h>
 #include <msp/io/file.h>
 #include <msp/io/print.h>
 #include <msp/time/utils.h>
@@ -21,21 +13,36 @@ using namespace Msp;
 
 Config::Config(SourcePackage &p):
        package(p),
-       freeze_mtime(false)
+       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)));
+       Option opt(f);
+       InputOptions::const_iterator i = pending_options.find(opt.name);
+       if(i!=pending_options.end())
+               opt.value = i->second;
+
+       return options.insert(OptionMap::value_type(opt.name, opt)).first->second;
 }
 
-const Config::Option &Config::get_option(const string &name) const
+bool Config::set_option(const string &opt, const string &val)
 {
-       OptionMap::const_iterator i = options.find(name);
-       if(i==options.end())
-               throw KeyError("Unknown option", name);
+       bool result = false;
 
-       return i->second;
+       OptionMap::iterator i = options.find(opt);
+       if(i!=options.end())
+       {
+               if(i->second.value!=val)
+               {
+                       result = true;
+                       changed = true;
+                       mtime = Time::now();
+               }
+               i->second.value = val;
+       }
+
+       return result;
 }
 
 bool Config::is_option(const string &name) const
@@ -43,126 +50,63 @@ bool Config::is_option(const string &name) const
        return options.count(name);
 }
 
-void Config::select_last_profile()
+const Config::Option &Config::get_option(const string &name) const
 {
-       try
-       {
-               IO::BufferedFile in((package.get_source()/".profile").str());
-               string profile;
-               in.getline(profile);
-               set_option("profile", profile);
-       }
-       catch(const IO::FileNotFound &)
-       { }
-
-       freeze_mtime = true;
-       package.get_builder().apply_profile_template(*this, get_option("profile").value);
-       freeze_mtime = false;
-
-       load();
+       return get_item(options, name);
 }
 
-void Config::select_profile(const string &profile)
+void Config::load()
 {
-       set_option("profile", profile);
-
-       if(!package.get_builder().get_dry_run())
+       FS::Path fn = package.get_source_directory()/".config";
+       FS::Stat stat = FS::stat(fn);
+       if(stat)
        {
-               IO::BufferedFile out((package.get_source()/".profile").str(), IO::M_WRITE);
-               IO::print(out, "%s\n", profile);
-       }
+               package.get_builder().get_logger().log("files", format("Reading %s", fn));
+               IO::BufferedFile in(fn.str());
 
-       freeze_mtime = true;
-       package.get_builder().apply_profile_template(*this, profile);
-       freeze_mtime = false;
+               mtime = stat.get_modify_time();
 
-       load();
-}
-
-bool Config::update(const StringMap &opts)
-{
-       bool changed = false;
-       for(StringMap::const_iterator i=opts.begin(); i!=opts.end(); ++i)
-       {
-               if(set_option(i->first, i->second) && i->first!="profile")
-                       changed = true;
+               DataFile::Parser parser(in, fn.str());
+               Loader loader(*this);
+               loader.load(parser);
        }
-
-       if(changed && !freeze_mtime)
-               mtime = Time::now();
-
-       return changed;
-}
-
-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
 {
-       FS::Path fn = package.get_source()/".options";
+       if(!changed)
+               return;
 
-       OptionMap::const_iterator i = options.find("profile");
-       if(i!=options.end())
-               fn = package.get_source()/(".options."+i->second.value);
+       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(i=options.begin(); i!=options.end(); ++i)
+       for(OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i)
                IO::print(out, "option \"%s\" \"%s\";\n", i->second.name, i->second.value);
-}
 
-bool Config::set_option(const string &opt, const string &val)
-{
-       bool result = false;
-
-       OptionMap::iterator i = options.find(opt);
-       if(i!=options.end())
-       {
-               if(i->second.value!=val)
-                       result = true;
-               i->second.value = val;
-       }
-
-       return result;
+       changed = false;
 }
 
-void Config::load()
-{
-       FS::Path fn = package.get_source()/(".options."+get_option("profile").value);
-
-       try
-       {
-               IO::BufferedFile in(fn.str());
-
-               mtime = Time::TimeStamp::from_unixtime(FS::stat(fn).st_mtime);
 
-               DataFile::Parser parser(in, fn.str());
-               Loader loader(*this);
-               loader.load(parser);
-       }
-       catch(const IO::FileNotFound &)
-       { }
+Config::Option::Option(const Feature &f):
+       Feature(f),
+       value(default_value)
+{
+       name = "with_"+name;
 }
 
 
-Config::Option::Option(const string &n, const string &v, const string &d):
-       name(n),
-       defv(v),
-       descr(d),
-       value(v)
-{ }
-
-
 Config::Loader::Loader(Config &c):
-       conf(c)
+       DataFile::ObjectLoader<Config>(c)
 {
        add("option", &Loader::option);
 }
 
 void Config::Loader::option(const string &n, const string &v)
 {
-       conf.set_option(n, v);
+       if(obj.options.count(n))
+               obj.set_option(n, v);
+       else
+               obj.pending_options[n] = v;
 }