X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=feb5094b27a071fa8823eabd4e09c2fae466a11d;hb=62ad932589407842cc1026af6e6d9f4012e60c67;hp=c12399f670f944e2a22f953862f3763ba05ff795;hpb=f56fa0c68e0eddf1f01c9584b8761431d29e8fa1;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index c12399f..feb5094 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -6,231 +6,234 @@ #include #include "builder.h" #include "component.h" +#include "csourcefile.h" #include "datafile.h" #include "executable.h" #include "file.h" -#include "header.h" -#include "install.h" #include "objectfile.h" #include "sharedlibrary.h" #include "sourcepackage.h" #include "staticlibrary.h" #include "tarball.h" #include "target.h" +#include "tool.h" +#include "toolchain.h" using namespace std; using namespace Msp; Component::Component(SourcePackage &p, Type t, const string &n): - pkg(p), + package(p), type(t), name(n), install(false), deflt(true) { } -void Component::configure(const StringMap &opts, unsigned flag) +void Component::prepare() { - for(StringList::iterator i=sources.begin(); i!=sources.end(); ++i) - *i = (pkg.get_source()/pkg.expand_string(*i)).str(); - - for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i) - (*i)->configure(opts, flag&2); + for(Package::Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i) + (*i)->prepare(); } void Component::create_build_info() { - const PackageList &pkg_reqs = pkg.get_requires(); - PackageList direct_reqs = requires; + BuildInfo final_build_info; + + const Package::Requirements &pkg_reqs = package.get_required_packages(); + Package::Requirements direct_reqs = requires; direct_reqs.insert(direct_reqs.end(), pkg_reqs.begin(), pkg_reqs.end()); - PackageList all_reqs = direct_reqs; - for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) + Package::Requirements all_reqs = direct_reqs; + for(Package::Requirements::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) { + BuildInfo::UpdateLevel level = BuildInfo::CHAINED; if(find(direct_reqs.begin(), direct_reqs.end(), *i)!=direct_reqs.end()) - build_info.add((*i)->get_exported_binfo()); - else - { - const BuildInfo &ebi = (*i)->get_exported_binfo(); - build_info.cflags.insert(build_info.cflags.end(), ebi.cflags.begin(), ebi.cflags.end()); - build_info.incpath.insert(build_info.incpath.end(), ebi.incpath.begin(), ebi.incpath.end()); - build_info.defines.insert(build_info.defines.end(), ebi.defines.begin(), ebi.defines.end()); - } + level = BuildInfo::DEPENDENCY; + final_build_info.update_from((*i)->get_exported_build_info(), level); - const PackageList &reqs = (*i)->get_requires(); - for(PackageList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j) + const Package::Requirements &reqs = (*i)->get_required_packages(); + for(Package::Requirements::const_iterator j=reqs.begin(); j!=reqs.end(); ++j) if(find(all_reqs.begin(), all_reqs.end(), *j)==all_reqs.end()) all_reqs.push_back(*j); } - build_info.add(pkg.get_build_info()); + final_build_info.update_from(package.get_build_info()); + + for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i) + *i = (package.get_source_directory() / *i).str(); + for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i) + *i = (package.get_source_directory() / *i).str(); + + final_build_info.update_from(build_info); + build_info = final_build_info; - for(StringList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i) - *i = (pkg.get_source() / *i).str(); - for(StringList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i) - *i = (pkg.get_source() / *i).str(); + if(type==LIBRARY || type==MODULE) + if(build_info.libmodeget_exported_binfo(); + const BuildInfo &ebi = (*i)->get_exported_build_info(); build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end()); } } - - if(type==PROGRAM) - { - string strip = pkg.get_config().get_option("strip").value; - if(lexical_cast(strip)) - build_info.ldflags.push_back("-s"); - } - else if(type==LIBRARY) - { - build_info.cflags.push_back("-fPIC"); - } - - build_info.unique(); } void Component::create_targets() const { - Builder &builder = pkg.get_builder(); - Target *world = builder.get_target("world"); - Target *def_tgt = builder.get_target("default"); + Builder &builder = package.get_builder(); + const Toolchain &toolchain = builder.get_toolchain(); - PathList files = collect_source_files(); - list inst_list; + SourceList source_filenames = collect_source_files(); + list inst_list; string inst_loc; if(type==TARBALL) { - string tarname = name; - if(name=="@src") - tarname = pkg.get_name()+"-"+pkg.get_version(); - TarBall *result = new TarBall(builder, pkg, tarname); + const Tool &tar = toolchain.get_tool("TAR"); + + list files; + for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) + { + FileTarget *file = builder.get_vfs().get_target(*i); + if(!file) + file = new File(builder, package, *i); + files.push_back(file); + } + string tarname = name; if(name=="@src") { + tarname = package.get_name()+"-"+package.get_version(); + files.insert(files.begin(), &package.get_build_file()); + const Builder::TargetMap &targets = builder.get_targets(); for(Builder::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i) - if(i->second->get_package()==&pkg && !i->second->is_buildable()) - result->add_depend(i->second); - files.push_back(pkg.get_source()/"Build"); + if(i->second->get_package()==&package && !i->second->is_buildable()) + if(find(files.begin(), files.end(), i->second)==files.end()) + files.push_back(i->second); } - for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) - { - FileTarget *ft; - if(Target *tgt = builder.get_target_by_path(*i)) - ft = dynamic_cast(tgt); - else - ft = new File(builder, *i); - result->add_depend(ft); - } + Target *result = tar.create_target(files, tarname); - Target *tarbls_tgt = builder.get_target("tarballs"); - tarbls_tgt->add_depend(result); + builder.get_target("tarballs")->add_dependency(*result); return; } else if(type==INSTALL) { inst_loc = name; - for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) + for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) { FileTarget *ft; - if(Target *tgt = builder.get_target_by_path(*i)) + if(Target *tgt = builder.get_vfs().get_target(*i)) ft = dynamic_cast(tgt); else - ft = new File(builder, pkg, *i); + ft = new File(builder, package, *i); inst_list.push_back(ft); } } else if(type==DATAFILE) { + const Tool &dcomp = toolchain.get_tool("DATA"); + File *source; - if(Target *tgt = builder.get_target_by_path(files.front())) + if(Target *tgt = builder.get_vfs().get_target(source_filenames.front())) source = dynamic_cast(tgt); else - source = new File(builder, pkg, files.front()); - ::DataFile *result = new ::DataFile(builder, *this, *source); + source = new File(builder, package, source_filenames.front()); + Target *result = dcomp.create_target(*source); - if(&pkg==builder.get_main_package() && deflt) - def_tgt->add_depend(result); - else - world->add_depend(result); + builder.add_primary_target(*result); if(install) inst_list.push_back(result); } - else - { - for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) - { - string ext = FS::extpart(FS::basename(*i)); - if(ext==".h") - { - FileTarget *hdr = builder.get_target_by_path(*i); - if(!hdr) - hdr = new Header(builder, *this, i->str()); - - // Install headers if requested - if(type==HEADERS && install) - inst_list.push_back(hdr); - } - } - } if(type==PROGRAM || type==LIBRARY || type==MODULE) { - list objs; - for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) + list objs; + for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) { string ext = FS::extpart(FS::basename(*i)); - if((ext==".cpp" || ext==".cc" || ext==".c")) + const Tool *tool = toolchain.get_tool_for_suffix(ext, true); + if(tool) { - SourceFile *src = new SourceFile(builder, *this, i->str()); - ObjectFile *obj = new ObjectFile(builder, *this, *src); - objs.push_back(obj); + Target *src = tool->create_source(*this, *i); + if(!src) + continue; + + if(tool->accepts_suffix(ext)) + { + Target *obj = tool->create_target(*src); + objs.push_back(obj); + } + + if(type==LIBRARY && install && dynamic_cast(src)->is_installable()) + inst_list.push_back(src); } } - list results; + const Tool &linker = toolchain.get_tool("LINK"); + + list results; if(type==LIBRARY) { - results.push_back(new SharedLibrary(builder, *this, objs)); - results.push_back(new StaticLibrary(builder, *this, objs)); + const Tool &archiver = toolchain.get_tool("AR"); + results.push_back(linker.create_target(objs, "shared")); + results.push_back(archiver.create_target(objs)); } + else if(type==MODULE) + results.push_back(linker.create_target(objs, "shared")); else - results.push_back(new Executable(builder, *this, objs)); + results.push_back(linker.create_target(objs)); - for(list::const_iterator i=results.begin(); i!=results.end(); ++i) + const Target::Dependencies &world_deps = builder.get_target("world")->get_dependencies(); + for(UseList::const_iterator i=uses.begin(); i!=uses.end(); ++i) { - if(&pkg==builder.get_main_package() && deflt) - def_tgt->add_depend(*i); - else - world->add_depend(*i); + /* The world target depends on all primary targets; look for the + static library belonging to the component. This is a bit roundabout + way but gets the job done. */ + bool found = false; + for(Target::Dependencies::const_iterator j=world_deps.begin(); j!=world_deps.end(); ++j) + if((*j)->get_component()==*i && dynamic_cast(*j)) + { + results.front()->add_dependency(**j); + found = true; + break; + } + if(!found) + builder.problem(package.get_name(), format("Can't find static library %s for component %s", (*i)->get_name(), name)); + } + + for(list::const_iterator i=results.begin(); i!=results.end(); ++i) + { + builder.add_primary_target(**i); if(install) inst_list.push_back(*i); } } Target *inst_tgt = builder.get_target("install"); - for(list::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i) + const Tool © = toolchain.get_tool("CP"); + for(list::const_iterator i=inst_list.begin(); i!=inst_list.end(); ++i) { - Install *inst = new Install(builder, pkg, **i, inst_loc); - inst_tgt->add_depend(inst); + Target *inst = copy.create_target(**i, inst_loc); + inst_tgt->add_dependency(*inst); } } -PathList Component::collect_source_files() const +Component::SourceList Component::collect_source_files() const { - PathList files; - for(StringList::const_iterator i=sources.begin(); i!=sources.end(); ++i) + SourceList files; + for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i) { FS::Path path(*i); if(FS::is_dir(path)) { + package.get_builder().get_logger().log("files", format("Traversing %s", path)); list sfiles = list_files(path); for(list::iterator j=sfiles.begin(); j!=sfiles.end(); ++j) files.push_back(path / *j); @@ -244,66 +247,47 @@ PathList Component::collect_source_files() const Component::Loader::Loader(Component &c): - comp(c) + DataFile::ObjectLoader(c) { add("source", &Loader::source); add("install", &Component::install); - add("install_headers", &Loader::install_headers); + add("install_map", &Loader::install_map); add("build_info", &Loader::build_info); add("require", &Loader::require); - add("modular", &Loader::modular); - add("host", &Loader::host); add("default", &Component::deflt); -} - -void Component::Loader::finish() -{ - if(!inst_hdr.empty()) - { - Component hdrcomp(comp.pkg, HEADERS, inst_hdr); - hdrcomp.sources = comp.sources; - hdrcomp.install = true; - const_cast(comp.pkg.get_components()).push_back(hdrcomp); - } + add("use", &Loader::use); } void Component::Loader::source(const string &s) { - comp.sources.push_back(s); + obj.sources.push_back((obj.package.get_source_directory()/s).str()); } void Component::Loader::require(const string &n) { - Package *req = comp.pkg.get_builder().get_package(n); + Package *req = obj.package.get_builder().get_package_manager().find_package(n); if(req) - comp.requires.push_back(req); -} - -void Component::Loader::modular() -{ - IO::print("%s: Note: modular is deprecated\n", get_source()); - comp.build_info.ldflags.push_back("-rdynamic"); - comp.build_info.libs.push_back("dl"); + obj.requires.push_back(req); } -void Component::Loader::host(const string &) +void Component::Loader::build_info() { - IO::print("%s: Note: host is deprecated\n", get_source()); + load_sub(obj.build_info); } -void Component::Loader::install_headers(const string &p) +void Component::Loader::install_map() { - IO::print("%s: Note: install_headers is deprecated\n", get_source()); - if(comp.type==HEADERS) - { - comp.name = p; - comp.install = true; - } - else - inst_hdr = p; + load_sub(obj.install_map, obj.package.get_source_directory()); } -void Component::Loader::build_info() +void Component::Loader::use(const string &n) { - load_sub(comp.build_info); + const SourcePackage::ComponentList &components = obj.package.get_components(); + for(SourcePackage::ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i) + if(i->get_name()==n && i->get_type()==LIBRARY) + { + obj.uses.push_back(&*i); + return; + } + error(format("Unknown library component '%s'", n)); }