X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=708293e7575da7e4ef67ca3e9fc0217f9ea7ab7a;hb=b067981c0da0c1a4616ed175d0ce8ac5564cbdbf;hp=ea53d23ea94693fb35e79a290bd5a9364215b018;hpb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index ea53d23..708293e 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -6,18 +6,18 @@ #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 "symlink.h" #include "tarball.h" #include "target.h" +#include "tool.h" +#include "toolchain.h" using namespace std; using namespace Msp; @@ -48,15 +48,10 @@ void Component::create_build_info() PackageList all_reqs = direct_reqs; for(PackageList::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; + build_info.update_from((*i)->get_exported_binfo(), level); const PackageList &reqs = (*i)->get_requires(); for(PackageList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j) @@ -64,11 +59,11 @@ void Component::create_build_info() all_reqs.push_back(*j); } - build_info.add(pkg.get_build_info()); + build_info.update_from(pkg.get_build_info()); - for(StringList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i) + for(BuildInfo::PathList::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) + for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i) *i = (pkg.get_source() / *i).str(); if(pkg.get_library_mode()!=DYNAMIC) @@ -81,67 +76,64 @@ void Component::create_build_info() } 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(); + build_info.strip = lexical_cast(pkg.get_config().get_option("strip").value); } void Component::create_targets() const { Builder &builder = pkg.get_builder(); + const Toolchain &toolchain = builder.get_toolchain(); Target *world = builder.get_target("world"); Target *def_tgt = builder.get_target("default"); - PathList files = collect_source_files(); - list inst_list; + PathList source_filenames = collect_source_files(); + list inst_list; string inst_loc; if(type==TARBALL) { + //const Tool &tar = toolchain.get_tool("TAR"); + string tarname = name; if(name=="@src") + { tarname = pkg.get_name()+"-"+pkg.get_version(); - TarBall *result = new TarBall(builder, pkg, tarname); + source_filenames.push_back(pkg.get_source()/"Build"); + } - if(name=="@src") + list files; + for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) { - const TargetMap &targets = builder.get_targets(); - for(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"); + FileTarget *file = builder.get_vfs().get_target(*i); + if(!file) + file = new File(builder, *i); + files.push_back(file); } - for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) + if(name=="@src") { - FileTarget *ft; - if(Target *tgt = builder.get_target(i->str())) - ft = dynamic_cast(tgt); - else - ft = new File(builder, *i); - result->add_depend(ft); + 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()) + files.push_back(i->second); } - Target *tarbls_tgt = builder.get_target("tarballs"); - tarbls_tgt->add_depend(result); + /* XXX The source files don't have a package at the moment, so we can't + create the tarball target until things get fixed up a bit */ + /*Target *result = tar.create_target(files, tarname); + + Target *tarballs_tgt = builder.get_target("tarballs"); + tarballs_tgt->add_depend(*result);*/ return; } else if(type==INSTALL) { inst_loc = name; - for(PathList::const_iterator i=files.begin(); i!=files.end(); ++i) + for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) { FileTarget *ft; - if(Target *tgt = builder.get_target(i->str())) + if(Target *tgt = builder.get_vfs().get_target(*i)) ft = dynamic_cast(tgt); else ft = new File(builder, pkg, *i); @@ -150,82 +142,75 @@ void Component::create_targets() const } else if(type==DATAFILE) { + const Tool &dcomp = toolchain.get_tool("DATA"); + File *source; - if(Target *tgt = builder.get_target(files.front().str())) + 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, pkg, source_filenames.front()); + Target *result = dcomp.create_target(*source); if(&pkg==builder.get_main_package() && deflt) - def_tgt->add_depend(result); + def_tgt->add_depend(*result); else - world->add_depend(result); + world->add_depend(*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 = dynamic_cast(builder.get_target(i->str())); - 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(PathList::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(tool->accepts_suffix(ext)) + { + Target *obj = tool->create_target(*src); + objs.push_back(obj); + } + + if(type==LIBRARY && install && !dynamic_cast(src)->get_install_location().empty()) + 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) + for(list::const_iterator i=results.begin(); i!=results.end(); ++i) { if(&pkg==builder.get_main_package() && deflt) - def_tgt->add_depend(*i); + def_tgt->add_depend(**i); else - world->add_depend(*i); + world->add_depend(**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); - - if(type==LIBRARY) - if(SharedLibrary *shlib = dynamic_cast(*i)) - if(!shlib->get_soname().empty()) - inst_tgt->add_depend(new Symlink(builder, pkg, *inst, shlib->get_name())); + Target *inst = copy.create_target(**i, inst_loc); + inst_tgt->add_depend(*inst); } } @@ -250,66 +235,34 @@ 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); - } -} - void Component::Loader::source(const string &s) { - comp.sources.push_back(s); + obj.sources.push_back(s); } void Component::Loader::require(const string &n) { - Package *req = comp.pkg.get_builder().get_package(n); + Package *req = obj.pkg.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 &) -{ - IO::print("%s: Note: host is deprecated\n", get_source()); -} - -void Component::Loader::install_headers(const string &p) +void Component::Loader::build_info() { - 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.build_info); } -void Component::Loader::build_info() +void Component::Loader::install_map() { - load_sub(comp.build_info); + load_sub(obj.install_map, obj.pkg.get_source()); }