#include "binary.h"
#include "builder.h"
#include "component.h"
-#include "link.h"
#include "objectfile.h"
#include "sharedlibrary.h"
#include "sourcepackage.h"
using namespace std;
using namespace Msp;
-Binary::Binary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
- FileTarget(b, &c.get_package(), generate_target_path(c))
+Binary::Binary(Builder &b, const FS::Path &p):
+ FileTarget(b, 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)
{
component = &c;
for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
- add_depend(*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;
+ BuildInfo::LibraryMode libmode = component->get_build_info().libmode;
list<const Component *> queue;
list<Target *> dep_libs;
const Component *c = queue.front();
queue.erase(queue.begin());
- const StringList &libpath = c->get_build_info().libpath;
-
- const list<string> &libs = c->get_build_info().libs;
- for(StringList::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);
+ 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))
- queue.push_back(stlib->get_component());
+ if(stlib->get_component())
+ queue.push_back(stlib->get_component());
}
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));
}
}
for(list<Target *>::iterator j=i; (last && j!=dep_libs.end()); ++j)
last = (j==i || *j!=*i);
if(last)
- add_depend(*i);
- }
-
- deps_ready = true;
-}
-
-FS::Path Binary::generate_target_path(const Component &c)
-{
- const SourcePackage &pkg = c.get_package();
- string prefix, suffix;
- const string &sys = pkg.get_builder().get_current_arch().get_system();
-
- if(c.get_type()==Component::LIBRARY)
- {
- prefix = "lib";
- if(sys=="windows")
- suffix = ".dll";
- else
- suffix = ".so";
+ add_dependency(**i);
}
- else if(c.get_type()==Component::MODULE)
- suffix = ".m";
- else if(c.get_type()==Component::PROGRAM)
- {
- if(sys=="windows")
- suffix = ".exe";
- }
-
- return pkg.get_out_dir()/(prefix+c.get_name()+suffix);
}