Migrate from msppath to mspfs

[builder.git] / source / component.h

diff --git a/source/component.h b/source/component.h
index 36cd83e8a800795569c5d3a05d26c330677d37ec..6fb231d1d247899103172aaab1720c06377cdbd8 100644 (file)
--- a/source/component.h
+++ b/source/component.h
@@ -10,12 +10,12 @@ Distributed under the LGPL
 
 #include <string>
 #include <msp/datafile/loader.h>
-#include <msp/path/path.h>
+#include <msp/fs/path.h>
 #include "buildinfo.h"
 #include "misc.h"
-#include "packageref.h"
+#include "package.h"
 
-class Package;
+class SourcePackage;
 
 /**
 Components specify things to be built.  Each component may build one binary (it
@@ -50,8 +50,8 @@ public:
                HEADERS
        };
 
-       Component(Package &, Type, const std::string &);
-       const Package     &get_package() const         { return pkg; }
+       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; }
        const PathList    &get_sources() const         { return sources; }
@@ -59,13 +59,12 @@ public:
        bool              get_install() const          { return install; }
        const std::string &get_install_headers() const { return install_headers; }
        bool              get_modular() const          { return modular; }
-       const PkgRefList  &get_requires() const        { return requires; }
+       const PackageList &get_requires() const        { return requires; }
        bool              get_default() const          { return deflt; }
-       void              resolve_refs();
        void              create_build_info();
        void              create_targets() const;
 protected:
-       Package     &pkg;
+       SourcePackage &pkg;
        Type        type;
        std::string name;
        PathList    sources;
@@ -74,7 +73,7 @@ protected:
        const Component *module_host;
        bool        modular;
        BuildInfo   build_info;
-       PkgRefList  requires;
+       PackageList requires;
        bool        deflt;
 
        PathList    collect_source_files() const;