X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=e4449cc80aaad3fe16c7b628f4708bdff5a80e30;hb=9134ce7f2225eb301c7b6c9aca8521c4e82dc065;hp=1ab70c8a8af3431e983b9f6bdc38f9642ba4af24;hpb=d701ca81b781cd061fd60244312b0316cf5bf4d9;p=builder.git diff --git a/source/config.cpp b/source/config.cpp index 1ab70c8..e4449cc 100644 --- a/source/config.cpp +++ b/source/config.cpp @@ -13,13 +13,15 @@ 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) { - options.insert(OptionMap::value_type(n, Option(n, v, d))); + Option opt(n, v, d); + if(pending_options.count(n)) + opt.value = pending_options[n]; + options.insert(OptionMap::value_type(n, opt)); } const Config::Option &Config::get_option(const string &name) const @@ -32,78 +34,17 @@ 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); - - freeze_mtime = true; - package.get_builder().apply_profile_template(*this, profile); - freeze_mtime = false; - - load(); -} - -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 && !freeze_mtime) - { - 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()/".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); - } + FS::Path fn = package.get_source()/".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); } @@ -115,7 +56,10 @@ bool Config::set_option(const string &opt, const string &val) if(i!=options.end()) { if(i->second.value!=val) + { result = true; + changed = true; + } i->second.value = val; } @@ -124,11 +68,11 @@ 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) { + package.get_builder().get_logger().log("files", format("Reading %s", fn)); IO::BufferedFile in(fn.str()); mtime = stat.get_modify_time(); @@ -156,5 +100,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; }