/* $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"
argv.push_back(builder.get_current_arch().get_tool(tool));
argv.push_back("rc");
- argv.push_back(relative(lib.get_name(), work_dir).str());
+ 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());
- Path lpath=lib.get_name();
+ FS::Path lpath=lib.get_path();
if(!builder.get_dry_run())
- mkpath(lpath.subpath(0, lpath.size()-1), 0755);
+ FS::mkpath(FS::dirname(lpath), 0755);
announce(comp.get_package().get_name(), tool, relative(lpath, work_dir).str());