Refactor logger to do message formatting internally

[builder.git] / source / csourcefile.cpp

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index 7c4c453b85be92c66991d58e32b3d0eaf9c24d8f..6429d4fe287504948480bd2e740f02c392a46c36 100644 (file)
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -6,66 +6,72 @@
 #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)
+       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
        {
-               try
-               {
-                       IO::BufferedFile in(path.str());
-
-                       if(builder.get_verbose()>=4)
-                               IO::print("Reading includes from %s\n", path.str());
-
-                       Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
+               IO::BufferedFile in(path.str());
 
-                       string line;
-                       while(in.getline(line))
-                               if(RegMatch match = r_include.match(line))
-                                       includes.push_back(match[1].str);
+               builder.get_logger().log("files", "Reading includes from %s", path.str());
 
-                       deps_cache.set_deps(relname, includes);
-               }
-               catch(const IO::file_not_found &)
-               {
-                       if(builder.get_verbose()>=4)
-                               IO::print("Failed to read includes from %s\n", path.str());
-                       return;
-               }
+               parse_includes(in);
+               cache.set_values(this, "includes", includes);
        }
 
-       const StringList &incpath = comp->get_build_info().incpath;
+       const BuildInfo &build_info = component->get_build_info_for_path(path);
+       const auto &incpath = build_info.incpath;
+       VirtualFileSystem::SearchPath local_incpath;
+       local_incpath.reserve(1+build_info.local_incpath.size()+incpath.size());
+       local_incpath.push_back(FS::dirname(path).str());
+       local_incpath.insert(local_incpath.end(), build_info.local_incpath.begin(), build_info.local_incpath.end());
+       local_incpath.insert(local_incpath.end(), incpath.begin(), incpath.end());
 
-       FS::Path dir = FS::dirname(path);
-       for(list<string>::iterator i=includes.begin(); i!=includes.end(); ++i)
-       {
-               Target *hdr = builder.get_vfs().find_header(*i, dir, 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();
 }