X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.h;h=dfa2f4d295a921072f58460c1a0713ba52134984;hb=bde362811368647047f3ca13bdec596f092ecffe;hp=ed8ad40f7275f9d5ac364a3f7971cf805b31b050;hpb=11b4732f81396aa3d8b0fc8928b8e1981032e743;p=builder.git diff --git a/source/sourcepackage.h b/source/sourcepackage.h index ed8ad40..dfa2f4d 100644 --- a/source/sourcepackage.h +++ b/source/sourcepackage.h @@ -6,6 +6,7 @@ #include "buildinfo.h" #include "cache.h" #include "component.h" +#include "conditionalloader.h" #include "config.h" #include "feature.h" #include "package.h" @@ -22,7 +23,7 @@ A package that can be built by Builder. class SourcePackage: public Package { public: - class Loader: public Msp::DataFile::DerivedObjectLoader + class Loader: public Msp::DataFile::DerivedObjectLoader, public FeatureConditional { private: const Config::InputOptions *options; @@ -32,7 +33,7 @@ public: Loader(SourcePackage &, const Config::InputOptions &); private: void init(const Config::InputOptions *); - virtual void finish(); + void finish() override; void feature(const std::string &, const std::string &); template void component(const std::string &); @@ -40,7 +41,6 @@ public: void component_arg(const std::string &); void build_info(); void generate(const std::string &); - void if_feature(const std::string &); void interface_version(const std::string &); void source_archive(); void tarball(const std::string &); @@ -87,12 +87,12 @@ public: void set_build_type(const BuildType &); const BuildInfo &get_build_info() const { return build_info; } private: - virtual void do_prepare(); + void do_prepare() override; public: Cache &get_cache() const { return cache; } private: - virtual void save_caches(); + void save_caches() override; }; #endif