X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=36e7870683b3bfed9e1474306ee8adde2ce13a84;hb=c7df14c38a87ceca13df47fa700d3f9fa250be91;hp=b3685d565db45d828a49ea99cab5a9bdc7cbf0ef;hpb=b50019441dd16d4aaba1eeffc381ded3e4a4be2d;p=builder.git diff --git a/source/config.cpp b/source/config.cpp index b3685d5..36e7870 100644 --- a/source/config.cpp +++ b/source/config.cpp @@ -1,15 +1,8 @@ -/* $Id$ - -This file is part of builder -Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - -#include -#include +#include +#include +#include #include #include -#include #include #include "builder.h" #include "config.h" @@ -20,225 +13,100 @@ using namespace Msp; Config::Config(SourcePackage &p): package(p), - freeze_mtime(false) + changed(false) { } -/** -Adds a configuration option. - -@param n Option name -@param v Default value -@param d Description -*/ -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; -/** -Gets the given option from the configuration. If the option doesn't exist, -an Exception is thrown. -*/ -const Config::Option &Config::get_option(const string &name) const -{ - OptionMap::const_iterator i=options.find(name); - if(i==options.end()) - throw Exception("Tried to access nonexistent option "+name); - - return i->second; + return options.insert(OptionMap::value_type(opt.name, opt)).first->second; } -/** -Checks whether an option with the given name exists. -*/ -bool Config::is_option(const string &name) const +bool Config::set_option(const string &opt, const string &val) { - return options.count(name); -} + bool result = false; -/** -Selects the last profile used. If the profile cache file is not present, the -default profile is assumed. -*/ -void Config::select_last_profile() -{ - try + OptionMap::iterator i = options.find(opt); + if(i!=options.end()) { - IO::File in((package.get_source()/".profile.cache").str()); - string profile; - in.getline(profile); - set_option("profile", profile); + if(i->second.value!=val) + { + result = true; + changed = true; + mtime = Time::now(); + } + i->second.value = val; } - catch(const IO::FileNotFound &) - { } - - freeze_mtime=true; - package.get_builder().apply_profile_template(*this, get_option("profile").value); - freeze_mtime=false; - load(); + return result; } -/** -Selects the given profile. The profile cache file is updated as well, unless ---dry-run was given. -*/ -void Config::select_profile(const string &profile) +bool Config::is_option(const string &name) const { - set_option("profile", profile); - - if(!package.get_builder().get_dry_run()) - { - IO::File out((package.get_source()/".profile.cache").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(); + return options.count(name); } -/** -Processes options from the given raw option map. Nonexistent options are -ignored. If any options were changed, the mtime of the configuration is updated -to the current time. - -@param opts A map to process options from - -@return Whether any option values were changed -*/ -bool Config::update(const StringMap &opts) +const Config::Option &Config::get_option(const string &name) const { - 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; - } - - if(changed && !freeze_mtime) - mtime=Time::now(); - - return changed; + return get_item(options, name); } -/** -Expands any variable references in options. -*/ -void Config::finish() +void Config::load() { - for(unsigned n=0; n<20; ++n) + FS::Path fn = package.get_source_directory()/".config"; + FS::Stat stat = FS::stat(fn); + if(stat) { - bool changed=false; - for(OptionMap::iterator i=options.begin(); i!=options.end(); ++i) - { - Option &opt=i->second; - unsigned dollar=0; - while((dollar=opt.value.find('$', dollar))!=string::npos) - { - unsigned end; - string var; - if(opt.value[dollar+1]=='{') - { - end=opt.value.find('}', dollar+2); - if(end==string::npos) - throw Exception("Unterminated variable reference"); - var=opt.value.substr(dollar+2, end-dollar-2); - ++end; - } - else - { - for(end=dollar+1; (isalnum(opt.value[end]) && opt.value[end]!='_'); ++end); - var=opt.value.substr(dollar+1, end-dollar-1); - } - - string value; - if(is_option(var)) - value=get_option(var).value; - else - value=getenv(var.c_str()); - - opt.value.replace(dollar, end-dollar, value); - - dollar+=value.size(); - changed=true; - } - } + package.get_builder().get_logger().log("files", format("Reading %s", fn)); + IO::BufferedFile in(fn.str()); - if(!changed) - break; + mtime = stat.get_modify_time(); + + DataFile::Parser parser(in, fn.str()); + Loader loader(*this); + loader.load(parser); } } void Config::save() const { - Path fn=package.get_source()/".options.cache"; + if(!changed) + return; - OptionMap::const_iterator i=options.find("profile"); - if(i!=options.end()) - fn=package.get_source()/(".options."+i->second.value+".cache"); + FS::Path fn = package.get_source_directory()/".config"; - IO::File out(fn.str(), IO::M_WRITE); + 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() -{ - Path fn=package.get_source()/".options.cache"; - - OptionMap::iterator i=options.find("profile"); - if(i!=options.end()) - fn=package.get_source()/(".options."+i->second.value+".cache"); - - try - { - IO::File in(fn.str()); - - mtime=Time::TimeStamp::from_unixtime(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(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; }