Redesign the library mode system

[builder.git] / source / config.cpp

diff --git a/source/config.cpp b/source/config.cpp
index d96140fdc9feb60b1ac83bc204d89a52acea9f33..194bf0d184f7a2922ee2c172fc49ec480fe7f7d0 100644 (file)
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -13,7 +13,7 @@ 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)
@@ -31,54 +31,22 @@ bool Config::is_option(const string &name) const
        return options.count(name);
 }
 
-void Config::select_last_profile()
-{
-       FS::Path profile_cache_fn = package.get_source()/".profile";
-       if(FS::exists(profile_cache_fn))
-       {
-               IO::BufferedFile in(profile_cache_fn.str());
-               string profile;
-               in.getline(profile);
-               set_option("profile", profile);
-       }
-
-       freeze_mtime = true;
-       package.get_builder().apply_profile_template(*this, get_option("profile").value);
-       freeze_mtime = false;
-
-       load();
-}
-
-void Config::select_profile(const string &profile)
-{
-       set_option("profile", profile);
-
-       if(!package.get_builder().get_dry_run())
-       {
-               IO::BufferedFile out((package.get_source()/".profile").str(), IO::M_WRITE);
-               IO::print(out, "%s\n", profile);
-       }
-
-       freeze_mtime = true;
-       package.get_builder().apply_profile_template(*this, profile);
-       freeze_mtime = false;
-
-       load();
-}
-
 bool Config::update(const StringMap &opts)
 {
-       bool changed = false;
+       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 = true;
+                       changed_now = true;
        }
 
-       if(changed && !freeze_mtime)
+       if(changed_now)
+       {
                mtime = Time::now();
+               changed = true;
+       }
 
-       return changed;
+       return changed_now;
 }
 
 void Config::finish()
@@ -89,15 +57,14 @@ void Config::finish()
 
 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()/".config";
 
        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);
 }
 
@@ -118,7 +85,7 @@ bool Config::set_option(const string &opt, const string &val)
 
 void Config::load()
 {
-       FS::Path fn = package.get_source()/(".options."+get_option("profile").value);
+       FS::Path fn = package.get_source()/".config";
 
        FS::Stat stat = FS::stat(fn);
        if(stat)