]> git.tdb.fi Git - builder.git/blobdiff - source/builder.cpp
Move file-to-target mapping to a separate class
[builder.git] / source / builder.cpp
index 57764b781b26a3030a9b629567c241ed1a74937c..bd1ee1aa82b523c450faeb6c72357e9d6651fc8d 100644 (file)
 using namespace std;
 using namespace Msp;
 
-namespace {
-
-void update_hash(string &hash, const string &value)
-{
-       for(unsigned i=0; i<value.size(); ++i)
-               hash[i%hash.size()] ^= value[i];
-}
-
-}
-
-
 Builder::Builder(int argc, char **argv):
        main_pkg(0),
        native_arch(*this, string()),
+       vfs(*this),
        analyzer(0),
        build(false),
        clean(0),
@@ -384,114 +374,6 @@ Target *Builder::get_target(const string &n) const
        return 0;
 }
 
-FileTarget *Builder::get_target_by_path(const FS::Path &p) const
-{
-       TargetMap::const_iterator i = targets_by_path.find(p.str());
-       if(i!=targets_by_path.end())
-               return static_cast<FileTarget *>(i->second);
-       return 0;
-}
-
-Target *Builder::get_header(const string &include, const FS::Path &from, const list<string> &path)
-{
-       string hash(8, 0);
-       if(include[0]=='\"')
-               update_hash(hash, from.str());
-       for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
-               update_hash(hash, *i);
-
-       string id = hash+include;
-       TargetMap::iterator i = includes.find(id);
-       if(i!=includes.end())
-               return i->second;
-
-       static string cxx_ver;
-       if(cxx_ver.empty())
-       {
-               // XXX This needs to go elsewhere
-               /*StringList argv;
-               argv.push_back(current_arch->get_tool("CXX"));
-               argv.push_back("--version");
-               if(RegMatch m = Regex("[0-9]\\.[0-9.]+").match(run_command(argv)))
-               {
-                       cxx_ver = m[0].str;
-                       while(!cxx_ver.empty() && !FS::is_dir(FS::Path("/usr/include/c++")/cxx_ver))
-                       {
-                               string::size_type dot = cxx_ver.rfind('.');
-                               if(dot==string::npos)
-                                       break;
-                               cxx_ver.erase(dot);
-                       }
-                       if(verbose>=5)
-                               IO::print("C++ version is %s\n", cxx_ver);
-               }
-               else*/
-                       cxx_ver = "-";
-       }
-
-       string fn = include.substr(1);
-       if(verbose>=5)
-               IO::print("Looking for include %s from %s with path %s\n", fn, from, join(path.begin(), path.end()));
-
-       StringList syspath;
-       if(current_arch->is_native())
-               syspath.push_back("/usr/include");
-       else
-               syspath.push_back("/usr/"+current_arch->get_cross_prefix()+"/include");
-       if(cxx_ver!="-")
-               syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver).str());
-
-       Target *tgt = 0;
-       if(include[0]=='\"')
-               tgt = get_header(FS::Path(from)/fn);
-       for(list<string>::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
-               tgt = get_header(cwd/ *j/fn);
-       for(list<string>::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
-               tgt = get_header(FS::Path(*j)/fn);
-
-       includes.insert(TargetMap::value_type(id, tgt));
-
-       return tgt;
-}
-
-Target *Builder::get_library(const string &lib, const list<string> &path, LibMode mode)
-{
-       string hash(8, 0);
-       for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
-               update_hash(hash, *i);
-
-       string id = hash+string(1, mode)+lib;
-       TargetMap::iterator i = libraries.find(id);
-       if(i!=libraries.end())
-               return i->second;
-
-       StringList syspath;
-       if(current_arch->is_native())
-       {
-               syspath.push_back("/lib");
-               syspath.push_back("/usr/lib");
-               if(current_arch->match_name("pc-32-linux"))
-                       syspath.push_back("/usr/lib/i386-linux-gnu");
-               else if(current_arch->match_name("pc-64-linux"))
-                       syspath.push_back("/usr/lib/x86_64-linux-gnu");
-       }
-       else
-               syspath.push_back("/usr/"+current_arch->get_cross_prefix()+"/lib");
-
-       if(verbose>=5)
-               IO::print("Looking for library %s with path %s\n", lib, join(path.begin(), path.end()));
-
-       Target *tgt = 0;
-       for(StringList::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
-               tgt = get_library(lib, cwd/ *j, mode);
-       for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
-               tgt = get_library(lib, *j, mode);
-
-       libraries.insert(TargetMap::value_type(id, tgt));
-
-       return tgt;
-}
-
 void Builder::apply_profile_template(Config &config, const string &pt) const
 {
        vector<string> parts = split(pt, '-');
@@ -517,11 +399,6 @@ void Builder::add_target(Target *t)
        new_tgts.push_back(t);
 }
 
-void Builder::register_path(const FS::Path &path, FileTarget *t)
-{
-       targets_by_path.insert(TargetMap::value_type(path.str(), t));
-}
-
 void Builder::usage(const char *reason, const char *argv0, bool brief)
 {
        if(reason)
@@ -647,7 +524,7 @@ int Builder::create_targets()
        // Apply what-ifs
        for(StringList::iterator i=what_if.begin(); i!=what_if.end(); ++i)
        {
-               FileTarget *tgt = get_target_by_path(cwd/ *i);
+               FileTarget *tgt = vfs.get_target(cwd/ *i);
                if(!tgt)
                {
                        IO::print(IO::cerr, "Unknown what-if target %s\n", *i);
@@ -662,9 +539,9 @@ int Builder::create_targets()
        {
                Target *tgt = get_target(*i);
                if(!tgt)
-                       tgt = get_target_by_path(*i);
+                       tgt = vfs.get_target(*i);
                if(!tgt)
-                       tgt = get_target_by_path(cwd/ *i);
+                       tgt = vfs.get_target(cwd/ *i);
                if(!tgt)
                {
                        IO::print("I don't know anything about %s\n", *i);
@@ -683,68 +560,6 @@ int Builder::create_targets()
        return 0;
 }
 
-Target *Builder::get_header(const FS::Path &fn)
-{
-       Target *tgt = get_target_by_path(fn);
-       if(tgt) return tgt;
-
-       if(FS::is_reg(fn))
-       {
-               tgt = new SystemHeader(*this, fn.str());
-               return tgt;
-       }
-       return 0;
-}
-
-Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mode)
-{
-       // Populate a list of candidate filenames
-       StringList candidates;
-
-       if(mode!=ALL_STATIC)
-       {
-               // XXX Should probably let the Architecture populate the list
-               if(current_arch->get_system()=="windows")
-               {
-                       candidates.push_back("lib"+lib+".dll");
-                       candidates.push_back(lib+".dll");
-               }
-               else
-                       candidates.push_back("lib"+lib+".so");
-       }
-
-       /* Static libraries are always considered, since sometimes shared versions
-       may not be available */
-       candidates.push_back("lib"+lib+".a");
-       if(current_arch->get_system()=="windows")
-               candidates.push_back("lib"+lib+".dll.a");
-
-       for(StringList::iterator i=candidates.begin(); i!=candidates.end(); ++i)
-       {
-               FS::Path full = path/ *i;
-               Target *tgt = get_target_by_path(full);
-
-               if(tgt)
-               {
-                       Target *real_tgt = tgt->get_real_target();
-
-                       /* Ignore dynamic libraries from local packages unless library mode is
-                       DYNAMIC */
-                       if(dynamic_cast<SharedLibrary *>(real_tgt) && mode!=DYNAMIC)
-                               continue;
-                       else if(tgt)
-                               return tgt;
-               }
-               else if(FS::is_reg(full))
-               {
-                       tgt = new SystemLibrary(*this, full.str());
-                       return tgt;
-               }
-       }
-
-       return 0;
-}
-
 int Builder::do_build()
 {
        Target *cmdline = get_target("cmdline");