/* $Id$
This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009 Mikko Rasa, Mikkosoft Productions
Distributed under the LGPL
*/
-#include <msp/path/utils.h>
+#include <msp/fs/dir.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;
{
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());
+ 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);
- 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());
launch();
}