More flexible way to manage filename patterns

[builder.git] / source / staticlibrary.cpp

diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp
index f6c8e56e49fc409382e0b7c399340eb6fa60ad1e..92a3af044cfc1b55de875b3414a25b9226125684 100644 (file)
--- a/source/staticlibrary.cpp
+++ b/source/staticlibrary.cpp
@@ -8,22 +8,39 @@ using namespace std;
 using namespace Msp;
 
 StaticLibrary::StaticLibrary(Builder &b, const FS::Path &p):
-       FileTarget(b, 0, p)
+       FileTarget(b, p)
 { }
 
 StaticLibrary::StaticLibrary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
-       FileTarget(b, &c.get_package(), generate_target_path(c))
+       FileTarget(b, c.get_package(), c.get_package().get_output_directory()/generate_filename(c))
 {
        component = &c;
        for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
-               add_depend(*i);
+               add_dependency(**i);
 
        install_location = "lib";
+       nested_build_sig = true;
+       arch_in_build_sig = true;
 }
 
-Msp::FS::Path StaticLibrary::generate_target_path(const Component &c)
+string StaticLibrary::generate_filename(const Component &comp)
 {
-       const Architecture &arch = c.get_package().get_builder().get_current_arch();
-       return c.get_package().get_out_dir()/
-               arch.get_static_library_patterns().front().apply(c.get_name());
+       const Architecture &arch = comp.get_package().get_builder().get_current_arch();
+       return arch.create_filename<StaticLibrary>(comp.get_name());
+}
+
+void StaticLibrary::add_required_library(const string &lib)
+{
+       build_info.libs.push_back(lib);
+}
+
+void StaticLibrary::add_library_path(const FS::Path &pth)
+{
+       build_info.libpath.push_back(pth);
+}
+
+void StaticLibrary::collect_build_info(BuildInfo &binfo) const
+{
+       Target::collect_build_info(binfo);
+       binfo.update_from(build_info);
 }