#include <cstdlib>
+#include <msp/fs/utils.h>
#include <msp/io/print.h>
#include <msp/strings/lexicalcast.h>
#include <msp/strings/utils.h>
#include "binarypackage.h"
#include "builder.h"
-#include "misc.h"
+#include "file.h"
#include "pkgconfigfile.h"
#include "tool.h"
#include "sourcepackage.h"
}
-SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &s):
+SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &f):
Package(b, n),
- source_dir(s),
+ source_dir(FS::dirname(f)),
build_type(0),
config(*this),
- deps_cache(*this)
+ cache(*this)
{
config.load();
+ build_file = builder.get_vfs().get_target(f);
+ if(!build_file)
+ build_file = new File(builder, *this, f);
components.push_back(Component(*this, Component::TARBALL, "@src"));
+ source_tarball = &components.back();
}
void SourcePackage::set_build_type(const BuildType &t)
FS::Path SourcePackage::get_out_dir() const
{
const Architecture &arch = builder.get_current_arch();
- string detail = (build_type ? build_type->get_name() : string());
if(arch.is_native())
- return source_dir/detail;
+ return source_dir;
else
- return source_dir/arch.get_name()/detail;
+ return source_dir/arch.get_name();
}
-void SourcePackage::create_build_info()
+bool SourcePackage::match_feature(const string &cond) const
{
+ string::size_type equals = cond.find('=');
+ if(equals!=string::npos)
+ {
+ if(equals==0)
+ throw invalid_argument("SourcePackage::match_feature");
+ bool negate = cond[equals-1]=='!';
+ string feat = cond.substr(0, equals-negate);
+ string value = config.get_option("with_"+feat).value;
+ return (value==cond.substr(equals+1))!=negate;
+ }
+ else
+ {
+ bool negate = (cond[0]=='!');
+ string feat = cond.substr(negate);
+ string value = config.get_option("with_"+feat).value;
+ return lexical_cast<bool>(value)!=negate;
+ }
+}
+
+void SourcePackage::do_prepare()
+{
+ BuildInfo final_build_info;
+
if(build_type)
- build_info.update_from(build_type->get_build_info());
+ final_build_info.update_from(build_type->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();
- build_info.warnings.insert(build_info.warnings.begin(), warnings.begin(), warnings.end());
+ final_build_info.update_from(build_info);
+ build_info = final_build_info;
build_info.incpath.push_back((builder.get_prefix()/"include").str());
build_info.libpath.push_back((builder.get_prefix()/"lib").str());
- bool export_paths = false;
- for(ComponentList::const_iterator i=components.begin(); (!export_paths && i!=components.end()); ++i)
- export_paths = (i->get_type()==Component::LIBRARY);
-
- if(export_paths)
- {
- export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
- export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
- }
-
for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
if(lexical_cast<bool>(config.get_option("with_"+i->name).value))
build_info.defines["WITH_"+toupper(i->name)] = "1";
+ bool export_paths = false;
for(list<Component>::iterator i=components.begin(); i!=components.end(); ++i)
{
i->prepare();
i->create_build_info();
+
if(i->get_type()==Component::LIBRARY)
+ {
export_binfo.libs.push_back(i->get_name());
+ export_paths = true;
+ }
}
-}
-void SourcePackage::create_targets()
-{
- deps_cache.load();
+ if(export_paths)
+ {
+ export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
+ export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
+ }
+
+ cache.load();
bool pc_needed = false;
for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
if(pc_needed)
{
PkgConfigFile *pc = new PkgConfigFile(builder, *this);
- builder.get_target("install")->add_dependency(*builder.get_toolchain().get_tool("CP").create_target(*pc));
+ builder.get_build_graph().get_target("install")->add_dependency(*builder.get_toolchain().get_tool("CP").create_target(*pc));
}
}
void SourcePackage::save_caches()
{
config.save();
- deps_cache.save();
+ cache.save();
}
SourcePackage::Loader::Loader(SourcePackage &p):
- DataFile::DerivedObjectLoader<SourcePackage, Package>(p)
+ DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>(p)
{
init(0);
}
SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o):
- DataFile::DerivedObjectLoader<SourcePackage, Package>(p)
+ DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>(p)
{
init(&o);
}
void SourcePackage::Loader::init(const Config::InputOptions *o)
{
options = o;
- add("version", &SourcePackage::version);
add("description", &SourcePackage::description);
add("build_info", &Loader::build_info);
add("feature", &Loader::feature);
add("if", &Loader::condition);
- add("if_arch", &Loader::if_arch);
- add("if_feat", &Loader::if_feature);
+ add("if_feature", &Loader::if_feature);
add("program", &Loader::component<Component::PROGRAM>);
add("library", &Loader::component<Component::LIBRARY>);
add("module", &Loader::component<Component::MODULE>);
add("headers", &Loader::headers);
add("install", &Loader::component<Component::INSTALL>);
+ add("interface_version", &Loader::interface_version);
add("datafile", &Loader::component<Component::DATAFILE>);
+ add("source_tarball", &Loader::source_tarball);
add("tarball", &Loader::tarball);
add("tar_file", &Loader::tar_file);
+ add("version", &Loader::version);
}
void SourcePackage::Loader::finish()
{
for(ComponentList::iterator j=obj.components.begin(); j!=obj.components.end(); ++j)
{
- const StringList &sources = j->get_sources();
- for(StringList::const_iterator k=sources.begin(); k!=sources.end(); ++k)
+ const Component::SourceList &sources = j->get_sources();
+ for(Component::SourceList::const_iterator k=sources.begin(); k!=sources.end(); ++k)
{
- if(!i->first.compare(0, k->size(), *k))
+ string k_str = k->str();
+ if(!i->first.compare(0, k_str.size(), k_str))
{
const_cast<InstallMap &>(j->get_install_map()).add_mapping(obj.source_dir/i->first, i->second);
}
IO::print("%s: Note: headers components are deprecated\n", get_source());
Component comp(obj, Component::LIBRARY, n);
load_sub(comp);
- const StringList &sources = comp.get_sources();
- for(StringList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
- install_map[*i] = "include/"+comp.get_name();
+ const Component::SourceList &sources = comp.get_sources();
+ for(Component::SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+ install_map[i->str()] = "include/"+comp.get_name();
}
-void SourcePackage::Loader::if_arch(const string &cond)
+void SourcePackage::Loader::if_feature(const string &cond)
{
- const Architecture &arch = obj.builder.get_current_arch();
- bool negate = (cond[0]=='!');
- bool match = (arch.match_name(cond.substr(negate))!=negate);
- obj.builder.get_logger().log("configure", format("%s: arch %s %smatched", obj.name, cond, (match ? "" : "not ")));
+ bool match = obj.match_feature(cond);
+ obj.builder.get_logger().log("configure", format("%s: feature %s %smatched", obj.name, cond, (match ? "" : "not ")));
if(match)
load_sub_with(*this);
}
-void SourcePackage::Loader::if_feature(const string &cond)
+void SourcePackage::Loader::interface_version(const string &v)
{
- bool match = false;
- string::size_type equals = cond.find('=');
- if(equals!=string::npos)
- {
- if(equals==0)
- error("No feature name specified");
- bool negate = cond[equals-1]=='!';
- string name = cond.substr(0, equals-negate);
- string value = obj.config.get_option("with_"+name).value;
- match = (value==cond.substr(equals+1))!=negate;
- value = cond.substr(equals+1);
- }
- else
- {
- bool negate = (cond[0]=='!');
- string name = cond.substr(negate);
- string value = obj.config.get_option("with_"+name).value;
- match = lexical_cast<bool>(value)!=negate;
- }
- obj.builder.get_logger().log("configure", format("%s: feature %s %smatched", obj.name, cond, (match ? "" : "not ")));
- if(match)
- load_sub_with(*this);
+ obj.interface_version = v;
+ if(obj.version.empty())
+ obj.version = v;
+}
+
+void SourcePackage::Loader::source_tarball()
+{
+ load_sub(*obj.source_tarball);
}
void SourcePackage::Loader::tarball(const string &n)
{
if(n=="@src")
{
- for(ComponentList::iterator i=obj.components.begin(); i!=obj.components.end(); ++i)
- if(i->get_type()==Component::TARBALL && i->get_name()==n)
- load_sub(*i);
+ IO::print("%s: Note: Use source_tarball instead of tarball \"@src\"\n", get_source());
+ load_sub(*obj.source_tarball);
}
else
{
IO::print("%s: Note: tar_file is deprecated\n", get_source());
for(ComponentList::iterator i=obj.components.begin(); i!=obj.components.end(); ++i)
if(i->get_type()==Component::TARBALL && i->get_name()=="@src")
- const_cast<StringList &>(i->get_sources()).push_back((obj.source_dir/f).str());
+ const_cast<Component::SourceList &>(i->get_sources()).push_back((obj.source_dir/f).str());
+}
+
+void SourcePackage::Loader::version(const string &v)
+{
+ obj.version = v;
+
+ string::size_type i = 0;
+ for(unsigned dots=0; i<obj.version.size(); ++i)
+ if(obj.version[i]=='.' && ++dots>=2)
+ break;
+ obj.interface_version = obj.version.substr(0, i);
}
projects / builder.git / blobdiff