Adjust to library changes

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index 0ebf2df1eb0ddada01c1651bc4baeb44045d2b95..a4fc14b5d8b8343c99ca7fbacb0db7faafe7a73b 100644 (file)
--- a/source/builder.h
+++ b/source/builder.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2010  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -22,13 +22,15 @@ Distributed under the LGPL
 
 class Analyzer;
 class Config;
+class FileTarget;
 class Package;
 class SourcePackage;
+class VirtualTarget;
 
 /**
 The main application class.  Controls and owns everything.  Rules the world.
 */
-class Builder: public Msp::Application
+class Builder: public Msp::RegisteredApplication<Builder>
 {
 private:
        class Loader: public Msp::DataFile::Loader
@@ -40,8 +42,8 @@ private:
        public:
                Loader(Builder &, const Msp::FS::Path &);
        private:
-               void architecture(const std::string &);
                void binpkg(const std::string &);
+               void cross_prefix(const std::string &, const std::string &);
                void profile(const std::string &);
                void package(const std::string &);
        };
@@ -69,15 +71,16 @@ private:
        SourcePackage *main_pkg;
        PathList pkg_path;
        PathList pkg_dirs;
+       bool no_externals;
 
        TargetMap targets;
        TargetList new_tgts;
        TargetMap includes;
        TargetMap libraries;
 
-       ArchMap archs;
-       Architecture *native_arch;
-       const Architecture *current_arch;
+       Architecture native_arch;
+       Architecture *current_arch;
+       StringMap cross_prefixes;
        ProfileTemplateMap profile_tmpl;
 
        ProblemList problems;
@@ -98,7 +101,8 @@ private:
        Msp::FS::Path prefix;
        StringList warnings;
 
-       static Msp::Application::RegApp<Builder> reg;
+       static std::string usagemsg;
+       static std::string helpmsg;
 
 public:
        Builder(int, char **);
@@ -115,6 +119,8 @@ public:
 
        SourcePackage *get_main_package() const { return main_pkg; }
 
+       std::string run_pkgconfig(const std::string &, const std::string &);
+
        /** Looks up a target by name.  Returns 0 if no such target exists. */
        Target *get_target(const std::string &) const;
 
@@ -134,16 +140,16 @@ public:
        Target *get_library(const std::string &, const StringList &, LibMode);
 
        const Msp::FS::Path &get_cwd() const { return cwd; }
-       const Architecture &get_architecture(const std::string &) const;
        const Architecture &get_current_arch() const { return *current_arch; }
-       const Architecture &get_native_arch() const { return *native_arch; }
+       const Architecture &get_native_arch() const { return native_arch; }
        const Msp::FS::Path &get_prefix() const { return prefix; }
        const StringList &get_warnings() const { return warnings; }
        void apply_profile_template(Config &, const std::string &) const;
 
        /** Adds a target to both the target map and the new target queue.  Called
        from Target constructor. */
-       void add_target(Target *);
+       void add_target(FileTarget *);
+       void add_target(VirtualTarget *);
 
        void problem(const std::string &, const std::string &);