Don't print the configuration header in help for empty configuration

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index 7ec986e1c2c2d4395d76c8e20d78a2d91235538d..aa9160e11b8e62ab03c16a0e961dc579bbe0894f 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -2,7 +2,6 @@
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
 #include "builder.h"
-#include "misc.h"
 #include "package.h"
 
 using namespace std;
@@ -22,11 +21,10 @@ void Package::prepare()
        if(prepared)
                return;
 
-       for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+       for(Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
                (*i)->prepare();
 
-       create_build_info();
-       create_targets();
+       do_prepare();
        prepared = true;
 }
 
@@ -34,12 +32,23 @@ void Package::prepare()
 Package::Loader::Loader(Package &p):
        DataFile::ObjectLoader<Package>(p)
 {
+       add("if_arch", &Loader::if_arch);
        add("require", &Loader::require);
 }
 
+void Package::Loader::if_arch(const string &cond)
+{
+       bool match = obj.builder.get_current_arch().match_name(cond);
+       obj.builder.get_logger().log("configure", format("%s: arch %s %smatched", obj.name, cond, (match ? "" : "not ")));
+       if(match)
+               load_sub_with(*this);
+}
+
 void Package::Loader::require(const string &n)
 {
        Package *req = obj.builder.get_package_manager().find_package(n);
        if(req)
                obj.requires.push_back(req);
+       else
+               obj.problems.push_back(format("Required package %s not found", n));
 }