using namespace Msp;
BinaryPackage::BinaryPackage(Builder &b, const string &n):
- Package(b, n),
- need_path(false)
+ Package(b, n)
{
use_pkgconfig = false;
}
-void BinaryPackage::set_path(const FS::Path &p)
-{
- path = builder.get_cwd()/p;
-}
-
void BinaryPackage::create_build_info()
{
- for(StringList::iterator i=export_binfo.incpath.begin(); i!=export_binfo.incpath.end(); ++i)
- if((*i)[0]=='@')
- *i = (path/i->substr(1)).str();
+ for(BuildInfo::PathList::iterator i=export_binfo.incpath.begin(); i!=export_binfo.incpath.end(); ++i)
+ if((*i)[0]=="@")
+ *i = builder.get_prefix()/i->subpath(1);
- for(StringList::iterator i=export_binfo.libpath.begin(); i!=export_binfo.libpath.end(); ++i)
- if((*i)[0]=='@')
- *i = (path/i->substr(1)).str();
+ for(BuildInfo::PathList::iterator i=export_binfo.libpath.begin(); i!=export_binfo.libpath.end(); ++i)
+ if((*i)[0]=="@")
+ *i = builder.get_prefix()/i->subpath(1);
}
-BinaryPackage *BinaryPackage::from_flags(Builder &builder, const std::string &name, const vector<string> &flags)
+BinaryPackage *BinaryPackage::from_flags(Builder &builder, const string &name, const vector<string> &flags)
{
BinaryPackage *pkg = new BinaryPackage(builder, name);
pkg->use_pkgconfig = true;
BinaryPackage::Loader::Loader(BinaryPackage &p):
- Package::Loader(p)
+ DataFile::DerivedObjectLoader<BinaryPackage, Package>(p)
{
- add("need_path", &BinaryPackage::need_path);
add("build_info", &Loader::build_info);
}
void BinaryPackage::Loader::build_info()
{
- load_sub(static_cast<BinaryPackage &>(pkg).export_binfo);
+ load_sub(obj.export_binfo);
}