From: Mikko Rasa Date: Mon, 16 Jul 2012 19:24:58 +0000 (+0300) Subject: Miscellaneous style and comment tweaks X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=90bc57276bd8d82f4d95558ab7afc702edd4bdd2;p=builder.git Miscellaneous style and comment tweaks --- diff --git a/source/builder.h b/source/builder.h index 9f792f8..55af18a 100644 --- a/source/builder.h +++ b/source/builder.h @@ -133,7 +133,7 @@ private: attempted. */ bool prepare_build(); - /** Supervises the build process, starting new actions when slots become + /** Supervises the build process, starting new tasks when slots become available. */ int do_build(); diff --git a/source/component.h b/source/component.h index 561a250..292f140 100644 --- a/source/component.h +++ b/source/component.h @@ -54,6 +54,7 @@ protected: public: Component(SourcePackage &, Type, const std::string &); + const SourcePackage &get_package() const { return pkg; } Type get_type() const { return type; } const std::string &get_name() const { return name; } diff --git a/source/config.cpp b/source/config.cpp index 8cabb56..e4449cc 100644 --- a/source/config.cpp +++ b/source/config.cpp @@ -69,7 +69,6 @@ bool Config::set_option(const string &opt, const string &val) void Config::load() { FS::Path fn = package.get_source()/".config"; - FS::Stat stat = FS::stat(fn); if(stat) { diff --git a/source/packagemanager.h b/source/packagemanager.h index 96c3dca..3484687 100644 --- a/source/packagemanager.h +++ b/source/packagemanager.h @@ -31,6 +31,7 @@ public: PackageManager(Builder &); ~PackageManager(); + /** Prevent creation of source packages. */ void set_no_externals(bool); /** Adds a package to the manager. Called from Package constructor. */ diff --git a/source/sourcepackage.h b/source/sourcepackage.h index d55d373..5b4ffd0 100644 --- a/source/sourcepackage.h +++ b/source/sourcepackage.h @@ -65,6 +65,7 @@ private: public: SourcePackage(Builder &, const std::string &, const Msp::FS::Path &); + const std::string &get_version() const { return version; } const std::string &get_description() const { return description; } const Msp::FS::Path &get_source() const { return source; } @@ -78,8 +79,6 @@ public: DependencyCache &get_deps_cache() const { return deps_cache; } private: - /** Fills in build info based on configuration. All required packages must be - configured when this is called. */ virtual void create_build_info(); virtual void create_targets(); diff --git a/source/virtualtarget.h b/source/virtualtarget.h index a7fd8f6..bd39e5f 100644 --- a/source/virtualtarget.h +++ b/source/virtualtarget.h @@ -10,6 +10,7 @@ class VirtualTarget: public Target { public: VirtualTarget(Builder &, const std::string &); + virtual const char *get_type() const { return "VirtualTarget"; } private: virtual void check_rebuild();