X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmsvccompiler.cpp;h=56c99c33f4c096949b4b8ffd7c22ec82d324baec;hb=edd4771292a2273080fbcbac266c6831834b0b86;hp=c4066273b6905e2e8754973b1cb73a10f6b57b43;hpb=aa053d637e8259755af7d2e4b510a242f4d29c7b;p=builder.git

diff --git a/source/msvccompiler.cpp b/source/msvccompiler.cpp
index c406627..56c99c3 100644
--- a/source/msvccompiler.cpp
+++ b/source/msvccompiler.cpp
@@ -6,7 +6,6 @@
 #include "builder.h"
 #include "component.h"
 #include "csourcefile.h"
-#include "externaltask.h"
 #include "microsofttools.h"
 #include "msvccompiler.h"
 #include "objectfile.h"
@@ -16,7 +15,7 @@ using namespace std;
 using namespace Msp;
 
 MsvcCompiler::MsvcCompiler(Builder &b, const Architecture &a, const string &t, const MicrosoftTools &m):
-	Tool(b, a, t),
+	Tool(b, &a, t),
 	ms_tools(m)
 {
 	if(tag=="CC")
@@ -34,6 +33,7 @@ MsvcCompiler::MsvcCompiler(Builder &b, const Architecture &a, const string &t, c
 		throw invalid_argument("MsvcCompiler::MsvcCompiler");
 
 	set_command((ms_tools.get_vc_bin_dir()/"cl.exe").str(), false);
+	set_run_external(_run);
 }
 
 Target *MsvcCompiler::create_source(const Component &comp, const FS::Path &path) const
@@ -72,43 +72,45 @@ string MsvcCompiler::create_build_signature(const BuildInfo &binfo) const
 	return result;
 }
 
-void MsvcCompiler::do_prepare()
+void MsvcCompiler::do_prepare(ToolData &tool) const
 {
+	const std::string &tool_tag = static_cast<Tool &>(tool).get_tag();
+
 	const FS::Path &vc_base_dir = ms_tools.get_vc_base_dir();
-	system_path.push_back(vc_base_dir/"include");
+	tool.system_path.push_back(vc_base_dir/"include");
 
 	const FS::Path &win_sdk_dir = ms_tools.get_windows_sdk_dir();
 	const string &win_sdk_ver = ms_tools.get_windows_sdk_version();
-	system_path.push_back(win_sdk_dir/"include"/win_sdk_ver/"ucrt");
-	system_path.push_back(win_sdk_dir/"include"/win_sdk_ver/"shared");
-	system_path.push_back(win_sdk_dir/"include"/win_sdk_ver/"um");
+	tool.system_path.push_back(win_sdk_dir/"include"/win_sdk_ver/"ucrt");
+	tool.system_path.push_back(win_sdk_dir/"include"/win_sdk_ver/"shared");
+	tool.system_path.push_back(win_sdk_dir/"include"/win_sdk_ver/"um");
 
 	string path;
-	for(const FS::Path &p: system_path)
+	for(const FS::Path &p: tool.system_path)
 	{
 		append(path, ";", p.str());
-		builder.get_logger().log("tools", format("Got %s system path: %s", tag, p));
+		builder.get_logger().log("tools", "Got %s system path: %s", tool_tag, p);
 	}
 
 	setenv("INCLUDE", path);
 }
 
-Task *MsvcCompiler::run(const Target &target) const
+ExternalTask::Arguments MsvcCompiler::_run(const ObjectFile &object, FS::Path &work_dir)
 {
-	const ObjectFile &object = dynamic_cast<const ObjectFile &>(target);
+	const Tool &tool = *object.get_tool();
 
 	ExternalTask::Arguments argv;
-	argv.push_back(executable->get_path().str());
+	argv.push_back(tool.get_executable()->get_path().str());
 	argv.push_back("/nologo");
 	argv.push_back("/c");
 
 	BuildInfo binfo;
-	target.collect_build_info(binfo);
+	object.collect_build_info(binfo);
 
-	if(binfo.standards.count(tag))
+	if(binfo.standards.count(tool.get_tag()))
 	{
-		const BuildInfo::LanguageStandard &std = get_item(binfo.standards, tag);
-		if((tag=="CXX" && std.year>2011) || (tag=="CC" && std.year>1999))
+		const BuildInfo::LanguageStandard &std = get_item(binfo.standards, tool.get_tag());
+		if((tool.get_tag()=="CXX" && std.year>2011) || (tool.get_tag()=="CC" && std.year>1999))
 			argv.push_back("/std:"+std.str());
 	}
 
@@ -171,10 +173,9 @@ Task *MsvcCompiler::run(const Target &target) const
 
 	FS::Path obj_path = object.get_path();
 	FS::Path src_path = object.get_source().get_path();
-	FS::Path work_dir = object.get_component()->get_package().get_source_directory();
 
 	argv.push_back("/Fo"+relative(obj_path, work_dir).str());
 	argv.push_back(relative(src_path, work_dir).str());
 
-	return new ExternalTask(argv, work_dir);
+	return argv;
 }