Change mspparser -> mspdatafile

[builder.git] / source / package.h

diff --git a/source/package.h b/source/package.h
index 68e0c224c2116126d29ec620e44fe71a4bab5242..68af269a9c6b4d0575e0dedfba9ca9b5c0c2e924 100644 (file)
--- a/source/package.h
+++ b/source/package.h
@@ -1,12 +1,21 @@
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #ifndef PACKAGE_H_
 #define PACKAGE_H_
 
 #include <list>
 #include <string>
-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.h>
 #include "buildinfo.h"
 #include "component.h"
+#include "condition.h"
 #include "config.h"
+#include "feature.h"
 #include "packageref.h"
 
 class Builder;
@@ -17,8 +26,7 @@ typedef std::list<Package *> PackageList;
 /**
 A package is a distributable piece of software.  They consist of one or more
 Components and may depend on other packages.  Packages also have configuration
-to determine where files are installed and which features to include (features
-NYI).
+to determine where files are installed and which features to include.
 */
 class Package
 {
@@ -32,7 +40,7 @@ public:
        };
 
        /// Loads a package from a file.
-       class Loader: public Msp::Parser::Loader
+       class Loader: public Msp::DataFile::Loader
        {
        public:
                Loader(Package &);
@@ -41,11 +49,14 @@ public:
                Package &pkg;
                
                void require(const std::string &);
+               void feature(const std::string &, const std::string &);
+               void condition(const std::string &);
                void program(const std::string &);
                void library(const std::string &);
                void module(const std::string &);
                void headers(const std::string &);
                void build_info();
+               void tar_file(const std::string &);
        };
 
        Package(Builder &, const std::string &, const Msp::Path::Path &);
@@ -69,8 +80,9 @@ public:
        bool                get_use_pkgconfig() const   { return use_pkgconfig; }
        const std::string   &get_arch() const           { return config.get_option("arch").value; }
        LibMode             get_library_mode() const;
+       const PathList      &get_tar_files() const      { return tar_files; }
        void                resolve_refs();
-       void                configure(const RawOptionMap &, unsigned);
+       void                configure(const StringMap &, unsigned);
 
        static Package *create(Builder &, const std::string &);
 private:
@@ -84,11 +96,14 @@ private:
        Msp::Path::Path source;
        PkgRefList    requires;
        PackageList   all_reqs;
+       FeatureList   features;
        BuildInfo     build_info;
        BuildInfo     export_binfo;
+       ConditionList conditions;
        ComponentList components;
        Config        config;
        bool          conf_done;
+       PathList      tar_files;
 
        bool          use_pkgconfig;
        bool          need_path;