Change arch and prefix to global options

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index 270f8162d7af543acf1b6b694d0ba968f034963b..d19511c87e8932a736f3fc0105ff513c4916f429 100644 (file)
--- a/source/builder.h
+++ b/source/builder.h
@@ -39,10 +39,12 @@ public:
        SourcePackage *get_main_package() const { return main_pkg; }
        Target   *get_target(const std::string &) const;
        const TargetMap &get_targets() const { return targets; }
-       Target   *get_header(const std::string &, const std::string &, const std::string &, const StringList &);
-       Target   *get_library(const std::string &, const std::string &, const StringList &, LibMode);
-       const Msp::Path::Path &get_cwd() const { return cwd; }
+       Target   *get_header(const std::string &, const std::string &, const StringList &);
+       Target   *get_library(const std::string &, const StringList &, LibMode);
+       const Msp::Path &get_cwd() const { return cwd; }
        const Architecture &get_architecture(const std::string &) const;
+       const Architecture &get_current_arch() const;
+       const std::string &get_prefix() const { return prefix; }
        void     apply_profile_template(Config &, const std::string &) const;
        void     add_target(Target *);
        void     problem(const std::string &, const std::string &);
@@ -54,10 +56,10 @@ private:
        class Loader: public Msp::DataFile::Loader
        {
        public:
-               Loader(Builder &, const Msp::Path::Path &);
+               Loader(Builder &, const Msp::Path &);
        private:
                Builder         &bld;
-               Msp::Path::Path src;
+               Msp::Path src;
 
                void architecture(const std::string &);
                void binpkg(const std::string &);
@@ -81,7 +83,7 @@ private:
 
        StringList   cmdline_targets;
        StringMap    cmdline_options;
-       Msp::Path::Path cwd;
+       Msp::Path    cwd;
 
        PackageMap   packages;
        SourcePackage *main_pkg;
@@ -101,7 +103,7 @@ private:
        bool            dry_run;
        bool            help;
        unsigned        verbose;
-       bool            chrome;
+       bool            show_progress;
        std::string     build_file;
        unsigned        jobs;
        StringList      what_if;
@@ -109,11 +111,13 @@ private:
        bool            conf_only;
        bool            build_all;
        bool            create_makefile;
+       std::string     current_arch;
+       std::string     prefix;
 
-       int    load_build_file(const Msp::Path::Path &);
+       int    load_build_file(const Msp::Path &);
        int    create_targets();
-       Target *get_header(const Msp::Path::Path &);
-       Target *get_library(const std::string &, const std::string &, const Msp::Path::Path &, LibMode);
+       Target *get_header(const Msp::Path &);
+       Target *get_library(const std::string &, const Msp::Path &, LibMode);
        void   update_hash(std::string &, const std::string &);
        int    do_build();
        int    do_clean();