Move conditionals into helper classes

[builder.git] / source / package.h

diff --git a/source/package.h b/source/package.h
index eb61f06b760e1fc21a4c62a3a34fda194837573e..34049d0ce9129ec4de87a3f35a367e22c7d72cee 100644 (file)
--- a/source/package.h
+++ b/source/package.h
@@ -5,6 +5,7 @@
 #include <string>
 #include <msp/datafile/objectloader.h>
 #include "buildinfo.h"
+#include "conditionalloader.h"
 #include "config.h"
 
 class Builder;
@@ -18,12 +19,11 @@ packages and the builderrc file for binary packages with no pkg-config support.
 class Package
 {
 public:
-       class Loader: public Msp::DataFile::ObjectLoader<Package>
+       class Loader: public Msp::DataFile::ObjectLoader<Package>, public ArchitectureConditional
        {
        public:
                Loader(Package &);
        private:
-               void if_arch(const std::string &);
                void require(const std::string &);
        };
 
@@ -33,6 +33,7 @@ protected:
        Builder &builder;
 
        std::string name;
+       std::string label;
 
        Requirements requires;
        BuildInfo export_binfo;
@@ -47,6 +48,7 @@ public:
 
        Builder &get_builder() const { return builder; }
        const std::string &get_name() const { return name; }
+       const std::string &get_label() const { return label; }
        const Requirements &get_required_packages() const { return requires; }
 
        const BuildInfo &get_exported_build_info() const { return export_binfo; }