Remove most container typedefs and refactor others

[builder.git] / source / csourcefile.cpp

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index 0ff4286c5cb87bb6270a5978c304c8969c29bed0..41dbd437cc836b75697342381f590b1c09f89fc4 100644 (file)
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -6,57 +6,70 @@
 #include "component.h"
 #include "csourcefile.h"
 #include "sourcepackage.h"
+#include "tool.h"
 
 using namespace std;
 using namespace Msp;
 
 CSourceFile::CSourceFile(Builder &b, const FS::Path &p):
-       SourceFile(b, 0, p)
+       SourceFile(b, p)
 { }
 
 CSourceFile::CSourceFile(Builder &b, const Component &c, const FS::Path &p):
-       SourceFile(b, &c, p)
+       SourceFile(b, c, p)
 {
        string ext = FS::extpart(FS::basename(path));
        if(ext==".h" || ext==".H" || ext==".hpp")
-               install_location = "include/"+comp->get_name();
+               install_location = FS::Path("include")/package->get_name();
 }
 
-void CSourceFile::find_depends()
+void CSourceFile::parse_includes(IO::Base &in)
 {
-       if(!comp || !mtime)
+       static Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
+
+       string line;
+       while(in.getline(line))
+               if(RegMatch match = r_include.match(line))
+                       includes.push_back(match[1].str);
+}
+
+void CSourceFile::find_dependencies()
+{
+       if(!component || !mtime)
                return;
 
-       const SourcePackage &spkg = comp->get_package();
-       string relname = FS::relative(path, spkg.get_source()).str();
+       const SourcePackage &spkg = component->get_package();
 
-       DependencyCache &deps_cache = spkg.get_deps_cache();
-       if(mtime<deps_cache.get_mtime() && deps_cache.has_deps(relname))
-               includes = deps_cache.get_deps(relname);
+       Cache &cache = spkg.get_cache();
+       if(mtime<cache.get_mtime() && cache.has_key(this, "includes"))
+               includes = cache.get_values(this, "includes");
        else
        {
                IO::BufferedFile in(path.str());
 
                builder.get_logger().log("files", format("Reading includes from %s", path.str()));
 
-               Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
-
-               string line;
-               while(in.getline(line))
-                       if(RegMatch match = r_include.match(line))
-                               includes.push_back(match[1].str);
-
-               deps_cache.set_deps(relname, includes);
+               parse_includes(in);
+               cache.set_values(this, "includes", includes);
        }
 
-       const BuildInfo::PathList &incpath = comp->get_build_info().incpath;
-       BuildInfo::PathList local_incpath = incpath;
+       const BuildInfo &build_info = component->get_build_info_for_path(path);
+       const auto &incpath = build_info.incpath;
+       VirtualFileSystem::SearchPath local_incpath = incpath;
+       local_incpath.insert(local_incpath.begin(), build_info.local_incpath.begin(), build_info.local_incpath.end());
        local_incpath.push_front(FS::dirname(path).str());
 
-       for(list<string>::iterator i=includes.begin(); i!=includes.end(); ++i)
-       {
-               Target *hdr = builder.get_vfs().find_header(i->substr(1), ((*i)[0]=='"' ? local_incpath : incpath));
-               if(hdr)
-                       add_depend(hdr);
-       }
+       Tool *compiler = builder.get_toolchain().get_tool_for_suffix(FS::extpart(FS::basename(path)), true);
+       if(compiler)
+               compiler->prepare();
+       for(const string &i: includes)
+               if(Target *hdr = builder.get_vfs().find_header(i.substr(1), compiler, (i[0]=='"' ? local_incpath : incpath)))
+                       add_transitive_dependency(*hdr);
+}
+
+void CSourceFile::modified()
+{
+       includes.clear();
+       trans_depends.clear();
+       find_dependencies();
 }