-#include <msp/strconv.h>
-#include <msp/strutils.h>
+#include <msp/strings/lexicalcast.h>
+#include <msp/strings/utils.h>
#include "builder.h"
#include "misc.h"
#include "package.h"
name(n),
buildable(true),
source(s),
+ config(*this),
conf_done(false),
use_pkgconfig(true),
need_path(false)
Processes configuration options that were most likely obtained from the command
line.
*/
-void Package::configure(const RawOptionMap &opts, unsigned flag)
+void Package::configure(const StringMap &opts, unsigned flag)
{
if(conf_done)
return;
{
init_config();
- RawOptionMap::const_iterator prof=opts.find("profile");
- if(prof!=opts.end())
+ StringMap::const_iterator prof=opts.find("profile");
+ if(prof!=opts.end() && flag)
config.select_profile(prof->second);
else
config.select_last_profile();
config.save();
}
+ config.finish();
+
for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
{
if((*i)->get_need_path())
Package::Package(Builder &b, const string &n, const vector<string> &info):
builder(b),
name(n),
- buildable(false)
+ buildable(false),
+ config(*this),
+ conf_done(false)
{
for(vector<string>::const_iterator i=info.begin(); i!=info.end(); ++i)
{
config.add_option("arch", "native", "Architecture for cross-compiling");
config.add_option("staticlibs", "local", "Use static libraries");
- const char *home=getenv("HOME");
unsigned flags=get_install_flags();
if(flags)
- config.add_option("prefix", string(home)+"/local"/*"/usr"*/, "Installation prefix");
+ config.add_option("prefix", "$HOME/local", "Installation prefix");
/*if(flags&INCLUDE)
config.add_option("includedir", "$prefix/include", "Header installation directory");
if(flags&BIN)
for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
if(i->get_package() && i->get_package()->get_need_path())
config.add_option(i->get_name()+"_path", "", "Path for "+i->get_name());
-
- config.set_source(source);
}
/**
export_binfo.libpath.push_back((Path::Path(config.get_option("prefix").value)/"lib").str());
string optimize=config.get_option("optimize").value;
- if(strtol(optimize))
+ if(lexical_cast<unsigned>(optimize))
{
build_info.cflags.push_back("-O"+optimize);
+ build_info.ldflags.push_back("-O"+optimize);
string cpu=config.get_option("cpu").value;
if(cpu!="auto")
build_info.cflags.push_back("-march="+cpu);
}
- if(strtobool(config.get_option("debug").value))
+ if(lexical_cast<bool>(config.get_option("debug").value))
{
build_info.cflags.push_back("-ggdb");
build_info.defines.push_back("DEBUG");
add("require", &Loader::require);
add("program", &Loader::program);
add("library", &Loader::library);
+ add("module", &Loader::module);
add("headers", &Loader::headers);
add("build_info", &Loader::build_info);
}
pkg.components.push_back(prog);
}
+void Package::Loader::module(const string &n)
+{
+ Component prog(pkg, Component::MODULE, n);
+ load_sub(prog);
+ pkg.components.push_back(prog);
+}
+
void Package::Loader::headers(const string &n)
{
Component prog(pkg, Component::HEADERS, n);