Better logging system

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index a466089ae75aad13b049d5e5e3660a930f597ec3..ab66c0056651cbfddaa768fed2dbb47577779870 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2007-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <cstdlib>
 #include <msp/io/print.h>
 #include <msp/strings/lexicalcast.h>
@@ -12,6 +5,8 @@ Distributed under the LGPL
 #include "binarypackage.h"
 #include "builder.h"
 #include "misc.h"
+#include "pkgconfigfile.h"
+#include "tool.h"
 #include "sourcepackage.h"
 
 using namespace std;
@@ -76,7 +71,7 @@ LibMode SourcePackage::get_library_mode() const
        else if(mode=="none")
                return DYNAMIC;
        else
-               throw Exception("Unknown library mode");
+               throw runtime_error("unknown library mode");
 }
 
 string SourcePackage::expand_string(const string &str) const
@@ -87,7 +82,7 @@ string SourcePackage::expand_string(const string &str) const
        while((dollar = result.find('$'))!=string::npos)
        {
                if(n>1000)
-                       throw Exception("Too much variable expansions");
+                       throw bad_expansion("nested too deep");
 
                string::size_type end;
                string var;
@@ -95,7 +90,7 @@ string SourcePackage::expand_string(const string &str) const
                {
                        end = result.find('}', dollar+2);
                        if(end==string::npos)
-                               throw Exception("Unterminated variable reference");
+                               throw bad_expansion("unterminated variable reference");
                        var = result.substr(dollar+2, end-dollar-2);
                        ++end;
                }
@@ -135,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();
        }
@@ -148,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);
                }
 
@@ -188,8 +182,6 @@ void SourcePackage::init_config()
 
 void SourcePackage::create_build_info()
 {
-       build_info.add(builder.get_current_arch().get_build_info());
-
        // XXX Currently, a package-specific settings will override cmdline.  This might or might not be desirable.
        const StringList &warnings = builder.get_warnings();
        build_info.warnings.insert(build_info.warnings.begin(), warnings.begin(), warnings.end());
@@ -207,25 +199,25 @@ void SourcePackage::create_build_info()
        string optimize = config.get_option("optimize").value;
        if(!optimize.empty() && optimize!="0")
        {
-               build_info.cflags.push_back("-O"+optimize);
-               build_info.ldflags.push_back("-O"+optimize);
+               if(optimize=="s" || optimize=="size")
+                       build_info.optimize = -1;
+               else
+                       build_info.optimize = lexical_cast<unsigned>(optimize);
        }
 
        if(lexical_cast<bool>(config.get_option("debug").value))
        {
-               build_info.cflags.push_back("-ggdb");
-               build_info.defines.push_back("DEBUG");
+               build_info.debug = true;
+               build_info.defines["DEBUG"] = "1";
        }
 
        for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
                if(lexical_cast<bool>(config.get_option("with_"+i->name).value))
-                       build_info.cflags.push_back("-DWITH_"+toupper(i->name));
+                       build_info.defines["WITH_"+toupper(i->name)] = "1";
 
        for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i)
                if(i->eval())
-                       build_info.add(i->get_build_info());
-
-       build_info.unique();
+                       build_info.update_from(i->get_build_info());
 
        for(list<Component>::iterator i=components.begin(); i!=components.end(); ++i)
        {
@@ -233,8 +225,23 @@ void SourcePackage::create_build_info()
                if(i->get_type()==Component::LIBRARY)
                        export_binfo.libs.push_back(i->get_name());
        }
+}
+
+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;
+       }
 
-       export_binfo.unique();
+       if(pc_needed)
+       {
+               PkgConfigFile *pc = new PkgConfigFile(builder, *this);
+               builder.get_target("install")->add_depend(builder.get_toolchain().get_tool("CP").create_target(*pc));
+       }
 }