X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchive.cpp;h=a56891b3df15880c33f3da4521a92ef4bd758502;hb=05a2b9dabd01414e9e9a91f9d69babaca4ccb32d;hp=204b202c4863c112593edc50cf6e1d8fe0d53bcf;hpb=242c55b17e6608b29a77ca17a5b677e202a3ca90;p=builder.git

diff --git a/source/archive.cpp b/source/archive.cpp
index 204b202..a56891b 100644
--- a/source/archive.cpp
+++ b/source/archive.cpp
@@ -6,6 +6,7 @@ Distributed under the LGPL
 */
 
 #include <msp/fs/dir.h>
+#include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
 #include "archive.h"
 #include "builder.h"
@@ -20,25 +21,29 @@ using namespace Msp;
 Archive::Archive(Builder &b, const StaticLibrary &lib):
 	ExternalAction(b)
 {
-	const Component &comp=lib.get_component();
+	const Component &comp = lib.get_component();
 
-	work_dir=comp.get_package().get_source();
+	work_dir = comp.get_package().get_source();
 
-	std::string tool="AR";
+	std::string tool = "AR";
 	argv.push_back(builder.get_current_arch().get_tool(tool));
 	argv.push_back("rc");
 
-	argv.push_back(relative(lib.get_name(), work_dir).str());
-	const TargetList &deps=lib.get_depends();
+	argv.push_back(relative(lib.get_path(), work_dir).str());
+	const TargetList &deps = lib.get_depends();
 	for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
-		if(dynamic_cast<ObjectFile *>(*i))
-			argv.push_back(relative((*i)->get_name(), work_dir).str());
+		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
+			argv.push_back(relative(obj->get_path(), work_dir).str());
 
-	FS::Path lpath=lib.get_name();
+	FS::Path lpath = lib.get_path();
 	if(!builder.get_dry_run())
+	{
 		FS::mkpath(FS::dirname(lpath), 0755);
+		if(FS::exists(lib.get_path()))
+			FS::unlink(lib.get_path());
+	}
 
-	announce(comp.get_package().get_name(), tool, relative(lpath, work_dir).str());
+	announce(comp.get_package().get_name(), tool, relative(lpath, work_dir).str().substr(2));
 
 	launch();
 }