Migrate from msppath to mspfs

[builder.git] / source / compile.cpp

diff --git a/source/compile.cpp b/source/compile.cpp
index 02ae493ea1892a4002c320a88d4ab9997ade1634..634ccd81ff433cc31d6d7febe4a11cc3da36b98f 100644 (file)
--- a/source/compile.cpp
+++ b/source/compile.cpp
@@ -1,10 +1,18 @@
-#include <msp/path/utils.h>
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
+#include <msp/fs/dir.h>
+#include <msp/fs/utils.h>
 #include "builder.h"
 #include "buildinfo.h"
 #include "compile.h"
 #include "component.h"
 #include "objectfile.h"
-#include "package.h"
+#include "sourcepackage.h"
 
 using namespace std;
 using namespace Msp;
@@ -14,42 +22,40 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
 {
        const Component &comp=obj.get_component();
 
-       const TargetList &deps=obj.get_depends();
-       Path::Path spath=deps.front()->get_name();
+       work_dir=comp.get_package().get_source();
 
-       const string &prefix=b.get_arch_prefix(obj.get_package()->get_arch());
+       const TargetList &deps=obj.get_depends();
+       FS::Path spath=deps.front()->get_name();
 
-       string ext=Path::splitext(spath.str()).ext;
+       string ext=FS::extpart(spath.str());
        const char *tool=0;
        if(ext==".cpp" || ext==".cc")
-       {
                tool="CXX";
-               argv.push_back(prefix+"g++");
-       }
        else
-       {
                tool="CC";
-               argv.push_back(prefix+"gcc");
-       }
+
+       argv.push_back(builder.get_current_arch().get_tool(tool));
        argv.push_back("-c");
-       
+
        const BuildInfo &binfo=comp.get_build_info();
+       for(list<string>::const_iterator i=binfo.warnings.begin(); i!=binfo.warnings.end(); ++i)
+               argv.push_back("-W"+*i);
        for(list<string>::const_iterator i=binfo.cflags.begin(); i!=binfo.cflags.end(); ++i)
                argv.push_back(*i);
        for(list<string>::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
                argv.push_back("-I"+*i);
        for(list<string>::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
                argv.push_back("-D"+*i);
-       
-       Path::Path opath=obj.get_name();
+
+       FS::Path opath=obj.get_name();
        argv.push_back("-o");
-       argv.push_back(opath.str());
-       argv.push_back(spath.str());
+       argv.push_back(relative(opath, work_dir).str());
+       argv.push_back(relative(spath, work_dir).str());
 
        if(!builder.get_dry_run())
-               Path::mkpath(opath.subpath(0, opath.size()-1), 0755);
+               FS::mkpath(FS::dirname(opath), 0755);
 
-       announce(comp.get_package().get_name(), tool, relative(opath, comp.get_package().get_source()).str());
+       announce(comp.get_package().get_name(), tool, relative(opath, work_dir).str());
 
        launch();
 }