Code reorganizing and cleanup

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index f66b31096773f35c04c01aac3a343314a066271d..786b48c37f8f1752a8fbe17630d80aeacf5196e1 100644 (file)
--- a/source/builder.h
+++ b/source/builder.h
@@ -4,51 +4,83 @@
 #include <list>
 #include <map>
 #include <string>
-#include <msp/framework/application.h>
+#include <msp/core/application.h>
 #include <msp/parser/loader.h>
 #include <msp/path/path.h>
+#include "config.h"
+#include "misc.h"
+#include "target.h"
 
+class Analyzer;
 class Package;
-class Target;
 
 class Builder: public Msp::Application
 {
 public:
        Builder(int, char **);
        unsigned get_verbose() const { return verbose; }
+       bool     get_dry_run() const { return dry_run; }
+       bool     get_build_all() const { return build_all; }
        Package  *get_package(const std::string &);
        Target   *get_target(const std::string &);
-       Target   *get_header(const std::string &, const std::string &, const std::list<std::string> &);
+       Target   *get_header(const std::string &, const std::string &, const StringList &);
+       Target   *get_library(const std::string &, const StringList &);
+       const Msp::Path::Path &get_cwd() const { return cwd; }
        int      main();
+       ~Builder();
+
+       static void usage(const char *, bool);
 private:
        class Loader: public Msp::Parser::Loader
        {
        public:
                Loader(Builder &, const Msp::Path::Path &);
        private:
-               Builder &bld;
+               Builder         &bld;
                Msp::Path::Path src;
                
                void package(const std::string &);
        };
 
-       typedef std::map<std::string, Package *> PackageMap;
-       typedef std::map<std::string, Target *>  TargetMap;
+       typedef std::list<Package *>               PackageList;
+       typedef std::map<std::string, Package *>   PackageMap;
+       typedef std::map<std::string, Target *>    TargetMap;
+       typedef std::map<std::string, std::string> ToolMap;
        
-       std::list<std::string> cmdline_targets;
-       TargetMap  targets;
-       PackageMap packages;
-       unsigned   verbose;
-       Package    *default_pkg;
+       StringList   cmdline_targets;
+       RawOptionMap cmdline_options;
        Msp::Path::Path cwd;
-       std::list<Package *> new_pkgs;
-       TargetMap  includes;
-       std::list<Target *> new_tgts;
+       
+       PackageMap   packages;
+       PackageList  new_pkgs;
+       Package      *default_pkg;
+
+       TargetMap    targets;
+       TargetList   new_tgts;
+       TargetMap    includes;
+       TargetMap    libraries;
+
+       ToolMap      tools;    /// Not used yet
+       
+       Analyzer        *analyzer;
+       bool            do_build;
+       bool            dry_run;
+       bool            help;
+       unsigned        verbose;
+       bool            chrome;
+       Msp::Path::Path build_file;
+       unsigned        jobs;
+       StringList      what_if;
+       bool            conf_all;
+       bool            build_all;
 
-       int load_build_file(const Msp::Path::Path &);
-       void create_targets();
+       int    load_build_file(const Msp::Path::Path &);
+       int    create_targets();
        Target *check_header(const Msp::Path::Path &);
-       void add_target(Target *);
+       void   add_target(Target *);
+       void   update_hash(std::string &, const std::string &);
+       int    build();
+       void   package_help();
        
        static Msp::Application::RegApp<Builder> reg;
 };