Adapt to changes in msppath

[builder.git] / source / builder.cpp

diff --git a/source/builder.cpp b/source/builder.cpp
index 2ef5a709e1913d33cae79f1677ce1b21290d1cee..34c65af48be88df4d0be392b9735bad57472a3ea 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -113,7 +113,7 @@ Builder::Builder(int argc, char **argv):
        if(!work_dir.empty())
                chdir(work_dir.c_str());
 
-       cwd=Path::getcwd();
+       cwd=getcwd();
 
        Architecture &native_arch=archs.insert(ArchMap::value_type("native", Architecture(*this, "native"))).first->second;
        native_arch.set_tool("CC",  "gcc");
@@ -124,7 +124,7 @@ Builder::Builder(int argc, char **argv):
 
        const char *home=getenv("HOME");
        if(home)
-               load_build_file((Path::Path(home)/".builderrc").str());
+               load_build_file((Path(home)/".builderrc").str());
 }
 
 /**
@@ -145,6 +145,8 @@ Package *Builder::get_package(const string &n)
        argv.push_back("pkg-config");
        argv.push_back("--variable=source");
        argv.push_back(n);
+       if(verbose>=4)
+               cout<<"Running "<<join(argv.begin(), argv.end())<<'\n';
        string srcdir=strip(run_command(argv));
 
        PathList dirs;
@@ -210,12 +212,12 @@ Target *Builder::get_header(const string &include, const string &, const string
 
        string fn=include.substr(1);
        Target *tgt=0;
-       if(include[0]=='"' && (tgt=get_header(Path::Path(from)/fn)))
+       if(include[0]=='"' && (tgt=get_header(Path(from)/fn)))
                ;
-       else if((tgt=get_header(Path::Path("/usr/include")/fn)))
+       else if((tgt=get_header(Path("/usr/include")/fn)))
                ;
        //XXX Determine the C++ header location dynamically
-       else if((tgt=get_header(Path::Path("/usr/include/c++/4.1.2")/fn)))
+       else if((tgt=get_header(Path("/usr/include/c++/4.1.2")/fn)))
                ;
        else
        {
@@ -442,7 +444,7 @@ Loads the given build file.
 
 @return  0 on success, -1 if the file could not be opened
 */
-int Builder::load_build_file(const Path::Path &fn)
+int Builder::load_build_file(const Path &fn)
 {
        ifstream in(fn.str().c_str());
        if(!in)
@@ -559,12 +561,12 @@ int Builder::create_targets()
 Check if a header exists, either as a target or a file.  Either an existing
 target or a new SystemHeader target will be returned.
 */
-Target *Builder::get_header(const Msp::Path::Path &fn)
+Target *Builder::get_header(const Msp::Path &fn)
 {
        Target *tgt=get_target(fn.str());
        if(tgt) return tgt;
 
-       if(Path::exists(fn))
+       if(exists(fn))
        {
                tgt=new SystemHeader(*this, fn.str());
                return tgt;
@@ -572,7 +574,7 @@ Target *Builder::get_header(const Msp::Path::Path &fn)
        return 0;
 }
 
-Target *Builder::get_library(const string &lib, const string &arch, const Path::Path &path, LibMode mode)
+Target *Builder::get_library(const string &lib, const string &arch, const Path &path, LibMode mode)
 {
        // Populate a list of candidate filenames
        StringList candidates;
@@ -609,7 +611,7 @@ Target *Builder::get_library(const string &lib, const string &arch, const Path::
                        else if(tgt)
                                return tgt;
                }
-               else if(Path::exists(full))
+               else if(exists(full))
                {
                        tgt=new SystemLibrary(*this, full);
                        return tgt;
@@ -767,7 +769,7 @@ void Builder::package_help()
 Application::RegApp<Builder> Builder::reg;
 
 
-Builder::Loader::Loader(Builder &b, const Path::Path &s):
+Builder::Loader::Loader(Builder &b, const Path &s):
        bld(b),
        src(s)
 {