-/* $Id$
-
-This file is part of builder
-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"
#include "component.h"
#include "objectfile.h"
+#include "sourcefile.h"
#include "sourcepackage.h"
using namespace std;
Compile::Compile(Builder &b, const ObjectFile &obj):
ExternalAction(b)
{
- const Component &comp=obj.get_component();
+ 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();
+ FS::Path spath = obj.get_source().get_path();
- string ext=Path::splitext(spath.str()).ext;
- const char *tool=0;
+ string ext = FS::extpart(spath.str());
+ const char *tool = 0;
if(ext==".cpp" || ext==".cc")
- tool="CXX";
+ tool = "CXX";
else
- tool="CC";
+ tool = "CC";
- argv.push_back(builder.get_tool(tool, comp.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();
+
+ 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_path();
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, basename(opath));
launch();
}