Allow specifying fixed arguments for source generators

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index aa9160e11b8e62ab03c16a0e961dc579bbe0894f..64cec87f15e48803e349ab2b5a242470d7cc4f56 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -10,6 +10,7 @@ using namespace Msp;
 Package::Package(Builder &b, const string &n):
        builder(b),
        name(n),
+       label(string(1, toupper(n[0]))+n.substr(1)),
        prepared(false),
        use_pkgconfig(true)
 {
@@ -30,20 +31,13 @@ void Package::prepare()
 
 
 Package::Loader::Loader(Package &p):
-       DataFile::ObjectLoader<Package>(p)
+       DataFile::ObjectLoader<Package>(p),
+       ArchitectureConditional(p.builder, p.name)
 {
-       add("if_arch", &Loader::if_arch);
+       add("label",   &Package::label);
        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);