X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcompile.cpp;h=f6a4dd65dc4add29b60ede81725fb2d4d62d24c8;hb=8d7926359d2477a9928d7367678314bcbc1f6e81;hp=67278d16bdb2457efa8694962f909891c58a1baa;hpb=7aeaa4ba965f596edad438c02e345a8843f7469a;p=builder.git

diff --git a/source/compile.cpp b/source/compile.cpp
index 67278d1..f6a4dd6 100644
--- a/source/compile.cpp
+++ b/source/compile.cpp
@@ -1,17 +1,19 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009  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 "package.h"
+#include "sourcefile.h"
+#include "sourcepackage.h"
 
 using namespace std;
 using namespace Msp;
@@ -19,38 +21,41 @@ using namespace Msp;
 Compile::Compile(Builder &b, const ObjectFile &obj):
 	ExternalAction(b)
 {
-	const Component &comp=obj.get_component();
+	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();
 
-	string ext=Path::splitext(spath.str()).ext;
-	const char *tool=0;
+	FS::Path spath = obj.get_source().get_path();
+
+	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, 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();
+
+	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();
 }