Use package directory as work dir for ExternalActions and make filename arguments...

[builder.git] / source / compile.cpp

diff --git a/source/compile.cpp b/source/compile.cpp
index 67278d16bdb2457efa8694962f909891c58a1baa..efa20efea3a6af31b9003a99396ac66be018f992 100644 (file)
--- a/source/compile.cpp
+++ b/source/compile.cpp
@@ -11,7 +11,7 @@ Distributed under the LGPL
 #include "compile.h"
 #include "component.h"
 #include "objectfile.h"
-#include "package.h"
+#include "sourcepackage.h"
 
 using namespace std;
 using namespace Msp;
@@ -21,19 +21,21 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
 {
        const Component &comp=obj.get_component();
 
+       work_dir=comp.get_package().get_source();
+
        const TargetList &deps=obj.get_depends();
-       Path::Path spath=deps.front()->get_name();
+       Path spath=deps.front()->get_name();
 
-       string ext=Path::splitext(spath.str()).ext;
+       string ext=splitext(spath.str()).ext;
        const char *tool=0;
        if(ext==".cpp" || ext==".cc")
                tool="CXX";
        else
                tool="CC";
 
-       argv.push_back(builder.get_tool(tool, obj.get_package()->get_arch()));
+       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.cflags.begin(); i!=binfo.cflags.end(); ++i)
                argv.push_back(*i);
@@ -41,16 +43,16 @@ Compile::Compile(Builder &b, const ObjectFile &obj):
                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();
+
+       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);
+               mkpath(opath.subpath(0, opath.size()-1), 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();
 }