X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcompile.cpp;h=4960d42003dd563440ee126a6d517a2b6e495411;hb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;hp=15aaee9e800477f30ebf475ca96ff4ce64928ff9;hpb=59ac0a44d6edf179c01604c6ced744873213f855;p=builder.git

diff --git a/source/compile.cpp b/source/compile.cpp
index 15aaee9..4960d42 100644
--- a/source/compile.cpp
+++ b/source/compile.cpp
@@ -1,47 +1,54 @@
-#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 "package.h"
+#include "objectfile.h"
+#include "sourcefile.h"
+#include "sourcepackage.h"
 
 using namespace std;
 using namespace Msp;
 
-Compile::Compile(Builder &b, const Path::Path &s, const Path::Path &o, const Component &c):
-	ExternalAction(b),
-	source(s),
-	object(o),
-	comp(c)
+Compile::Compile(Builder &b, const ObjectFile &obj):
+	ExternalAction(b)
 {
-	string ext=Path::splitext(source.str()).ext;
-	const char *tool=0;
+	const Component &comp = obj.get_component();
+
+	work_dir = comp.get_package().get_source();
+
+	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";
-		argv.push_back("g++");
-	}
+		tool = "CXX";
 	else
-	{
-		tool="CC";
-		argv.push_back("gcc");
-	}
+		tool = "CC";
+
+	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);
-	
+
+	FS::Path opath = obj.get_path();
 	argv.push_back("-o");
-	argv.push_back(object.str());
-	argv.push_back(source.str());
+	argv.push_back(relative(opath, work_dir).str());
+	argv.push_back(relative(spath, work_dir).str());
 
-	Path::mkpath(object.subpath(0, object.size()-1), 0755);
+	if(!builder.get_dry_run())
+		FS::mkpath(FS::dirname(opath), 0755);
 
-	announce(comp.get_package().get_name(), tool, relative(object.str(), comp.get_package().get_source()).str());
+	announce(comp.get_package().get_name(), tool, basename(opath));
 
 	launch();
 }