X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchive.cpp;h=a56891b3df15880c33f3da4521a92ef4bd758502;hb=49ee08bb6f63f6b3a8cdd3b7cf032dea9b2cba8a;hp=55b1f4615efe053bf1cf6dc68f915163929aae9d;hpb=5006279d7b92e578ecfa8a04186f675c6b9f1eea;p=builder.git diff --git a/source/archive.cpp b/source/archive.cpp index 55b1f46..a56891b 100644 --- a/source/archive.cpp +++ b/source/archive.cpp @@ -21,21 +21,21 @@ 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_path(), work_dir).str()); - const TargetList &deps=lib.get_depends(); + const TargetList &deps = lib.get_depends(); for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i) - if(ObjectFile *obj=dynamic_cast(*i)) + if(ObjectFile *obj = dynamic_cast(*i)) argv.push_back(relative(obj->get_path(), work_dir).str()); - FS::Path lpath=lib.get_path(); + FS::Path lpath = lib.get_path(); if(!builder.get_dry_run()) { FS::mkpath(FS::dirname(lpath), 0755); @@ -43,7 +43,7 @@ Archive::Archive(Builder &b, const StaticLibrary &lib): 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(); }