Redesign how tools are run

[builder.git] / source / msvcarchiver.cpp

diff --git a/source/msvcarchiver.cpp b/source/msvcarchiver.cpp
index a724eb16577ae0eb9638a9287b485073fa14a227..2d5d84260358734f4c8bac93d19cb8c594066796 100644 (file)
--- a/source/msvcarchiver.cpp
+++ b/source/msvcarchiver.cpp
@@ -17,21 +17,18 @@ MsvcArchiver::MsvcArchiver(Builder &b, const Architecture &a, const MicrosoftToo
        input_suffixes.push_back(".o");
        processing_unit = COMPONENT;
        set_command((ms_tools.get_vc_bin_dir()/"lib.exe").str(), false);
+       set_run(_run);
 }
 
-Target *MsvcArchiver::create_target(const list<Target *> &sources, const string &)
+Target *MsvcArchiver::create_target(const vector<Target *> &sources, const string &)
 {
        if(sources.empty())
                throw invalid_argument("MsvcArchiver::create_target");
 
-       list<ObjectFile *> objs;
+       vector<ObjectFile *> objs;
+       objs.reserve(sources.size());
        for(Target *s: sources)
-       {
-               if(ObjectFile *obj = dynamic_cast<ObjectFile *>(s))
-                       objs.push_back(obj);
-               else
-                       throw invalid_argument("MsvcArchiver::create_target");
-       }
+               objs.push_back(&dynamic_cast<ObjectFile &>(*s));
 
        const Component &comp = *objs.front()->get_component();
        StaticLibrary *lib = new StaticLibrary(builder, comp, objs);
@@ -39,18 +36,13 @@ Target *MsvcArchiver::create_target(const list<Target *> &sources, const string
        return lib;
 }
 
-string MsvcArchiver::create_build_signature(const BuildInfo &) const
+Task *MsvcArchiver::_run(const StaticLibrary &lib)
 {
-       return FS::basename(executable->get_path());
-}
-
-Task *MsvcArchiver::run(const Target &target) const
-{
-       const StaticLibrary &lib = dynamic_cast<const StaticLibrary &>(target);
        const Component &comp = *lib.get_component();
+       const Tool &tool = *lib.get_tool();
 
        vector<string> argv;
-       argv.push_back(executable->get_path().str());
+       argv.push_back(tool.get_executable()->get_path().str());
        argv.push_back("/NOLOGO");
 
        FS::Path work_dir = comp.get_package().get_source_directory();