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 KeyError("Unknown option", name);
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();
}
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();
}
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;
}
{
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;
- string::size_type 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)
{
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;
}
}
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);
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;
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);