X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchive.cpp;h=6d1d502ebebfcef3538fb293544d3e13b8f85e68;hb=463a3521e27870294455373f9c69279069611975;hp=cd25de1e2d90f4ef0516edf29f4efb4c1a9980eb;hpb=0fd98b61eb112fe397c67b7735627b7bbdd01e41;p=builder.git

diff --git a/source/archive.cpp b/source/archive.cpp
index cd25de1..6d1d502 100644
--- a/source/archive.cpp
+++ b/source/archive.cpp
@@ -1,9 +1,11 @@
-#include <msp/path/utils.h>
+#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 +14,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();
 
-	argv.push_back(builder.get_tool("AR", lib.get_package()->get_arch()));
+	work_dir = comp.get_package().get_source();
+
+	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 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((*i)->get_name());
+		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();
 }