X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcompile.cpp;h=4157ccb58f0afa305fb035bd33088eb3d5906aa0;hb=242c55b17e6608b29a77ca17a5b677e202a3ca90;hp=44d4d6255fe1c2d57caea506e6d00809d7fce541;hpb=4d0d003b022943d8a0e39ba19078bab8d32d8857;p=builder.git

diff --git a/source/compile.cpp b/source/compile.cpp
index 44d4d62..4157ccb 100644
--- a/source/compile.cpp
+++ b/source/compile.cpp
@@ -1,11 +1,12 @@
 /* $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"
@@ -21,20 +22,24 @@ 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 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";
 	else
 		tool="CC";
 
-	argv.push_back(builder.get_architecture(comp.get_package().get_arch()).get_tool(tool));
+	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)
@@ -42,15 +47,15 @@ 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(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())
-		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();
 }