]> git.tdb.fi Git - builder.git/blobdiff - source/config.cpp
Adjust to library changes
[builder.git] / source / config.cpp
index 4cc9149efe6deb4f672e29e0cfc5ed9e01f4a525..0676dedd94a8e2e486e619a529e1be65679fe5cb 100644 (file)
@@ -1,16 +1,16 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-200 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <cstdlib>
 #include <msp/core/except.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/path/utils.h>
 #include <msp/time/utils.h>
 #include "builder.h"
 #include "config.h"
@@ -24,166 +24,91 @@ 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
        {
-               IO::File in((package.get_source()/".profile.cache").str());
+               IO::BufferedFile in((package.get_source()/".profile").str());
                string profile;
                in.getline(profile);
                set_option("profile", profile);
        }
-       catch(const IO::FileNotFound &)
+       catch(const IO::file_not_found &)
        { }
 
-       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);
 
        if(!package.get_builder().get_dry_run())
        {
-               IO::File out((package.get_source()/".profile.cache").str(), IO::M_WRITE);
+               IO::BufferedFile out((package.get_source()/".profile").str(), IO::M_WRITE);
                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;
-               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;
-                       }
-               }
-
-               if(!changed)
-                       break;
-       }
+       for(OptionMap::iterator i=options.begin(); i!=options.end(); ++i)
+               i->second.value = package.expand_string(i->second.value);
 }
 
 void Config::save() const
 {
-       Path fn=package.get_source()/".options.cache";
+       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+".cache");
+               fn = package.get_source()/(".options."+i->second.value);
 
-       IO::File out(fn.str(), IO::M_WRITE);
+       IO::BufferedFile 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);
@@ -191,14 +116,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;
@@ -206,24 +131,19 @@ bool Config::set_option(const string &opt, const string &val)
 
 void Config::load()
 {
-       Path fn=package.get_source()/".options.cache";
-
-       OptionMap::iterator i=options.find("profile");
-       if(i!=options.end())
-               fn=package.get_source()/(".options."+i->second.value+".cache");
+       FS::Path fn = package.get_source()/(".options."+get_option("profile").value);
 
        try
        {
-               IO::File inf(fn.str());
-               IO::Buffered in(inf);
+               IO::BufferedFile in(fn.str());
 
-               mtime=Time::TimeStamp::from_unixtime(stat(fn).st_mtime);
+               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 &)
+       catch(const IO::file_not_found &)
        { }
 }