Better logging system

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 7d0ed1d97095f034ff074a8d46858ddb9a36db11..ab66c0056651cbfddaa768fed2dbb47577779870 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -5,6 +5,8 @@
 #include "binarypackage.h"
 #include "builder.h"
 #include "misc.h"
+#include "pkgconfigfile.h"
+#include "tool.h"
 #include "sourcepackage.h"
 
 using namespace std;
@@ -128,8 +130,7 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
 
        if(flag && config.update(opts))
        {
-               if(builder.get_verbose()>=2)
-                       IO::print("Configuration of %s changed\n", name);
+               builder.get_logger().log("configure", format("Configuration of %s changed", name));
                if(!builder.get_dry_run())
                        config.save();
        }
@@ -141,7 +142,7 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
                {
                        const StringList &reqs = i->get_requires();
                        for(StringList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
-                               if(Package *pkg = builder.get_package(*j))
+                               if(Package *pkg = builder.get_package_manager().find_package(*j))
                                        requires.push_back(pkg);
                }
 
@@ -226,6 +227,23 @@ void SourcePackage::create_build_info()
        }
 }
 
+void SourcePackage::create_targets()
+{
+       bool pc_needed = false;
+       for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
+       {
+               i->create_targets();
+               if(i->get_type()==Component::LIBRARY || i->get_type()==Component::HEADERS)
+                       pc_needed = true;
+       }
+
+       if(pc_needed)
+       {
+               PkgConfigFile *pc = new PkgConfigFile(builder, *this);
+               builder.get_target("install")->add_depend(builder.get_toolchain().get_tool("CP").create_target(*pc));
+       }
+}
+
 
 SourcePackage::Loader::Loader(Package &p):
        Package::Loader(p)