Improve target names in announces

diff --git a/source/archive.cpp b/source/archive.cpp
index 55b1f4615efe053bf1cf6dc68f915163929aae9d..64a88afc63227d33a186de482859d8fd391b3115 100644 (file)
--- 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 da1cfefc636adf55e3e05890cec9c43134af026b..4a0e85ed5cab98db2a74e125d4541cae53d7e512 100644 (file)
--- 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 010d54113d74a859e9eb6e8416ca0e11e501790b..6c24cdccc2e769960ff71e1631ff71139982a501 100644 (file)
--- 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 b165bad72550900f75c9e82400a86dd91f0816d7..69a1d4048329562aa56029c86eb2c44cbb7ab56c 100644 (file)
--- 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 991bd3516a704abbe10a948a9cdfa1be7f1b493c..3e5d6781e1d3c84534058a168379259813d64519 100644 (file)
--- a/source/pkgconfigaction.cpp
+++ b/source/pkgconfigaction.cpp
@@ -20,7 +20,7 @@ PkgConfigAction::PkgConfigAction(Builder &b, const PkgConfig &p):
 {
        const SourcePackage &spkg=*static_cast<const SourcePackage *>(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