-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <msp/core/except.h>
+#include <msp/core/maputils.h>
#include <msp/fs/stat.h>
#include <msp/fs/utils.h>
-#include <msp/io/except.h>
#include <msp/io/file.h>
#include <msp/io/print.h>
#include <msp/time/utils.h>
Config::Config(SourcePackage &p):
package(p),
- freeze_mtime(false)
+ freeze_mtime(false),
+ changed(false)
{ }
void Config::add_option(const string &n, const string &v, const string &d)
const Config::Option &Config::get_option(const string &name) const
{
- OptionMap::const_iterator i = options.find(name);
- if(i==options.end())
- throw KeyError("Unknown option", name);
-
- return i->second;
+ return get_item(options, name);
}
bool Config::is_option(const string &name) const
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;
package.get_builder().apply_profile_template(*this, get_option("profile").value);
{
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;
package.get_builder().apply_profile_template(*this, profile);
freeze_mtime = false;
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)
+ if(changed_now && !freeze_mtime)
+ {
mtime = Time::now();
+ changed = true;
+ }
- return changed;
+ return changed_now;
}
void Config::finish()
void Config::save() const
{
+ if(!changed)
+ return;
+
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);
+ 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);
for(i=options.begin(); i!=options.end(); ++i)
{
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 &)
- { }
}
Config::Loader::Loader(Config &c):
- conf(c)
+ DataFile::ObjectLoader<Config>(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);
}