Change arch and prefix to global options

[builder.git] / source / sourcepackage.h

diff --git a/source/sourcepackage.h b/source/sourcepackage.h
index f4a8e242adb69bb1f63b2caec1b736d822a8fdb3..3b6ef11d845bb36262f776817fa9a44859c19bf7 100644 (file)
--- a/source/sourcepackage.h
+++ b/source/sourcepackage.h
@@ -16,7 +16,6 @@ Distributed under the LGPL
 #include "dependencycache.h"
 #include "feature.h"
 #include "package.h"
-#include "packageref.h"
 
 class Builder;
 
@@ -51,32 +50,29 @@ public:
                void tar_file(const std::string &);
        };
 
-       SourcePackage(Builder &, const std::string &, const Msp::Path::Path &);
-       void                set_path(const Msp::Path::Path &);
+       SourcePackage(Builder &, const std::string &, const Msp::Path &);
+       void                set_path(const Msp::Path &);
        const std::string   &get_name() const           { return name; }
        const std::string   &get_version() const        { return version; }
        const std::string   &get_description() const    { return description; }
-       const Msp::Path::Path &get_source() const       { return source; }
-       Msp::Path::Path     get_temp_dir() const;
-       Msp::Path::Path     get_out_dir() const;
-       Msp::Path::Path     get_prefix() const          { return config.get_option("prefix").value; }
+       const Msp::Path &get_source() const       { return source; }
+       Msp::Path     get_temp_dir() const;
+       Msp::Path     get_out_dir() const;
        const ComponentList &get_components() const     { return components; }
        const Config        &get_config() const         { return config; }
        const BuildInfo     &get_build_info() const     { return build_info; }
        const BuildInfo     &get_exported_binfo() const { return export_binfo; }
        Builder             &get_builder() const        { return builder; }
        unsigned            get_install_flags();
-       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; }
        DependencyCache     &get_deps_cache() const     { return deps_cache; }
-       virtual void        resolve_refs();
 private:
        std::string   version;
        std::string   description;
 
-       Msp::Path::Path source;
-       PackageList   all_reqs;
+       Msp::Path source;
+       PackageList   base_reqs;
        FeatureList   features;
        BuildInfo     build_info;
        ConditionList conditions;