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")
throw invalid_argument("MsvcCompiler::MsvcCompiler");
set_command((ms_tools.get_vc_bin_dir()/"cl.exe").str(), false);
+ set_run(_run);
}
Target *MsvcCompiler::create_source(const Component &comp, const FS::Path &path) const
return new CSourceFile(builder, path);
}
-Target *MsvcCompiler::create_target(const list<Target *> &sources, const string &)
+Target *MsvcCompiler::create_target(const vector<Target *> &sources, const string &)
{
if(sources.size()!=1)
throw invalid_argument("MsvcCompiler::create_target");
string MsvcCompiler::create_build_signature(const BuildInfo &binfo) const
{
- string result = FS::basename(executable->get_path());
+ string result = Tool::create_build_signature(binfo);
result += ',';
if(binfo.debug)
result += 'g';
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
+Task *MsvcCompiler::_run(const ObjectFile &object)
{
- 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());
}