/* $Id$
This file is part of builder
-Copyright © 2007-2009 Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2010 Mikko Rasa, Mikkosoft Productions
Distributed under the LGPL
*/
+#include <cstdlib>
#include <msp/io/print.h>
#include <msp/strings/lexicalcast.h>
#include <msp/strings/utils.h>
FS::Path SourcePackage::get_temp_dir() const
{
- return source/config.get_option("tempdir").value/builder.get_current_arch().get_name()/config.get_option("profile").value;
+ string subdir = format("%s.%s", builder.get_current_arch().get_name(), config.get_option("profile").value);
+ return source/config.get_option("tempdir").value/subdir;
}
FS::Path SourcePackage::get_out_dir() const
{
- const Architecture &arch=builder.get_current_arch();
+ const Architecture &arch = builder.get_current_arch();
if(arch.is_native())
return source/config.get_option("outdir").value;
else
unsigned SourcePackage::get_install_flags()
{
- unsigned flags=0;
+ unsigned flags = 0;
for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
if(i->get_install())
{
if(i->get_type()==Component::PROGRAM)
- flags|=BIN;
+ flags |= BIN;
else if(i->get_type()==Component::LIBRARY || i->get_type()==Component::MODULE)
- flags|=LIB;
+ flags |= LIB;
else if(i->get_type()==Component::HEADERS)
- flags|=INCLUDE;
+ flags |= INCLUDE;
}
return flags;
LibMode SourcePackage::get_library_mode() const
{
- const string &mode=config.get_option("staticlibs").value;
+ const string &mode = config.get_option("staticlibs").value;
if(mode=="all")
return ALL_STATIC;
else if(mode=="local")
else if(mode=="none")
return DYNAMIC;
else
- throw Exception("Unknown library mode");
+ throw runtime_error("unknown library mode");
+}
+
+string SourcePackage::expand_string(const string &str) const
+{
+ string result = str;
+ string::size_type dollar = 0;
+ unsigned n = 0;
+ while((dollar = result.find('$'))!=string::npos)
+ {
+ if(n>1000)
+ throw bad_expansion("nested too deep");
+
+ string::size_type end;
+ string var;
+ if(dollar+1<result.size() && result[dollar+1]=='{')
+ {
+ end = result.find('}', dollar+2);
+ if(end==string::npos)
+ throw bad_expansion("unterminated variable reference");
+ var = result.substr(dollar+2, end-dollar-2);
+ ++end;
+ }
+ else
+ {
+ for(end=dollar+1; (isalnum(result[end]) || result[end]=='_'); ++end) ;
+ var = result.substr(dollar+1, end-dollar-1);
+ }
+
+ string value;
+ if(config.is_option(var))
+ value = config.get_option(var).value;
+ else if(var=="arch")
+ value = builder.get_current_arch().get_name();
+ else if(var=="system")
+ value = builder.get_current_arch().get_system();
+ else if(const char *ptr = getenv(var.c_str()))
+ value = ptr;
+
+ result.replace(dollar, end-dollar, value);
+
+ ++n;
+ }
+
+ return result;
}
void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
{
init_config();
- StringMap::const_iterator prof=opts.find("profile");
+ StringMap::const_iterator prof = opts.find("profile");
if(prof!=opts.end() && flag)
config.select_profile(prof->second);
else
for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i)
if(i->eval())
{
- const StringList &reqs=i->get_requires();
+ const StringList &reqs = i->get_requires();
for(StringList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
- if(Package *pkg=builder.get_package(*j))
+ if(Package *pkg = builder.get_package(*j))
requires.push_back(pkg);
}
- base_reqs=requires;
-
- for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
- {
- const PackageList &reqs=i->get_requires();
- requires.insert(requires.end(), reqs.begin(), reqs.end());
- }
-
for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
{
- BinaryPackage *bpkg=dynamic_cast<BinaryPackage *>(*i);
+ BinaryPackage *bpkg = dynamic_cast<BinaryPackage *>(*i);
if(bpkg && bpkg->get_need_path())
bpkg->set_path(config.get_option(bpkg->get_name()+"_path").value);
}
deps_cache.load();
+
+ for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
+ i->configure(opts, flag);
}
void SourcePackage::init_config()
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("strip", "0", "Strip symbols from programs");
- config.add_option("debug", "0", "Produce debugging symbols");
- config.add_option("cpu", "none", "CPU type to optimize for");
+ config.add_option("optimize", "0", "Compiler optimization level");
+ config.add_option("strip", "no", "Strip symbols from programs");
+ config.add_option("debug", "no", "Produce debugging symbols");
config.add_option("staticlibs", "local", "Use static libraries");
for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
- config.add_option("with_"+i->name, "0", i->descr);
+ config.add_option("with_"+i->name, i->def_value, i->descr);
for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
{
- BinaryPackage *bpkg=dynamic_cast<BinaryPackage *>(*i);
+ BinaryPackage *bpkg = dynamic_cast<BinaryPackage *>(*i);
if(bpkg && bpkg->get_need_path())
config.add_option(bpkg->get_name()+"_path", "/usr", "Path for "+bpkg->get_name());
}
void SourcePackage::create_build_info()
{
- for(PackageList::iterator i=base_reqs.begin(); i!=base_reqs.end(); ++i)
- {
- const BuildInfo &ebi=(*i)->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.add(builder.get_current_arch().get_build_info());
// XXX Currently, a package-specific settings will override cmdline. This might or might not be desirable.
- const StringList &warnings=builder.get_warnings();
+ const StringList &warnings = builder.get_warnings();
build_info.warnings.insert(build_info.warnings.begin(), warnings.begin(), warnings.end());
- unsigned flags=get_install_flags();
+ unsigned flags = get_install_flags();
build_info.incpath.push_back((builder.get_prefix()/"include").str());
build_info.libpath.push_back((builder.get_prefix()/"lib").str());
if(flags&LIB)
export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
- string optimize=config.get_option("optimize").value;
- if(lexical_cast<unsigned>(optimize))
+ string optimize = config.get_option("optimize").value;
+ if(!optimize.empty() && optimize!="0")
{
build_info.cflags.push_back("-O"+optimize);
build_info.ldflags.push_back("-O"+optimize);
- string cpu=config.get_option("cpu").value;
- if(cpu!="none")
- build_info.cflags.push_back("-march="+cpu);
}
if(lexical_cast<bool>(config.get_option("debug").value))
add("module", &Loader::component<Component::MODULE>);
add("headers", &Loader::component<Component::HEADERS>);
add("install", &Loader::component<Component::INSTALL>);
+ add("datafile", &Loader::component<Component::DATAFILE>);
add("tarball", &Loader::tarball);
add("tar_file", &Loader::tar_file);
}
void SourcePackage::Loader::finish()
{
- SourcePackage &spkg=static_cast<SourcePackage &>(pkg);
+ SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
spkg.components.sort(component_sort);
}
void SourcePackage::Loader::feature(const string &n, const string &d)
{
- static_cast<SourcePackage &>(pkg).features.push_back(Feature(n, d));
+ Feature feat(n);
+ feat.descr = d;
+ feat.def_value = "no";
+ load_sub(feat);
+ static_cast<SourcePackage &>(pkg).features.push_back(feat);
}
void SourcePackage::Loader::condition(const string &c)
{
- SourcePackage &spkg=static_cast<SourcePackage &>(pkg);
+ SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
Condition cond(spkg, c);
load_sub(cond);
spkg.conditions.push_back(cond);
template<Component::Type t>
void SourcePackage::Loader::component(const string &n)
{
- SourcePackage &spkg=static_cast<SourcePackage &>(pkg);
+ SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
Component comp(spkg, t, n);
load_sub(comp);
spkg.components.push_back(comp);
void SourcePackage::Loader::tarball(const string &n)
{
- SourcePackage &spkg=static_cast<SourcePackage &>(pkg);
+ SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
if(n=="@src")
{
for(ComponentList::iterator i=spkg.components.begin(); i!=spkg.components.end(); ++i)
void SourcePackage::Loader::tar_file(const string &f)
{
IO::print("%s: Note: tar_file is deprecated\n", get_source());
- SourcePackage &spkg=static_cast<SourcePackage &>(pkg);
+ SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
for(ComponentList::iterator i=spkg.components.begin(); i!=spkg.components.end(); ++i)
if(i->get_type()==Component::TARBALL && i->get_name()=="@src")
- const_cast<PathList &>(i->get_sources()).push_back(spkg.source/f);
+ const_cast<StringList &>(i->get_sources()).push_back((spkg.source/f).str());
}
projects / builder.git / blobdiff