Have Architecture provide pattern lists for library and executable filenames

[builder.git] / source / objectfile.cpp

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index d29cd11df850759833705e0103264c50d09de512..f24d028d62e56ce25078f8d35e85eb75c9335ca9 100644 (file)
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -1,28 +1,89 @@
-#include <msp/path/utils.h>
+#include <algorithm>
+#include <msp/fs/utils.h>
 #include "builder.h"
-#include "compile.h"
 #include "component.h"
 #include "objectfile.h"
-#include "package.h"
 #include "sourcefile.h"
+#include "sourcepackage.h"
 
 using namespace std;
 using namespace Msp;
 
-ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &src):
-       Target(b, &c.get_package(), generate_target_name(c, src.get_name())),
-       comp(c)
+ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
+       FileTarget(b, &c.get_package(), generate_target_path(c, FS::relative(s.get_path(), c.get_package().get_source()).str())),
+       comp(c),
+       source(s)       
 {
-       buildable=true;
-       add_depend(&src);
+       add_depend(&source);
 }
 
-Action *ObjectFile::build()
+void ObjectFile::find_depends()
 {
-       return Target::build(new Compile(builder, depends.front()->get_name(), name, comp));
+       for(Dependencies::iterator i=new_deps.begin(); i!=new_deps.end();)
+       {
+               Target *tgt = *i;
+               if(tgt->get_depends_ready())
+               {
+                       i = new_deps.erase(i);
+                       find_depends(dynamic_cast<FileTarget *>(tgt));
+               }
+               else
+                       ++i;
+       }
+
+       deps_ready = new_deps.empty();
+}
+
+
+void ObjectFile::find_depends(FileTarget *tgt)
+{
+       FileTarget *rtgt = dynamic_cast<FileTarget *>(tgt->get_real_target());
+       const Dependencies &tdeps = rtgt->get_depends();
+       Dependencies deps_to_add;
+       if(rtgt==tgt)
+       {
+               /* We are using the target from its original location, so dependencies
+               apply directly */
+               deps_to_add = tdeps;
+       }
+       else
+       {
+               /* The target has been displaced by installing it.  Displace any
+               dependencies that come from the same package as well. */
+               const SourcePackage *tpkg = dynamic_cast<const SourcePackage *>(rtgt->get_package());
+               for(Dependencies::const_iterator i=tdeps.begin(); i!=tdeps.end(); ++i)
+               {
+                       FileTarget *file = dynamic_cast<FileTarget *>(*i);
+                       if(file && file->get_package()==tpkg && FS::descendant_depth(file->get_path(), tpkg->get_source())>=0)
+                       {
+                               FS::Path displaced = tgt->get_path()/FS::relative(file->get_path(), rtgt->get_path());
+                               if(Target *ddep = builder.get_vfs().get_target(displaced))
+                                       deps_to_add.push_back(ddep);
+                       }
+                       else
+                               deps_to_add.push_back(*i);
+               }
+       }
+
+       for(Dependencies::const_iterator i=deps_to_add.begin(); i!=deps_to_add.end(); ++i)
+               if(find(depends.begin(), depends.end(), *i)==depends.end())
+                       add_depend(*i);
+}
+
+void ObjectFile::add_depend(Target *tgt)
+{
+       Target::add_depend(tgt);
+       new_deps.push_back(tgt);
 }
 
-string ObjectFile::generate_target_name(const Component &comp, const string &src)
+FS::Path ObjectFile::generate_target_path(const Component &comp, const string &src)
 {
-       return (comp.get_package().get_source()/"temp"/comp.get_name()/(Path::splitext(src.substr(src.rfind('/')+1)).base+".o")).str();
+       const SourcePackage &pkg = comp.get_package();
+       string fn = FS::basepart(src)+".o";
+       if(!fn.compare(0, 2, "./"))
+               fn.erase(0, 2);
+       for(string::iterator i=fn.begin(); i!=fn.end(); ++i)
+               if(*i=='/')
+                       *i = '_';
+       return pkg.get_temp_dir()/comp.get_name()/fn;
 }