Drop support for generic tarball components

[builder.git] / source / sourcepackage.h

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index f0a58b74dc9619ed1a6fe5abfb865e61ab34d9b9..ed8ad40f7275f9d5ac364a3f7971cf805b31b050 100644 (file)
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -6,21 +6,15 @@
 #include "buildinfo.h"
 #include "cache.h"
 #include "component.h"
-#include "condition.h"
 #include "config.h"
 #include "feature.h"
 #include "package.h"
+#include "toolchain.h"
 
 class Builder;
 class BuildType;
 class FileTarget;
-
-class bad_expansion: public std::runtime_error
-{
-public:
-       bad_expansion(const std::string &w): std::runtime_error(w) { }
-       virtual ~bad_expansion() throw() { }
-};
+class SourceArchiveComponent;
 
 /**
 A package that can be built by Builder.
@@ -32,7 +26,6 @@ public:
        {
        private:
                const Config::InputOptions *options;
-               std::map<std::string, std::string> install_map;
 
        public:
                Loader(SourcePackage &);
@@ -41,20 +34,20 @@ public:
                void init(const Config::InputOptions *);
                virtual void finish();
                void feature(const std::string &, const std::string &);
-               template<Component::Type>
+               template<typename C>
                void component(const std::string &);
-               void condition(const std::string &);
+               template<typename C, typename A, A>
+               void component_arg(const std::string &);
                void build_info();
-               void headers(const std::string &);
+               void generate(const std::string &);
                void if_feature(const std::string &);
                void interface_version(const std::string &);
-               void source_tarball();
+               void source_archive();
                void tarball(const std::string &);
-               void tar_file(const std::string &);
                void version(const std::string &);
        };
 
-       typedef std::list<Component> ComponentList;
+       typedef std::list<Component *> ComponentList;
 
 private:
        typedef std::list<Feature> FeatureList;
@@ -66,33 +59,39 @@ private:
        FileTarget *build_file;
        Msp::FS::Path source_dir;
        const BuildType *build_type;
+       Toolchain local_tools;
        FeatureList features;
        BuildInfo build_info;
        ComponentList components;
-       Component *source_tarball;
+       SourceArchiveComponent *source_archive;
        Config config;
        mutable Cache cache;
 
 public:
        SourcePackage(Builder &, const std::string &, const Msp::FS::Path &);
+       ~SourcePackage();
 
        const std::string &get_version() const { return version; }
        const std::string &get_interface_version() const { return interface_version; }
        const std::string &get_description() const { return description; }
+
        FileTarget &get_build_file() const { return *build_file; }
        const Msp::FS::Path &get_source_directory() const { return source_dir; }
-       Msp::FS::Path get_temp_dir() const;
-       Msp::FS::Path get_out_dir() const;
-       const ComponentList &get_components() const { return components; }
+       Msp::FS::Path get_temp_directory() const;
+       Msp::FS::Path get_output_directory() const;
+
+       const Toolchain &get_toolchain() const { return local_tools; }
+       const Component &get_component(const std::string &) const;
        const Config &get_config() const { return config; }
+       bool match_feature(const std::string &, const std::string *) const;
        void set_build_type(const BuildType &);
        const BuildInfo &get_build_info() const { return build_info; }
-       Builder &get_builder() const { return builder; }
-
-       Cache &get_cache() const { return cache; }
 private:
        virtual void do_prepare();
 
+public:
+       Cache &get_cache() const { return cache; }
+private:
        virtual void save_caches();
 };