Rearrange Target members

[builder.git] / source / binarypackage.cpp

diff --git a/source/binarypackage.cpp b/source/binarypackage.cpp
index f804da08394c31fc3489109a46b1abf9eb9ef5fd..514481f0066c56a3febb253a81708d3ff51c16da 100644 (file)
--- a/source/binarypackage.cpp
+++ b/source/binarypackage.cpp
@@ -20,34 +20,39 @@ void BinaryPackage::set_path(const FS::Path &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 = path/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 = path/i->subpath(1);
 }
 
-BinaryPackage *BinaryPackage::from_pkgconfig(Builder &builder, const string &name)
+BinaryPackage *BinaryPackage::from_flags(Builder &builder, const string &name, const vector<string> &flags)
 {
-       string info = builder.run_pkgconfig(name, "flags");
-
        BinaryPackage *pkg = new BinaryPackage(builder, name);
        pkg->use_pkgconfig = true;
        BuildInfo &binfo = pkg->export_binfo;
 
-       vector<string> flags = split(info);
        for(vector<string>::const_iterator i=flags.begin(); i!=flags.end(); ++i)
        {
                if(!i->compare(0, 2, "-I"))
                        binfo.incpath.push_back(i->substr(2));
                else if(!i->compare(0, 2, "-D"))
-                       binfo.defines.push_back(i->substr(2));
+               {
+                       string::size_type equals = i->find('=');
+                       if(equals!=string::npos)
+                               binfo.defines[i->substr(2, equals-2)] = i->substr(equals+1);
+                       else
+                               binfo.defines[i->substr(2)] = string();
+               }
                else if(!i->compare(0, 2, "-L"))
                        binfo.libpath.push_back(i->substr(2));
                else if(!i->compare(0, 2, "-l"))
                        binfo.libs.push_back(i->substr(2));
+               else if(*i=="-pthread")
+                       binfo.threads = true;
        }
 
        return pkg;
@@ -55,7 +60,7 @@ BinaryPackage *BinaryPackage::from_pkgconfig(Builder &builder, const string &nam
 
 
 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);
@@ -63,5 +68,5 @@ BinaryPackage::Loader::Loader(BinaryPackage &p):
 
 void BinaryPackage::Loader::build_info()
 {
-       load_sub(static_cast<BinaryPackage &>(pkg).export_binfo);
+       load_sub(obj.export_binfo);
 }