X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=4ec969ac581d849bcd3cf6cb50bec4ef3654832d;hb=05a2b9dabd01414e9e9a91f9d69babaca4ccb32d;hp=da63cc9464f3de13756673db1a8c8c6181f9c9ab;hpb=39e1c3a79129a1718b5751c17a1cc6cc6903090e;p=builder.git diff --git a/source/config.cpp b/source/config.cpp index da63cc9..4ec969a 100644 --- a/source/config.cpp +++ b/source/config.cpp @@ -1,7 +1,7 @@ /* $Id$ This file is part of builder -Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions +Copyright © 2006-2009 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ @@ -25,43 +25,25 @@ Config::Config(SourcePackage &p): freeze_mtime(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); + OptionMap::const_iterator i = options.find(name); if(i==options.end()) - throw Exception("Tried to access nonexistent option "+name); + throw KeyError("Unknown option", name); return i->second; } -/** -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 @@ -74,17 +56,13 @@ void Config::select_last_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); @@ -95,79 +73,67 @@ void Config::select_profile(const string &profile) 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 = 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 = true; } if(changed && !freeze_mtime) - mtime=Time::now(); + mtime = Time::now(); return changed; } -/** -Expands any variable references in options. -*/ void Config::finish() { for(unsigned n=0; n<20; ++n) { - bool changed=false; + 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) + Option &opt = i->second; + string::size_type dollar = 0; + while((dollar = opt.value.find('$', dollar))!=string::npos) { - unsigned end; + string::size_type end; string var; if(opt.value[dollar+1]=='{') { - end=opt.value.find('}', dollar+2); + end = opt.value.find('}', dollar+2); if(end==string::npos) throw Exception("Unterminated variable reference"); - var=opt.value.substr(dollar+2, end-dollar-2); + 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); + var = opt.value.substr(dollar+1, end-dollar-1); } string value; if(is_option(var)) - value=get_option(var).value; + 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; + 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; + dollar += value.size(); + changed = true; } } @@ -178,11 +144,11 @@ void Config::finish() void Config::save() const { - FS::Path fn=package.get_source()/".options"; + FS::Path fn = package.get_source()/".options"; - OptionMap::const_iterator i=options.find("profile"); + 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 out(fn.str(), IO::M_WRITE); @@ -192,14 +158,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,13 +173,13 @@ 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 { IO::BufferedFile in(fn.str()); - mtime=Time::TimeStamp::from_unixtime(FS::stat(fn).st_mtime); + mtime = Time::TimeStamp::from_unixtime(FS::stat(fn).st_mtime); DataFile::Parser parser(in, fn.str()); Loader loader(*this);