X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinarypackage.cpp;h=02b9be21d7b58966a323ea66f295af14f0158d7f;hb=b45cfe5e437ca79bb3176618769628c58c0734d1;hp=679fb636132127ab39195a101e2ce93204277d2a;hpb=21ca3e98081c0dc0430d8e5301591aa71ec4fca2;p=builder.git diff --git a/source/binarypackage.cpp b/source/binarypackage.cpp index 679fb63..02b9be2 100644 --- a/source/binarypackage.cpp +++ b/source/binarypackage.cpp @@ -1,9 +1,10 @@ -#include +#include #include #include #include "binarypackage.h" #include "builder.h" #include "filetarget.h" +#include "staticlibrary.h" using namespace std; using namespace Msp; @@ -14,13 +15,50 @@ 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(const string &f: static_flags) + if(!any_equals(flags, f)) + exclusive_static_flags.push_back(f); + process_flags(exclusive_static_flags, pkg->static_binfo); + + return pkg; +} + +void BinaryPackage::process_flags(const Flags &flags, BuildInfo &binfo) +{ + for(const string &f: flags) + { + if(!f.compare(0, 2, "-I")) + binfo.incpath.push_back(f.substr(2)); + else if(!f.compare(0, 2, "-D")) + { + string::size_type equals = f.find('='); + if(equals!=string::npos) + binfo.defines[f.substr(2, equals-2)] = f.substr(equals+1); + else + binfo.defines[f.substr(2)] = string(); + } + else if(!f.compare(0, 2, "-L")) + binfo.libpath.push_back(f.substr(2)); + else if(!f.compare(0, 2, "-l")) + binfo.libs.push_back(f.substr(2)); + else if(f=="-pthread") + binfo.threads = true; + } +} + void BinaryPackage::do_prepare() { - bool has_relative_paths = false; - for(BuildInfo::PathList::const_iterator i=export_binfo.libpath.begin(); (!has_relative_paths && i!=export_binfo.libpath.end()); ++i) - has_relative_paths = !i->is_absolute(); - for(BuildInfo::PathList::const_iterator i=export_binfo.incpath.begin(); (!has_relative_paths && i!=export_binfo.incpath.end()); ++i) - has_relative_paths = !i->is_absolute(); + auto is_relative = [](const FS::Path &p){ return !p.is_absolute(); }; + bool has_relative_paths = any_of(export_binfo.libpath.begin(), export_binfo.libpath.end(), is_relative) || + any_of(export_binfo.incpath.begin(), export_binfo.incpath.end(), is_relative); list bases; @@ -33,9 +71,9 @@ void BinaryPackage::do_prepare() bases.push_back(FS::Path()); bool system = false; - for(list::const_iterator i=bases.begin(); i!=bases.end(); ++i) + for(const FS::Path &b: bases) { - FS::Path prefix = *i; + FS::Path prefix = b; system = prefix.empty(); if(system) { @@ -48,21 +86,21 @@ void BinaryPackage::do_prepare() BuildInfo::PathList libpath = export_binfo.libpath; if(!system && libpath.empty()) libpath.push_back("lib"); - for(BuildInfo::PathList::iterator j=libpath.begin(); j!=libpath.end(); ++j) - *j = prefix/ *j; + for(FS::Path &p: libpath) + p = prefix/p; bool all_found = true; - for(BuildInfo::WordList::const_iterator j=export_binfo.libs.begin(); j!=export_binfo.libs.end(); ++j) - all_found &= (builder.get_vfs().find_library(*j, libpath, export_binfo.libmode, system)!=0); + for(const string &l: export_binfo.libs) + all_found &= (builder.get_vfs().find_library(l, libpath, export_binfo.libmode, system)!=0); BuildInfo::PathList incpath = export_binfo.incpath; if(!system && incpath.empty()) incpath.push_back("include"); - for(BuildInfo::PathList::iterator j=incpath.begin(); j!=incpath.end(); ++j) - *j = prefix/ *j; + for(FS::Path &p: incpath) + p = prefix/p; - for(HeaderList::const_iterator j=headers.begin(); j!=headers.end(); ++j) - all_found &= (builder.get_vfs().find_header(*j, 0, incpath, system)!=0); + for(const string &h: headers) + all_found &= (builder.get_vfs().find_header(h, 0, incpath, system)!=0); if(all_found) { @@ -75,6 +113,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; } @@ -88,10 +127,10 @@ void BinaryPackage::do_prepare() if(has_relative_paths) { - for(BuildInfo::PathList::iterator i=export_binfo.incpath.begin(); i!=export_binfo.incpath.end(); ++i) - *i = base_path/ *i; - for(BuildInfo::PathList::iterator i=export_binfo.libpath.begin(); i!=export_binfo.libpath.end(); ++i) - *i = base_path/ *i; + for(FS::Path &p: export_binfo.incpath) + p = base_path/p; + for(FS::Path &p: export_binfo.libpath) + p = base_path/p; } if(!static_binfo.libs.empty()) @@ -99,56 +138,15 @@ void BinaryPackage::do_prepare() BuildInfo::PathList combined_libpath = static_binfo.libpath; combined_libpath.insert(combined_libpath.end(), export_binfo.libpath.begin(), export_binfo.libpath.end()); - Target::Dependencies static_dep_libs; - for(BuildInfo::WordList::const_iterator i=static_binfo.libs.begin(); i!=static_binfo.libs.end(); ++i) - if(Target *lib = builder.get_vfs().find_library(*i, combined_libpath, BuildInfo::STATIC, system)) - static_dep_libs.push_back(lib); - - 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)) - { - for(Target::Dependencies::const_iterator j=static_dep_libs.begin(); j!=static_dep_libs.end(); ++j) - lib->add_transitive_dependency(**j); - } - } -} - -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; + for(const string &l: export_binfo.libs) + if(Target *lib = builder.get_vfs().find_library(l, export_binfo.libpath, BuildInfo::FORCE_STATIC, system)) + if(StaticLibrary *stlib = dynamic_cast(lib)) + { + for(const string &s: static_binfo.libs) + stlib->add_required_library(s); + for(const FS::Path &p: combined_libpath) + stlib->add_library_path(p); + } } }