Migrate from msppath to mspfs

[builder.git] / source / builder.h

diff --git a/source/builder.h b/source/builder.h
index 010b93fcc5ddec56044e1e3f6d2cc2d111d77476..2bfa32a429c7c9c137c19312616cd0f42972c643 100644 (file)
--- a/source/builder.h
+++ b/source/builder.h
@@ -13,7 +13,7 @@ Distributed under the LGPL
 #include <string>
 #include <msp/core/application.h>
 #include <msp/datafile/loader.h>
-#include <msp/path/path.h>
+#include <msp/fs/path.h>
 #include "architecture.h"
 #include "config.h"
 #include "misc.h"
@@ -41,10 +41,10 @@ public:
        const TargetMap &get_targets() const { return targets; }
        Target   *get_header(const std::string &, const std::string &, const StringList &);
        Target   *get_library(const std::string &, const StringList &, LibMode);
-       const Msp::Path &get_cwd() const { return cwd; }
+       const Msp::FS::Path &get_cwd() const { return cwd; }
        const Architecture &get_architecture(const std::string &) const;
        const Architecture &get_current_arch() const;
-       const std::string &get_prefix() const { return prefix; }
+       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;
        void     add_target(Target *);
@@ -57,10 +57,10 @@ private:
        class Loader: public Msp::DataFile::Loader
        {
        public:
-               Loader(Builder &, const Msp::Path &);
+               Loader(Builder &, const Msp::FS::Path &);
        private:
-               Builder         &bld;
-               Msp::Path src;
+               Builder       &bld;
+               Msp::FS::Path src;
 
                void architecture(const std::string &);
                void binpkg(const std::string &);
@@ -84,7 +84,7 @@ private:
 
        StringList   cmdline_targets;
        StringMap    cmdline_options;
-       Msp::Path    cwd;
+       Msp::FS::Path cwd;
 
        PackageMap   packages;
        SourcePackage *main_pkg;
@@ -113,13 +113,13 @@ private:
        bool            build_all;
        bool            create_makefile;
        std::string     current_arch;
-       std::string     prefix;
+       Msp::FS::Path   prefix;
        StringList      warnings;
 
-       int    load_build_file(const Msp::Path &);
+       int    load_build_file(const Msp::FS::Path &);
        int    create_targets();
-       Target *get_header(const Msp::Path &);
-       Target *get_library(const std::string &, const Msp::Path &, LibMode);
+       Target *get_header(const Msp::FS::Path &);
+       Target *get_library(const std::string &, const Msp::FS::Path &, LibMode);
        void   update_hash(std::string &, const std::string &);
        int    do_build();
        int    do_clean();