Add a field for a human-readable name for packages

[builder.git] / source / package.h

diff --git a/source/package.h b/source/package.h
index 2ee932bb8d7e00bb42361327c19164712d4ca2a7..01a43a0fb8453c0fbd1eedfae560b745717a9d7c 100644 (file)
--- a/source/package.h
+++ b/source/package.h
@@ -1,23 +1,15 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007, 2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef PACKAGE_H_
 #define PACKAGE_H_
 
 #include <list>
 #include <string>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "buildinfo.h"
+#include "config.h"
 
 class Builder;
 class Package;
 
-typedef std::list<Package *> PackageList;
-
 /**
 A package is a distributable piece of software.  Package information may be
 obtained in several ways: Build files of source packages, pkg-config for binary
@@ -26,25 +18,27 @@ packages and the builderrc file for binary packages with no pkg-config support.
 class Package
 {
 public:
-       class Loader: public Msp::DataFile::Loader
+       class Loader: public Msp::DataFile::ObjectLoader<Package>
        {
        public:
                Loader(Package &);
-               Package &get_object() { return pkg; }
-       protected:
-               Package &pkg;
-
+       private:
+               void if_arch(const std::string &);
                void require(const std::string &);
        };
 
+       typedef std::list<Package *> Requirements;
+
 protected:
        Builder &builder;
 
        std::string name;
+       std::string label;
 
-       PackageList requires;
+       Requirements requires;
        BuildInfo export_binfo;
-       bool conf_done;
+       bool prepared;
+       std::list<std::string> problems;
 
        bool use_pkgconfig;
 
@@ -52,25 +46,29 @@ protected:
 public:
        virtual ~Package() { }
 
-       const std::string &get_name() const { return name; }
        Builder &get_builder() const { return builder; }
-       const PackageList &get_requires() const { return requires; }
-
-       /** Returns a list of all directly and indirectly required packages,
-       including the package itself. */
-       PackageList collect_requires();
+       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_binfo() const { return export_binfo; }
+       const BuildInfo &get_exported_build_info() const { return export_binfo; }
 
        /// Indicates whether or not this package supports pkg-config
-       bool get_use_pkgconfig() const { return use_pkgconfig; }
+       bool uses_pkgconfig() const { return use_pkgconfig; }
+
+       /** Prepares the package for building.  Recursively prepares all required
+       packages, populates build info and creates targets. */
+       void prepare();
 
-       /** Processes configuration options that were most likely obtained from the
-       command line. */
-       void configure(const StringMap &, unsigned);
 protected:
-       virtual void do_configure(const StringMap &, unsigned) { }
-       virtual void create_build_info() { }
+       virtual void do_prepare() { }
+
+public:
+       bool is_prepared() const { return prepared; }
+
+       const std::list<std::string> &get_problems() const { return problems; }
+
+       virtual void save_caches() { }
 };
 
 #endif