Better encapsulation of config inside Package

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index 1016498f08b736e3517e45f269079e78b76cc13f..98e541da348ba5264ef5cac7d861ed7bf0d4def7 100644 (file)
--- a/source/builder.h
+++ b/source/builder.h
@@ -27,12 +27,13 @@ public:
        Package  *get_package(const std::string &);
        Target   *get_target(const std::string &);
        Target   *get_header(const std::string &, const std::string &, const StringList &);
-       Target   *get_library(const std::string &, const StringList &);
+       Target   *get_library(const std::string &, const StringList &, LibMode);
        const Msp::Path::Path &get_cwd() const { return cwd; }
+       const std::string &get_arch_prefix(const std::string &) const;
        int      main();
        ~Builder();
 
-       static void usage(const char *, bool);
+       static void usage(const char *, const char *, bool);
 private:
        class Loader: public Msp::Parser::Loader
        {
@@ -64,6 +65,7 @@ private:
        TargetMap    libraries;
 
        ToolMap      tools;    /// Not used yet
+       StringMap    archs;    /// arch -> prefix
        
        Analyzer        *analyzer;
        bool            do_build;
@@ -71,15 +73,17 @@ private:
        bool            help;
        unsigned        verbose;
        bool            chrome;
-       Msp::Path::Path build_file;
+       std::string     build_file;
        unsigned        jobs;
        StringList      what_if;
        bool            conf_all;
+       bool            conf_only;
        bool            build_all;
 
        int    load_build_file(const Msp::Path::Path &);
        int    create_targets();
-       Target *check_header(const Msp::Path::Path &);
+       Target *get_header(const Msp::Path::Path &);
+       Target *get_library(const std::string &, const Msp::Path::Path &, LibMode);
        void   add_target(Target *);
        void   update_hash(std::string &, const std::string &);
        int    build();