Reorder functions to match the header

[builder.git] / source / binarypackage.cpp

diff --git a/source/binarypackage.cpp b/source/binarypackage.cpp
index 94667c989dede480f3b36afbddb04108f84881cb..e48f17cee0c0d3f5987abb0096bf0154bb37aba5 100644 (file)
--- a/source/binarypackage.cpp
+++ b/source/binarypackage.cpp
@@ -1,7 +1,10 @@
+#include <algorithm>
 #include <msp/io/print.h>
 #include <msp/strings/utils.h>
 #include "binarypackage.h"
 #include "builder.h"
+#include "filetarget.h"
+#include "staticlibrary.h"
 
 using namespace std;
 using namespace Msp;
@@ -12,6 +15,45 @@ BinaryPackage::BinaryPackage(Builder &b, const string &n):
        use_pkgconfig = false;
 }
 
+BinaryPackage *BinaryPackage::from_flags(Builder &builder, const string &name, const Flags &flags, const Flags &static_flags)
+{
+       BinaryPackage *pkg = new BinaryPackage(builder, name);
+       pkg->use_pkgconfig = true;
+
+       process_flags(flags, pkg->export_binfo);
+
+       Flags exclusive_static_flags;
+       for(Flags::const_iterator i=static_flags.begin(); i!=static_flags.end(); ++i)
+               if(find(flags.begin(), flags.end(), *i)==flags.end())
+                       exclusive_static_flags.push_back(*i);
+       process_flags(exclusive_static_flags, pkg->static_binfo);
+
+       return pkg;
+}
+
+void BinaryPackage::process_flags(const Flags &flags, BuildInfo &binfo)
+{
+       for(Flags::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"))
+               {
+                       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;
+       }
+}
+
 void BinaryPackage::do_prepare()
 {
        bool has_relative_paths = false;
@@ -73,6 +115,7 @@ void BinaryPackage::do_prepare()
        if(base_path.empty())
        {
                // TODO report which files were not found
+               builder.get_logger().log("problems", format("Cannot locate files for %s", name));
                problems.push_back("Cannot locate files");
                return;
        }
@@ -91,35 +134,22 @@ void BinaryPackage::do_prepare()
                for(BuildInfo::PathList::iterator i=export_binfo.libpath.begin(); i!=export_binfo.libpath.end(); ++i)
                        *i = base_path/ *i;
        }
-}
 
-BinaryPackage *BinaryPackage::from_flags(Builder &builder, const string &name, const vector<string> &flags)
-{
-       BinaryPackage *pkg = new BinaryPackage(builder, name);
-       pkg->use_pkgconfig = true;
-       BuildInfo &binfo = pkg->export_binfo;
-
-       for(vector<string>::const_iterator i=flags.begin(); i!=flags.end(); ++i)
+       if(!static_binfo.libs.empty())
        {
-               if(!i->compare(0, 2, "-I"))
-                       binfo.incpath.push_back(i->substr(2));
-               else if(!i->compare(0, 2, "-D"))
-               {
-                       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;
+               BuildInfo::PathList combined_libpath = static_binfo.libpath;
+               combined_libpath.insert(combined_libpath.end(), export_binfo.libpath.begin(), export_binfo.libpath.end());
+
+               for(BuildInfo::WordList::const_iterator i=export_binfo.libs.begin(); i!=export_binfo.libs.end(); ++i)
+                       if(Target *lib = builder.get_vfs().find_library(*i, export_binfo.libpath, BuildInfo::FORCE_STATIC, system))
+                               if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(lib))
+                               {
+                                       for(BuildInfo::WordList::const_iterator j=static_binfo.libs.begin(); j!=static_binfo.libs.end(); ++j)
+                                               stlib->add_required_library(*j);
+                                       for(BuildInfo::PathList::const_iterator j=combined_libpath.begin(); j!=combined_libpath.end(); ++j)
+                                               stlib->add_library_path(*j);
+                               }
        }
-
-       return pkg;
 }