Un-abbreviate function names

[builder.git] / source / binary.cpp

diff --git a/source/binary.cpp b/source/binary.cpp
index aa26608d695e46620ecfc57ae8a8383c83c70134..9f0bfcd2e5aa273fd11fc878ec1bfe4c8d9a22a3 100644 (file)
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -1,5 +1,6 @@
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
+#include <msp/strings/utils.h>
 #include "binary.h"
 #include "builder.h"
 #include "component.h"
@@ -7,6 +8,7 @@
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
 #include "staticlibrary.h"
+#include "tool.h"
 
 using namespace std;
 using namespace Msp;
@@ -16,23 +18,19 @@ Binary::Binary(Builder &b, const FS::Path &p):
 { }
 
 Binary::Binary(Builder &b, const Component &c, const string &p, const list<ObjectFile *> &objs):
-       FileTarget(b, c.get_package(), c.get_package().get_out_dir()/p)
+       FileTarget(b, c.get_package(), c.get_package().get_output_directory()/p),
+       objects(objs)
 {
        component = &c;
-       for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
-               add_depend(**i);
+       for(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+               add_dependency(**i);
 }
 
-void Binary::find_depends()
+void Binary::find_dependencies()
 {
        if(!component)
                return;
 
-       const SourcePackage &spkg = component->get_package();
-       LibMode libmode = spkg.get_library_mode();
-       if(dynamic_cast<SharedLibrary *>(this))
-               libmode = DYNAMIC;
-
        list<const Component *> queue;
        list<Target *> dep_libs;
        queue.push_back(component);
@@ -41,23 +39,25 @@ void Binary::find_depends()
                const Component *c = queue.front();
                queue.erase(queue.begin());
 
-               const BuildInfo::PathList &libpath = c->get_build_info().libpath;
-
-               const BuildInfo::WordList &libs = c->get_build_info().libs;
-               for(BuildInfo::WordList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
+               const BuildInfo &binfo = c->get_build_info();
+               for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
                {
-                       Target *lib = builder.get_vfs().find_library(*i, libpath, libmode);
+                       BuildInfo::LibraryMode libmode = component->get_build_info().get_libmode_for(*i);
+                       Target *lib = builder.get_vfs().find_library(*i, binfo.libpath, libmode);
                        if(lib)
                        {
-                               dep_libs.push_back(lib);
-
-                               lib = lib->get_real_target();
-                               if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(lib))
+                               Target *real = lib->get_real_target();
+                               if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(real))
+                               {
+                                       dep_libs.push_back(stlib);
                                        if(stlib->get_component())
                                                queue.push_back(stlib->get_component());
+                               }
+                               else
+                                       dep_libs.push_back(lib);
                        }
                        else
-                               builder.problem(spkg.get_name(), format("Couldn't find library %s for %s", *i, name));
+                               builder.problem(package->get_name(), format("Couldn't find library %s for %s", *i, name));
                }
        }
 
@@ -69,6 +69,21 @@ void Binary::find_depends()
                for(list<Target *>::iterator j=i; (last && j!=dep_libs.end()); ++j)
                        last = (j==i || *j!=*i);
                if(last)
-                       add_depend(**i);
+                       add_dependency(**i);
        }
 }
+
+string Binary::create_build_signature() const
+{
+       set<const Tool *> object_tools;
+       for(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+               object_tools.insert((*i)->get_tool());
+
+       list<string> sigs;
+       sigs.push_back(tool->create_build_signature(component->get_build_info()));
+       for(set<const Tool *>::const_iterator i=object_tools.begin(); i!=object_tools.end(); ++i)
+               sigs.push_back((*i)->create_build_signature(component->get_build_info()));
+       sigs.sort();
+
+       return join(sigs.begin(), sigs.end(), ";");
+}