Rearrange Target members

[builder.git] / source / config.cpp

diff --git a/source/config.cpp b/source/config.cpp
index d96140fdc9feb60b1ac83bc204d89a52acea9f33..1ab70c8a8af3431e983b9f6bdc38f9642ba4af24 100644 (file)
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -13,7 +13,8 @@ using namespace Msp;
 
 Config::Config(SourcePackage &p):
        package(p),
-       freeze_mtime(false)
+       freeze_mtime(false),
+       changed(false)
 { }
 
 void Config::add_option(const string &n, const string &v, const string &d)
@@ -53,12 +54,6 @@ 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;
@@ -68,17 +63,20 @@ void Config::select_profile(const string &profile)
 
 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 && !freeze_mtime)
+       {
                mtime = Time::now();
+               changed = true;
+       }
 
-       return changed;
+       return changed_now;
 }
 
 void Config::finish()
@@ -89,12 +87,20 @@ void Config::finish()
 
 void Config::save() const
 {
+       if(!changed)
+               return;
+
        FS::Path fn = package.get_source()/".options";
 
        OptionMap::const_iterator i = options.find("profile");
        if(i!=options.end())
+       {
                fn = package.get_source()/(".options."+i->second.value);
 
+               IO::BufferedFile profile_out((package.get_source()/".profile").str(), IO::M_WRITE);
+               IO::print(profile_out, "%s\n", i->second.value);
+       }
+
        IO::BufferedFile out(fn.str(), IO::M_WRITE);
 
        for(i=options.begin(); i!=options.end(); ++i)