Rearrange generated source paths

[builder.git] / source / lib / component.h

diff --git a/source/lib/component.h b/source/lib/component.h
index 7d9aa1af704e195efed112cbfbd08e3163f9e285..2901f1b1fc53f3ba2c0e6deddbcca98f8143637b 100644 (file)
--- a/source/lib/component.h
+++ b/source/lib/component.h
@@ -37,10 +37,11 @@ protected:
        SourcePackage &package;
        std::string name;
        std::vector<Msp::FS::Path> sources;
+       Msp::FS::Path source_base_path;
        std::vector<std::string> overlays;
        bool install = false;
        BuildInfo build_info;
-       Package::Requirements requires;
+       Package::Requirements required_pkgs;
        bool deflt = true;
        InstallMap install_map;
        bool broken = false;
@@ -66,7 +67,7 @@ protected:
 public:
        bool get_install() const { return install; }
        const InstallMap &get_install_map() const { return install_map; }
-       const Package::Requirements &get_required_packages() const { return requires; }
+       const Package::Requirements &get_required_packages() const { return required_pkgs; }
        bool is_default() const { return deflt; }
        bool is_broken() const { return broken; }
        const std::vector<std::string> &get_problems() const { return problems; }
@@ -74,6 +75,9 @@ public:
        /** Prepares any required packages. */
        void prepare();
 
+       Msp::FS::Path get_temp_directory() const;
+       std::string flatten_source_path(const Msp::FS::Path &) const;
+
        /** Prepares the build information for building.  Pulls build info from the
        parent and dependency packages, and adds any component-specific flags. */
        virtual void create_build_info();