X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=393cfc5d62598cf6649c9366fd69ddd904c67371;hb=1d687970cc35e54c3335f4aa2fdef23424fe0a06;hp=2c28b7931631e2a3d06bf7f32b2c4e8539f8a0ac;hpb=5eab9f87fc3203d7c2d16be312be74a63a8c8980;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index 2c28b79..393cfc5 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -17,7 +17,6 @@ #include "binarypackage.h" #include "builder.h" #include "copy.h" -#include "externaltask.h" #include "gnuarchiver.h" #include "gnuccompiler.h" #include "gnucxxcompiler.h" @@ -35,6 +34,7 @@ using namespace std; using namespace Msp; Builder::Builder(int argc, char **argv): + package_manager(*this), main_pkg(0), native_arch(*this, string()), vfs(*this), @@ -59,6 +59,7 @@ Builder::Builder(int argc, char **argv): StringList cmdline_warn; string prfx; string arch; + bool no_externals = false; GetOpt getopt; getopt.add_option('a', "analyze", analyze_mode, GetOpt::REQUIRED_ARG).set_help("Perform analysis. MODE can be deps, alldeps or rebuild.", "MODE"); @@ -124,6 +125,8 @@ Builder::Builder(int argc, char **argv): cwd = FS::getcwd(); + package_manager.set_no_externals(no_externals); + load_build_file((FS::get_sys_data_dir(argv[0], "builder")/"builderrc").str()); load_build_file((FS::get_user_data_dir("builder")/"rc").str()); @@ -170,15 +173,10 @@ Builder::Builder(int argc, char **argv): vector warns = split(*i, ','); warnings.insert(warnings.end(), warns.begin(), warns.end()); } - - pkg_path.push_back(cwd/"."); - pkg_path.push_back(cwd/".."); } Builder::~Builder() { - for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) - delete i->second; for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i) delete i->second; delete analyzer; @@ -244,8 +242,9 @@ int Builder::main() if(verbose>=1) { + const PackageManager::PackageMap &packages = package_manager.get_packages(); unsigned n_packages = 0; - for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) + for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) if(i->second && i->second->is_configured()) ++n_packages; IO::print("%d active packages, %d targets\n", n_packages, targets.size()); @@ -253,7 +252,8 @@ int Builder::main() if(verbose>=2) { - for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) + const PackageManager::PackageMap &packages = package_manager.get_packages(); + for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) { if(!i->second->is_configured()) continue; @@ -302,72 +302,6 @@ int Builder::main() return exit_code; } -string Builder::run_pkgconfig(const string &pkg, const string &what) -{ - ExternalTask::Arguments argv; - argv.push_back("pkg-config"); - if(what=="cflags" || what=="libs") - argv.push_back("--"+what); - else if(what=="flags") - { - argv.push_back("--cflags"); - argv.push_back("--libs"); - } - else - argv.push_back("--variable="+what); - argv.push_back(pkg); - - if(verbose>=4) - IO::print("Running %s\n", join(argv.begin(), argv.end())); - - ExternalTask task(argv); - task.set_stdout(ExternalTask::CAPTURE); - task.set_stderr(ExternalTask::IGNORE); - task.start(); - Task::Status status; - while((status=task.check())==Task::RUNNING) - Time::sleep(10*Time::msec); - if(status==Task::ERROR) - throw runtime_error(format("pkg-config for package %s failed", pkg)); - - return task.get_output(); -} - -Package *Builder::get_package(const string &name) -{ - PackageMap::iterator i = packages.find(format("%s/%s", name, current_arch->get_system())); - if(i==packages.end()) - i = packages.find(name); - if(i!=packages.end()) - return i->second; - - if(!no_externals) - { - FS::Path path = get_package_location(name); - if(!path.empty() && !load_build_file(path/"Build")) - { - i = packages.find(name); - if(i!=packages.end()) - return i->second; - } - } - - Package *pkg = 0; - try - { - // Package source not found - create a binary package - pkg = BinaryPackage::from_pkgconfig(*this, name); - } - catch(...) - { - problem(name, "not found"); - } - - packages.insert(PackageMap::value_type(name, pkg)); - - return pkg; -} - Target *Builder::get_target(const string &n) const { TargetMap::const_iterator i = targets.find(n); @@ -417,52 +351,6 @@ void Builder::usage(const char *reason, const char *argv0, bool brief) } } -FS::Path Builder::get_package_location(const string &name) -{ - if(verbose>=3) - IO::print("Looking for package %s\n", name); - - try - { - // Try to get source directory with pkgconfig - string srcdir = strip(run_pkgconfig(name, "source")); - if(!srcdir.empty()) - return srcdir; - } - catch(...) - { } - - if(pkg_dirs.empty()) - { - for(list::const_iterator i=pkg_path.begin(); i!=pkg_path.end(); ++i) - { - list files = list_files(*i); - for(list::const_iterator j=files.begin(); j!=files.end(); ++j) - { - FS::Path full = *i / *j; - if(FS::exists(full/"Build")) - pkg_dirs.push_back(full); - } - } - if(verbose>=3) - IO::print("%d packages found in path\n", pkg_dirs.size()); - } - - bool msp = !name.compare(0, 3, "msp"); - for(list::const_iterator i=pkg_dirs.begin(); i!=pkg_dirs.end(); ++i) - { - string base = basename(*i); - unsigned dash = base.rfind('-'); - - if(!base.compare(0, dash, name)) - return *i; - else if(msp && !base.compare(0, dash-3, name, 3, string::npos)) - return *i; - } - - return FS::Path(); -} - int Builder::load_build_file(const FS::Path &fn) { if(!FS::exists(fn)) @@ -493,7 +381,8 @@ int Builder::create_targets() Target *tarballs = new VirtualTarget(*this, "tarballs"); world->add_depend(tarballs); - for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) + const PackageManager::PackageMap &packages = package_manager.get_packages(); + for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) if(i->second && i->second->is_configured()) i->second->create_targets(); @@ -536,7 +425,7 @@ int Builder::create_targets() i->second->force_rebuild(); } - for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) + for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i) if(SourcePackage *spkg = dynamic_cast(i->second)) spkg->get_deps_cache().save(); @@ -703,7 +592,6 @@ void Builder::Loader::binpkg(const string &n) { BinaryPackage *pkg = new BinaryPackage(bld, n); load_sub(*pkg); - bld.packages.insert(PackageMap::value_type(n, pkg)); } void Builder::Loader::cross_prefix(const string &a, const string &p) @@ -726,7 +614,6 @@ void Builder::Loader::package(const string &n) bld.main_pkg = pkg; load_sub(*pkg); - bld.packages.insert(PackageMap::value_type(n, pkg)); }