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

diff --git a/source/archive.cpp b/source/archive.cpp
index daff233..a56891b 100644
--- a/source/archive.cpp
+++ b/source/archive.cpp
@@ -1,9 +1,18 @@
-#include <msp/path/utils.h>
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
+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"
 #include "component.h"
 #include "objectfile.h"
-#include "package.h"
+#include "sourcepackage.h"
 #include "staticlibrary.h"
 
 using namespace std;
@@ -12,22 +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();
 
-	argv.push_back("ar");
+	std::string tool = "AR";
+	argv.push_back(builder.get_current_arch().get_tool(tool));
 	argv.push_back("rc");
 
-	argv.push_back(lib.get_name());
-	const list<Target *> &deps=lib.get_depends();
-	for(list<Target *>::const_iterator i=deps.begin(); i!=deps.end(); ++i)
-		if(dynamic_cast<ObjectFile *>(*i))
-			argv.push_back((*i)->get_name());
+	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(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
+			argv.push_back(relative(obj->get_path(), work_dir).str());
 
-	Path::Path lpath=lib.get_name();
+	FS::Path lpath = lib.get_path();
 	if(!builder.get_dry_run())
-		Path::mkpath(lpath.subpath(0, lpath.size()-1), 0755);
+	{
+		FS::mkpath(FS::dirname(lpath), 0755);
+		if(FS::exists(lib.get_path()))
+			FS::unlink(lib.get_path());
+	}
 
-	announce(comp.get_package().get_name(), "AR  ", relative(lpath, comp.get_package().get_source()).str());
+	announce(comp.get_package().get_name(), tool, relative(lpath, work_dir).str().substr(2));
 
 	launch();
 }