X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.h;h=40df4ff3861d85693a669af7a95c4aab482dc280;hb=09366b5da31707942f66e386cd0c07e5ece17b7f;hp=81f5f13678be09d432d46ae53d2bb785357285ac;hpb=5622fc20f0be8bff0938d24f6f45d3ab384288ca;p=builder.git diff --git a/source/builder.h b/source/builder.h index 81f5f13..40df4ff 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_ @@ -15,70 +8,59 @@ Distributed under the LGPL #include #include #include "architecture.h" +#include "buildgraph.h" +#include "buildtype.h" #include "config.h" -#include "misc.h" +#include "logger.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; /** -The main application class. Controls and owns everything. Rules the world. +The main application class. Handles command line options and supervises the +build process. */ -class Builder: public Msp::Application +class Builder: public Msp::RegisteredApplication { private: - class Loader: public Msp::DataFile::Loader + class Loader: public Msp::DataFile::ObjectLoader { - private: - Builder &bld; - Msp::FS::Path src; - public: - Loader(Builder &, const Msp::FS::Path &); + Loader(Builder &); private: void architecture(const std::string &); void binpkg(const std::string &); + void build_type(const std::string &); void profile(const std::string &); void package(const std::string &); }; - class ProfileLoader: public Msp::DataFile::Loader - { - private: - StringMap &profile; - - public: - ProfileLoader(StringMap &); - private: - void option(const std::string &, const std::string &); - }; - - typedef std::list PackageList; - typedef std::map PackageMap; - typedef std::map ProfileTemplateMap; +private: + typedef std::list NameList; + typedef std::map BuildTypeMap; + typedef std::list ProblemList; - StringList cmdline_targets; - StringMap cmdline_options; + NameList cmdline_targets; + Config::InputOptions cmdline_options; Msp::FS::Path cwd; - PackageMap packages; - SourcePackage *main_pkg; - PathList pkg_path; - PathList pkg_dirs; + PackageManager package_manager; - TargetMap targets; - TargetList new_tgts; - TargetMap includes; - TargetMap libraries; - - ArchMap archs; - Architecture *native_arch; - const Architecture *current_arch; - ProfileTemplateMap profile_tmpl; + Architecture native_arch; + Architecture *current_arch; + BuildTypeMap build_types; + BuildType *build_type; + Toolchain toolchain; + VirtualFileSystem vfs; + BuildGraph build_graph; + Logger logger; ProblemList problems; Analyzer *analyzer; @@ -86,19 +68,17 @@ private: unsigned clean; bool dry_run; bool help; - unsigned verbose; bool show_progress; std::string build_file; unsigned jobs; - StringList what_if; + NameList what_if; bool conf_all; bool conf_only; bool build_all; bool create_makefile; Msp::FS::Path prefix; - StringList warnings; + Msp::FS::Path tempdir; - static Msp::Application::RegApp reg; static std::string usagemsg; static std::string helpmsg; @@ -107,74 +87,35 @@ public: ~Builder(); 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 &); - - SourcePackage *get_main_package() const { return main_pkg; } - - /** Looks up a target by name. Returns 0 if no such target exists. */ - Target *get_target(const std::string &) const; - - 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); + PackageManager &get_package_manager() { return package_manager; } - const Msp::FS::Path &get_cwd() const { return cwd; } - const Architecture &get_architecture(const std::string &) const; + const Msp::FS::Path &get_work_directory() const { return cwd; } 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; } + BuildGraph &get_build_graph() { return build_graph; } 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 Msp::FS::Path &get_temp_directory() const { return tempdir; } - /** Adds a target to both the target map and the new target queue. Called - from Target constructor. */ - void add_target(Target *); + const Toolchain &get_toolchain() const { return toolchain; } + VirtualFileSystem &get_vfs() { return vfs; } + const Logger &get_logger() const { return logger; } 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 &); - - /** 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(); + void load_build_file(const Msp::FS::Path &); - /** - 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); +private: + /** Prepares packages and targets for building. Returns true if everything + went ok, or false if something bad happened and a build shouldn't be + attempted. */ + bool prepare_build(); - /** Supervises the build process, starting new actions when slots become + /** Supervises the build process, starting new tasks when slots become available. */ int do_build();