Refactor the use of external tasks in tools

[builder.git] / source / msvccompiler.cpp

diff --git a/source/msvccompiler.cpp b/source/msvccompiler.cpp
index c3361ee61b7993a4dad465c81487e5020037e1b3..56c99c33f4c096949b4b8ffd7c22ec82d324baec 100644 (file)
--- 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"
@@ -34,7 +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(_run);
+       set_run_external(_run);
 }
 
 Target *MsvcCompiler::create_source(const Component &comp, const FS::Path &path) const
@@ -73,28 +72,30 @@ 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", "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 ObjectFile &object)
+ExternalTask::Arguments MsvcCompiler::_run(const ObjectFile &object, FS::Path &work_dir)
 {
        const Tool &tool = *object.get_tool();
 
@@ -172,10 +173,9 @@ Task *MsvcCompiler::_run(const ObjectFile &object)
 
        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;
 }