X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=5b43fe3e68e01aef7521f56610e2b98b134ce289;hb=4ce2beaa6d1cab7ed8063bbe1472e13a4280ebc0;hp=2e3741e2a2a5120ab1d8e3bddfe573e2fc3ce21a;hpb=69ad3610053e140cb5108f53e4c46a0583e33559;p=builder.git diff --git a/source/config.cpp b/source/config.cpp index 2e3741e..5b43fe3 100644 --- a/source/config.cpp +++ b/source/config.cpp @@ -1,13 +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" @@ -18,182 +13,72 @@ 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) { options.insert(OptionMap::value_type(n, Option(n, v, d))); } -/** -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 get_item(options, name); } -/** -Checks whether an option with the given name exists. -*/ bool Config::is_option(const string &name) const { return options.count(name); } -/** -Selects the last profile used. If the profile cache file is not present, the -default profile is assumed. -*/ -void Config::select_last_profile() -{ - ifstream in((package.get_source()/".profile.cache").str().c_str()); - if(in) - { - string profile; - getline(in, profile); - set_option("profile", profile); - } - - freeze_mtime=true; - package.get_builder().apply_profile_template(*this, get_option("profile").value); - freeze_mtime=false; - - load(); -} - -/** -Selects the given profile. The profile cache file is updated as well, unless ---dry-run was given. -*/ -void Config::select_profile(const string &profile) -{ - set_option("profile", profile); - - if(!package.get_builder().get_dry_run()) - { - ofstream out((package.get_source()/".profile.cache").str().c_str()); - if(out) - out<first, i->second) && i->first!="profile") - changed=true; + changed_now = true; } - if(changed && !freeze_mtime) - mtime=Time::now(); + if(changed_now) + { + mtime = Time::now(); + changed = true; + } - return changed; + return changed_now; } -/** -Expands any variable references in options. -*/ void Config::finish() { - for(unsigned n=0; n<20; ++n) - { - 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; - } - } - - if(!changed) - break; - } + for(OptionMap::iterator i=options.begin(); i!=options.end(); ++i) + i->second.value = package.expand_string(i->second.value); } 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()/".config"; - ofstream out(fn.str().c_str()); - if(!out) return; + 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) - out<<"option \""<second.name<<"\" \""<second.value<<"\";\n"; + 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; + bool result = false; - OptionMap::iterator i=options.find(opt); + OptionMap::iterator i = options.find(opt); if(i!=options.end()) { if(i->second.value!=val) - result=true; - i->second.value=val; + result = true; + i->second.value = val; } return result; @@ -201,20 +86,20 @@ bool Config::set_option(const string &opt, const string &val) void Config::load() { - Path fn=package.get_source()/".options.cache"; + FS::Path fn = package.get_source()/".config"; - OptionMap::iterator i=options.find("profile"); - if(i!=options.end()) - fn=package.get_source()/(".options."+i->second.value+".cache"); - - ifstream in(fn.str().c_str()); - if(!in) return; + 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=Time::TimeStamp::from_unixtime(stat(fn).st_mtime); + mtime = stat.get_modify_time(); - DataFile::Parser parser(in, fn.str()); - Loader loader(*this); - loader.load(parser); + DataFile::Parser parser(in, fn.str()); + Loader loader(*this); + loader.load(parser); + } } @@ -227,12 +112,12 @@ Config::Option::Option(const string &n, const string &v, const string &d): 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); + obj.set_option(n, v); }