X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=5f50a6525b349eb921a04648cfd7bc44ad224384;hb=71554f76b7ae8f1f9d183dc0c522655ce458cb78;hp=48675f7e5d7c0148cc2752f39f6946ff163a9f32;hpb=766dad2d4f7ca73dc182f22e306ba0def6fd8722;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index 48675f7..5f50a65 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -7,7 +7,7 @@ #include "builder.h" #include "component.h" #include "csourcefile.h" -#include "datafile.h" +#include "datapack.h" #include "executable.h" #include "file.h" #include "objectfile.h" @@ -59,15 +59,14 @@ void Component::create_build_info() } final_build_info.update_from(package.get_build_info()); + final_build_info.update_from(build_info); + build_info = final_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(UseList::const_iterator i=uses.begin(); i!=uses.end(); ++i) { /* Select an include path that contains all the sources for this and the @@ -82,7 +81,7 @@ void Component::create_build_info() build_info.libs.push_back((*i)->get_name()); if(!(*i)->get_install()) { - build_info.libmodes[(*i)->get_name()] = BuildInfo::STATIC; + build_info.libmodes[(*i)->get_name()] = BuildInfo::STATIC; build_info.libpath.push_back((*i)->get_package().get_source_directory()); } } @@ -101,6 +100,32 @@ void Component::create_build_info() } } +BuildInfo Component::get_build_info_for_path(const FS::Path &path) const +{ + // XXX Cache these and check that the directories actually exist before adding them + BuildInfo binfo = build_info; + if(!overlays.empty()) + { + FS::Path dir = FS::dirname(path); + string last = FS::basename(dir); + for(OverlayList::const_iterator i=overlays.begin(); i!=overlays.end(); ++i) + if(last==*i) + { + dir = FS::dirname(dir); + break; + } + + for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i) + if(dir==*i) + { + binfo.local_incpath.push_back(dir); + for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j) + binfo.local_incpath.push_back(*i/ *j); + } + } + return binfo; +} + void Component::create_targets() const { Builder &builder = package.get_builder(); @@ -112,7 +137,7 @@ void Component::create_targets() const string inst_loc; if(type==TARBALL) { - const Tool &tar = toolchain.get_tool("TAR"); + Tool &tar = toolchain.get_tool("TAR"); list files; for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) @@ -145,7 +170,7 @@ void Component::create_targets() const else if(type==INSTALL) { Target *inst = build_graph.get_target("install"); - const Tool © = toolchain.get_tool("CP"); + Tool © = toolchain.get_tool("CP"); for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) { FileTarget *ft; @@ -156,16 +181,26 @@ void Component::create_targets() const inst->add_dependency(*copy.create_target(*ft, name)); } } - else if(type==DATAFILE) + else if(type==DATAPACK) { - const Tool &dcomp = toolchain.get_tool("DATA"); + Tool &dcomp = toolchain.get_tool("DATA"); - File *source; - if(Target *tgt = builder.get_vfs().get_target(source_filenames.front())) - source = dynamic_cast(tgt); - else - source = new File(builder, package, source_filenames.front()); - Target *result = dcomp.create_target(*source); + list files; + for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) + { + string ext = FS::extpart(FS::basename(*i)); + if(ext==".mdt") + { + Target *src = dcomp.create_source(*this, *i); + files.push_back(dcomp.create_target(*src, "collection")); + } + else if(Target *tgt = builder.get_vfs().get_target(*i)) + files.push_back(tgt); + else + files.push_back(new File(builder, package, *i)); + } + + Target *result = dcomp.create_target(files, "pack"); build_graph.add_primary_target(*result); if(install) @@ -178,7 +213,7 @@ void Component::create_targets() const for(SourceList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i) { string ext = FS::extpart(FS::basename(*i)); - const Tool *tool = toolchain.get_tool_for_suffix(ext, true); + Tool *tool = toolchain.get_tool_for_suffix(ext, true); if(tool) { Target *src = tool->create_source(*this, *i); @@ -196,12 +231,12 @@ void Component::create_targets() const } } - const Tool &linker = toolchain.get_tool("LINK"); + Tool &linker = toolchain.get_tool("LINK"); list results; if(type==LIBRARY) { - const Tool &archiver = toolchain.get_tool("AR"); + Tool &archiver = toolchain.get_tool("AR"); results.push_back(linker.create_target(objs, "shared")); results.push_back(archiver.create_target(objs)); } @@ -227,13 +262,32 @@ Component::SourceList Component::collect_source_files() const 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); + SourceList dirs; + dirs.push_back(path); + for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j) + { + FS::Path opath = path / *j; + if(FS::is_dir(opath)) + dirs.push_back(opath); + } + for(SourceList::const_iterator j=dirs.begin(); j!=dirs.end(); ++j) + { + package.get_builder().get_logger().log("files", format("Traversing %s", *j)); + list sfiles = list_files(*j); + for(list::iterator k=sfiles.begin(); k!=sfiles.end(); ++k) + files.push_back(*j / *k); + } } else + { files.push_back(path); + for(OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j) + { + FS::Path opath = FS::dirname(path)/ *j/FS::basename(path); + if(FS::is_reg(opath)) + files.push_back(opath); + } + } } return files; @@ -245,6 +299,7 @@ Component::Loader::Loader(Component &c): { add("if_arch", &Loader::if_arch); add("if_feature", &Loader::if_feature); + add("overlay", &Loader::overlay); add("source", &Loader::source); add("install", &Component::install); add("install_map", &Loader::install_map); @@ -282,11 +337,18 @@ void Component::Loader::install_map() load_sub(obj.install_map, obj.package.get_source_directory()); } +void Component::Loader::overlay(const string &o) +{ + obj.overlays.push_back(o); +} + void Component::Loader::require(const string &n) { Package *req = obj.package.get_builder().get_package_manager().find_package(n); if(req) obj.requires.push_back(req); + else + obj.problems.push_back(format("Required package %s not found", n)); } void Component::Loader::source(const string &s)