Make tools capable of reporting a system-wide path used to locate input files

[builder.git] / source / config.cpp

diff --git a/source/config.cpp b/source/config.cpp
index 0676dedd94a8e2e486e619a529e1be65679fe5cb..a518b6302f8fd6cdea0fb4fd4d5e06fd06f991bc 100644 (file)
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -1,14 +1,6 @@
-/* $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>
@@ -31,11 +23,7 @@ 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
@@ -45,15 +33,14 @@ 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::file_not_found &)
-       { }
 
        freeze_mtime = true;
        package.get_builder().apply_profile_template(*this, get_option("profile").value);
@@ -133,18 +120,17 @@ void Config::load()
 {
        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::file_not_found &)
-       { }
 }