X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=1ab70c8a8af3431e983b9f6bdc38f9642ba4af24;hb=b067981c0da0c1a4616ed175d0ce8ac5564cbdbf;hp=da63cc9464f3de13756673db1a8c8c6181f9c9ab;hpb=39e1c3a79129a1718b5751c17a1cc6cc6903090e;p=builder.git diff --git a/source/config.cpp b/source/config.cpp index da63cc9..1ab70c8 100644 --- a/source/config.cpp +++ b/source/config.cpp @@ -1,15 +1,6 @@ -/* $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 @@ -22,167 +13,93 @@ using namespace Msp; Config::Config(SourcePackage &p): package(p), - freeze_mtime(false) + 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() { - try + FS::Path profile_cache_fn = package.get_source()/".profile"; + if(FS::exists(profile_cache_fn)) { - IO::BufferedFile in((package.get_source()/".profile").str()); + IO::BufferedFile in(profile_cache_fn.str()); string profile; in.getline(profile); set_option("profile", profile); } - catch(const IO::FileNotFound &) - { } - freeze_mtime=true; + freeze_mtime = true; package.get_builder().apply_profile_template(*this, get_option("profile").value); - freeze_mtime=false; + 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()) - { - IO::BufferedFile out((package.get_source()/".profile").str(), IO::M_WRITE); - IO::print(out, "%s\n", profile); - } - - freeze_mtime=true; + freeze_mtime = true; package.get_builder().apply_profile_template(*this, profile); - freeze_mtime=false; + freeze_mtime = false; load(); } -/** -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) { - 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) - mtime=Time::now(); + if(changed_now && !freeze_mtime) + { + 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 if(var=="arch") - value=package.get_builder().get_current_arch().get_name(); - else if(const char *ptr=getenv(var.c_str())) - value=ptr; - - 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 { - FS::Path fn=package.get_source()/".options"; + if(!changed) + return; - OptionMap::const_iterator i=options.find("profile"); + 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); + { + 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); @@ -192,14 +109,14 @@ void Config::save() const 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; @@ -207,20 +124,19 @@ 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()/(".options."+get_option("profile").value); - try + FS::Stat stat = FS::stat(fn); + if(stat) { IO::BufferedFile in(fn.str()); - mtime=Time::TimeStamp::from_unixtime(FS::stat(fn).st_mtime); + mtime = stat.get_modify_time(); DataFile::Parser parser(in, fn.str()); Loader loader(*this); loader.load(parser); } - catch(const IO::FileNotFound &) - { } } @@ -233,12 +149,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); }