From e68e95f8a44150e69d2f4b74995a12013dfe75aa Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Mon, 21 Sep 2009 16:19:49 +0000 Subject: [PATCH] Improve target names in announces --- source/archive.cpp | 2 +- source/compile.cpp | 2 +- source/copy.cpp | 2 +- source/link.cpp | 2 +- source/pkgconfigaction.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/archive.cpp b/source/archive.cpp index 55b1f46..64a88af 100644 --- a/source/archive.cpp +++ b/source/archive.cpp @@ -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(); } diff --git a/source/compile.cpp b/source/compile.cpp index da1cfef..4a0e85e 100644 --- a/source/compile.cpp +++ b/source/compile.cpp @@ -55,7 +55,7 @@ Compile::Compile(Builder &b, const ObjectFile &obj): if(!builder.get_dry_run()) FS::mkpath(FS::dirname(opath), 0755); - announce(comp.get_package().get_name(), tool, relative(opath, work_dir).str()); + announce(comp.get_package().get_name(), tool, basename(opath)); launch(); } diff --git a/source/copy.cpp b/source/copy.cpp index 010d541..6c24cdc 100644 --- a/source/copy.cpp +++ b/source/copy.cpp @@ -23,7 +23,7 @@ Copy::Copy(Builder &b, const Package &pkg, const FS::Path &s, const FS::Path &d) src(s), dest(d) { - announce(pkg.get_name(), "COPY", dest[-1]); + announce(pkg.get_name(), "COPY", dest.str()); if(builder.get_verbose()>=2) IO::print("%s -> %s\n", s, d); diff --git a/source/link.cpp b/source/link.cpp index b165bad..69a1d40 100644 --- a/source/link.cpp +++ b/source/link.cpp @@ -64,7 +64,7 @@ Link::Link(Builder &b, const Binary &bin): if(!builder.get_dry_run()) FS::mkpath(FS::dirname(binpath), 0755); - announce(comp.get_package().get_name(), tool, relative(binpath, work_dir).str()); + announce(comp.get_package().get_name(), tool, relative(binpath, work_dir).str().substr(2)); launch(); } diff --git a/source/pkgconfigaction.cpp b/source/pkgconfigaction.cpp index 991bd35..3e5d678 100644 --- a/source/pkgconfigaction.cpp +++ b/source/pkgconfigaction.cpp @@ -20,7 +20,7 @@ PkgConfigAction::PkgConfigAction(Builder &b, const PkgConfig &p): { const SourcePackage &spkg=*static_cast(p.get_package()); - announce(spkg.get_name(), "PC", relative(p.get_path(), spkg.get_source()).str()); + announce(spkg.get_name(), "PC", basename(p.get_path())); IO::BufferedFile out(p.get_path().str(), IO::M_WRITE); // Prefix is already included in the various paths -- 2.43.0