X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=99b380497b7422809dcb9d686e518a6aec83f543;hb=1d687970cc35e54c3335f4aa2fdef23424fe0a06;hp=0ebf2df1eb0ddada01c1651bc4baeb44045d2b95;hpb=66d1078c04849ec17a7343d0494d6ed087e04318;p=builder.git diff --git a/source/builder.h b/source/builder.h index 0ebf2df..99b3804 100644 --- a/source/builder.h +++ b/source/builder.h @@ -1,10 +1,3 @@ -/* $Id$ - -This file is part of builder -Copyright © 2006-2009 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #ifndef BUILDER_H_ #define BUILDER_H_ @@ -17,18 +10,23 @@ Distributed under the LGPL #include "architecture.h" #include "config.h" #include "misc.h" +#include "packagemanager.h" #include "problem.h" #include "target.h" +#include "toolchain.h" +#include "virtualfilesystem.h" 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 { private: class Loader: public Msp::DataFile::Loader @@ -40,8 +38,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 &); }; @@ -57,28 +55,29 @@ private: void option(const std::string &, const std::string &); }; - typedef std::list PackageList; - typedef std::map PackageMap; +public: + typedef std::map TargetMap; + typedef std::list TargetList; + +private: typedef std::map ProfileTemplateMap; StringList cmdline_targets; StringMap cmdline_options; Msp::FS::Path cwd; - PackageMap packages; + PackageManager package_manager; SourcePackage *main_pkg; - PathList pkg_path; - PathList pkg_dirs; 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; + Toolchain toolchain; + VirtualFileSystem vfs; ProblemList problems; Analyzer *analyzer; @@ -98,7 +97,8 @@ private: Msp::FS::Path prefix; StringList warnings; - static Msp::Application::RegApp reg; + static std::string usagemsg; + static std::string helpmsg; public: Builder(int, char **); @@ -107,12 +107,8 @@ public: int main(); unsigned get_verbose() const { return verbose; } bool get_dry_run() const { return dry_run; } - bool get_build_all() const { return build_all; } - - /** Gets a package by name, possibly creating it. Returns 0 if the package - could not be located. */ - Package *get_package(const std::string &); + PackageManager &get_package_manager() { return package_manager; } SourcePackage *get_main_package() const { return main_pkg; } /** Looks up a target by name. Returns 0 if no such target exists. */ @@ -120,58 +116,35 @@ public: const TargetMap &get_targets() const { return targets; } - /** Tries to locate a header based on location of including file and include - path. Considers known targets as well as existing files. If a matching - target is not found but a file exists, a new SystemHeader target will be - created and returned. */ - Target *get_header(const std::string &, const Msp::FS::Path &, const StringList &); - - /** Tries to locate a library in a library path. The library name should be - the same as would be given to the linker with -l, i.e. without the "lib" - prefix or extension. Considers known targets as well as existing files. If - a matching target is not found but a file exists, a new SystemLibrary target - will be created and returned. */ - 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; + const Toolchain &get_toolchain() const { return toolchain; } + VirtualFileSystem &get_vfs() { return vfs; } + /** Adds a target to both the target map and the new target queue. Called from Target constructor. */ void add_target(Target *); + void register_path(const Msp::FS::Path &, FileTarget *); void problem(const std::string &, const std::string &); static void usage(const char *, const char *, bool); -private: - /** Determines the source directory of a package. Pkg-config is consulted - first, and if it fails, the package path is searched for matches. */ - Msp::FS::Path get_package_location(const std::string &); - /** Loads a build file. Returns 0 on success or -1 if the file could not be opened. */ int load_build_file(const Msp::FS::Path &); +private: /** Creates targets for all packages and prepares them for building. Returns 0 if everything went ok, -1 if something bad happened and a build shouldn't be attempted. */ int create_targets(); - /** - Check if a header exists, either as a target or a file. Returns an existing - target of one was found, or a new SystemHeader target if there was no known - target but the file exists. - */ - Target *get_header(const Msp::FS::Path &); - - Target *get_library(const std::string &, const Msp::FS::Path &, LibMode); - /** Supervises the build process, starting new actions when slots become available. */ int do_build();