X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmsvcarchiver.cpp;h=2d5d84260358734f4c8bac93d19cb8c594066796;hb=1ed833343bc83b83c5f61cbfd74423bbba677a04;hp=1481184d52673adb19dae15e020b623410aa7b30;hpb=c0e0728ff439ddb364cee26f164e46705beac822;p=builder.git

diff --git a/source/msvcarchiver.cpp b/source/msvcarchiver.cpp
index 1481184..2d5d842 100644
--- 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;
-	for(list<Target *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)
-	{
-		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
-			objs.push_back(obj);
-		else
-			throw invalid_argument("MsvcArchiver::create_target");
-	}
+	vector<ObjectFile *> objs;
+	objs.reserve(sources.size());
+	for(Target *s: sources)
+		objs.push_back(&dynamic_cast<ObjectFile &>(*s));
 
 	const Component &comp = *objs.front()->get_component();
 	StaticLibrary *lib = new StaticLibrary(builder, comp, objs);
@@ -39,27 +36,21 @@ 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();
 
 	argv.push_back("/OUT:"+relative(lib.get_path(), work_dir).str());
 
-	const Target::Dependencies &deps = lib.get_dependencies();
-	for(Target::Dependencies::const_iterator i=deps.begin(); i!=deps.end(); ++i)
-		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
+	for(Target *d: lib.get_dependencies())
+		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(d))
 			argv.push_back(relative(obj->get_path(), work_dir).str());
 
 	return new ExternalTask(argv, work_dir);