X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=a83a641a5bcaa66dbfcf2eda1ee477ab13648306;hb=afed9d3a6326790b77b786cbc1e76b725a14dbe5;hp=99e5981503eb35ab9780711a092cea30a3701776;hpb=74266a6e650f019063cdcd1c9a7bd26d8f99041b;p=builder.git diff --git a/source/config.cpp b/source/config.cpp index 99e5981..a83a641 100644 --- a/source/config.cpp +++ b/source/config.cpp @@ -1,12 +1,30 @@ -#include -#include -#include +/* $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 "builder.h" #include "config.h" +#include "sourcepackage.h" using namespace std; using namespace Msp; +Config::Config(SourcePackage &p): + package(p), + freeze_mtime(false) +{ } + /** Adds a configuration option. @@ -40,6 +58,50 @@ 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 + { + IO::File in((package.get_source()/".profile").str()); + string profile; + in.getline(profile); + set_option("profile", profile); + } + catch(const IO::FileNotFound &) + { } + + 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()) + { + IO::File out((package.get_source()/".profile").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(); +} + /** Processes options from the given raw option map. Nonexistent options are ignored. If any options were changed, the mtime of the configuration is updated @@ -49,52 +111,120 @@ to the current time. @return Whether any option values were changed */ -bool Config::process(const RawOptionMap &opts) +bool Config::update(const StringMap &opts) { bool changed=false; - for(RawOptionMap::const_iterator i=opts.begin(); i!=opts.end(); ++i) + for(StringMap::const_iterator i=opts.begin(); i!=opts.end(); ++i) { - OptionMap::iterator j=options.find(i->first); - if(j!=options.end()) - { - if(i->second!=j->second.value) - changed=true; - j->second.value=i->second; - } + if(set_option(i->first, i->second) && i->first!="profile") + changed=true; } - if(changed) + if(changed && !freeze_mtime) mtime=Time::now(); return changed; } /** -Loads configuration from a file, if it exists. +Expands any variable references in options. */ -void Config::load(const Path::Path &fn) +void Config::finish() { - ifstream in(fn.str().c_str()); - if(!in) return; + 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; + } + } - struct stat st; - Path::stat(fn, st); - mtime=Time::TimeStamp::from_unixtime(st.st_mtime); + if(!changed) + break; + } +} - Parser::Parser parser(in, fn.str()); - Loader loader(*this); - loader.load(parser); +void Config::save() const +{ + FS::Path fn=package.get_source()/".options.cache"; + + OptionMap::const_iterator i=options.find("profile"); + if(i!=options.end()) + fn=package.get_source()/(".options."+i->second.value+".cache"); + + IO::File out(fn.str(), IO::M_WRITE); + + for(i=options.begin(); i!=options.end(); ++i) + IO::print(out, "option \"%s\" \"%s\";\n", i->second.name, i->second.value); } -void Config::save(const Path::Path &fn) const +bool Config::set_option(const string &opt, const string &val) { - ofstream out(fn.str().c_str()); - if(!out) return; - - for(OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i) - out<<"option \""<second.name<<"\" \""<second.value<<"\";\n"; + 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; +} + +void Config::load() +{ + FS::Path fn=package.get_source()/(".options."+get_option("profile").value); + + try + { + IO::File inf(fn.str()); + IO::Buffered in(inf); + + mtime=Time::TimeStamp::from_unixtime(FS::stat(fn).st_mtime); + + DataFile::Parser parser(in, fn.str()); + Loader loader(*this); + loader.load(parser); + } + catch(const IO::FileNotFound &) + { } } + Config::Option::Option(const string &n, const string &v, const string &d): name(n), defv(v), @@ -102,6 +232,7 @@ Config::Option::Option(const string &n, const string &v, const string &d): value(v) { } + Config::Loader::Loader(Config &c): conf(c) { @@ -110,7 +241,5 @@ Config::Loader::Loader(Config &c): void Config::Loader::option(const string &n, const string &v) { - OptionMap::iterator i=conf.options.find(n); - if(i!=conf.options.end()) - i->second.value=v; + conf.set_option(n, v); }