-#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)
-{ }
+{
+ if(builder.get_verbose()>=4)
+ cout<<"Created buildable package "<<n<<" at "<<s<<'\n';
+}
/**
Sets the path where the package files were installed. This is only useful for
path=builder.get_cwd()/p;
}
+Msp::Path::Path Package::get_temp_dir() const
+{
+ return source/config.get_option("tempdir").value/config.get_option("profile").value;
+}
+
+Msp::Path::Path Package::get_out_dir() const
+{
+ return source/config.get_option("outdir").value;
+}
+
/**
Checks which kinds of things the components of this package install.
return flags;
}
+LibMode Package::get_library_mode() const
+{
+ const string &mode=config.get_option("staticlibs").value;
+ if(mode=="all")
+ return ALL_STATIC;
+ else if(mode=="local")
+ return LOCAL_STATIC;
+ else if(mode=="none")
+ return DYNAMIC;
+ else
+ throw Exception("Unknown library mode");
+}
+
/**
Tries to resolve all references to dependency packages.
*/
Package *pkg=i->resolve();
if(pkg) all_reqs.push_back(pkg);
}
+
for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
{
i->resolve_refs();
if(j->get_package())
all_reqs.push_back(j->get_package());
}
+
+ for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i)
+ {
+ i->resolve_refs();
+ const PkgRefList &creqs=i->get_requires();
+ for(PkgRefList::const_iterator j=creqs.begin(); j!=creqs.end(); ++j)
+ if(j->get_package())
+ all_reqs.push_back(j->get_package());
+ }
}
/**
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();
- if(flag && config.process(opts) && !builder.get_dry_run())
+ StringMap::const_iterator prof=opts.find("profile");
+ if(prof!=opts.end() && flag)
+ config.select_profile(prof->second);
+ else
+ config.select_last_profile();
+
+ if(flag && config.update(opts))
{
if(builder.get_verbose()>=2)
cout<<"Configuration of "<<name<<" changed\n";
- config.save(source/".options.cache");
+ if(!builder.get_dry_run())
+ config.save();
}
+ config.finish();
+
+ for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i)
+ if(i->eval())
+ {
+ const PkgRefList &reqs=i->get_requires();
+ requires.insert(requires.end(), reqs.begin(), reqs.end());
+ build_info.add(i->get_build_info());
+ }
+
for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
{
if((*i)->get_need_path())
argv.push_back("--libs");
argv.push_back(name);
vector<string> info=split(run_command(argv));
-
+
bool need_path=false;
bool use_pkgconfig=true;
if(info.empty())
{
use_pkgconfig=false;
-
+
//XXX Put these in an external file
if(name=="opengl")
info.push_back("-lGL");
info.push_back("-lgmpxx");
else if(name=="fmod4")
need_path=true;
+ else if(name=="devil")
+ info.push_back("-lIL");
+ else if(name=="Xlib")
+ info.push_back("-lX11");
else
return 0;
}
-
+
Package *pkg=new Package(b, name, info);
pkg->need_path=need_path;
pkg->use_pkgconfig=use_pkgconfig;
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)
{
else if(!i->compare(0, 2, "-l"))
export_binfo.libs.push_back(i->substr(2));
}
+
+ if(builder.get_verbose()>=4)
+ {
+ cout<<"Created non-buildable package "<<name<<" with";
+ for(vector<string>::const_iterator i=info.begin(); i!=info.end(); ++i)
+ cout<<' '<<*i;
+ cout<<'\n';
+ }
}
/**
*/
void Package::init_config()
{
- config.add_option("tempdir", "temp", "Directory for storing temporary files");
- config.add_option("optimize", "0", "Apply compiler optimizations");
- config.add_option("debug", "0", "Produce debugging symbols");
- config.add_option("cpu", "auto", "CPU type to optimize for");
- config.add_option("arch", "native", "Architecture for cross-compiling");
- config.add_option("staticlibs", "local", "Use static libraries");
-
- const char *home=getenv("HOME");
+ config.add_option("profile", "default", "Configuration profile");
+ config.add_option("tempdir", "temp", "Directory for storing temporary files");
+ config.add_option("outdir", ".", "Directory to put build results in");
+ config.add_option("optimize", "0", "Apply compiler optimizations");
+ config.add_option("debug", "0", "Produce debugging symbols");
+ config.add_option("cpu", "auto", "CPU type to optimize for");
+ config.add_option("arch", "native", "Architecture for cross-compiling");
+ config.add_option("staticlibs", "local", "Use static libraries");
+
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)
if(flags&DATA)
config.add_option("includedir", "$prefix/share", "Data installation directory");*/
- 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());
+ for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
+ config.add_option("with_"+i->name, "0", i->descr);
- config.load(source/".options.cache");
+ for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+ if((*i)->get_need_path())
+ config.add_option((*i)->get_name()+"_path", "", "Path for "+(*i)->get_name());
}
/**
Package *pkg=i->get_package();
if(!pkg)
continue;
- build_info.add(pkg->get_exported_binfo());
- //XXX We probably really only want to pass cflags and defines through
- export_binfo.add(pkg->get_exported_binfo());
+ const BuildInfo &ebi=pkg->get_exported_binfo();
+ build_info.add(ebi);
+
+ export_binfo.cflags.insert(export_binfo.cflags.end(), ebi.cflags.begin(), ebi.cflags.end());
+ export_binfo.incpath.insert(export_binfo.incpath.end(), ebi.incpath.begin(), ebi.incpath.end());
+ export_binfo.defines.insert(export_binfo.defines.end(), ebi.defines.begin(), ebi.defines.end());
}
-
+
build_info.cflags.push_back("-Wall");
build_info.cflags.push_back("-Wshadow");
build_info.cflags.push_back("-Wextra");
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");
}
+ for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
+ if(lexical_cast<bool>(config.get_option("with_"+i->name).value))
+ build_info.cflags.push_back("-DWITH_"+toupper(i->name));
+
build_info.unique();
for(list<Component>::iterator i=components.begin(); i!=components.end(); ++i)
}
else if(name=="fmod4")
{
- cout<<path<<'\n';
export_binfo.libs.push_back("fmodex");
if(!path.empty())
{
add("version", &Package::version);
add("description", &Package::description);
add("require", &Loader::require);
+ add("feature", &Loader::feature);
+ add("if", &Loader::condition);
add("program", &Loader::program);
add("library", &Loader::library);
+ add("module", &Loader::module);
add("headers", &Loader::headers);
add("build_info", &Loader::build_info);
}
pkg.requires.push_back(PackageRef(pkg.builder, n));
}
+void Package::Loader::feature(const string &n, const string &d)
+{
+ pkg.features.push_back(Feature(n, d));
+}
+
+void Package::Loader::condition(const string &c)
+{
+ Condition cond(pkg, c);
+ load_sub(cond);
+ pkg.conditions.push_back(cond);
+}
+
void Package::Loader::program(const string &n)
{
Component prog(pkg, Component::PROGRAM, n);
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);
projects / builder.git / blobdiff