Migrate from msppath to mspfs

[builder.git] / source / compile.cpp

diff --git a/source/compile.cpp b/source/compile.cpp
index c98353ba04cc6726dc171c9a84bf30380a70aee0..634ccd81ff433cc31d6d7febe4a11cc3da36b98f 100644 (file)
--- a/source/compile.cpp
+++ b/source/compile.cpp
@@ -5,7 +5,8 @@ Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <msp/path/utils.h>
+#include <msp/fs/dir.h>
+#include <msp/fs/utils.h>
 #include "builder.h"
 #include "buildinfo.h"
 #include "compile.h"
@@ -24,9 +25,9 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
        work_dir=comp.get_package().get_source();
 
        const TargetList &deps=obj.get_depends();
-       Path spath=deps.front()->get_name();
+       FS::Path spath=deps.front()->get_name();
 
-       string ext=splitext(spath.str()).ext;
+       string ext=FS::extpart(spath.str());
        const char *tool=0;
        if(ext==".cpp" || ext==".cc")
                tool="CXX";
@@ -46,13 +47,13 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
        for(list<string>::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
                argv.push_back("-D"+*i);
 
-       Path opath=obj.get_name();
+       FS::Path opath=obj.get_name();
        argv.push_back("-o");
        argv.push_back(relative(opath, work_dir).str());
        argv.push_back(relative(spath, work_dir).str());
 
        if(!builder.get_dry_run())
-               mkpath(opath.subpath(0, opath.size()-1), 0755);
+               FS::mkpath(FS::dirname(opath), 0755);
 
        announce(comp.get_package().get_name(), tool, relative(opath, work_dir).str());