#include "installedfile.h"
#include "misc.h"
#include "package.h"
-#include "pkgconfig.h"
+#include "pkgconfigfile.h"
#include "pkgconfiggenerator.h"
#include "sharedlibrary.h"
#include "sourcepackage.h"
if(spkg->get_install_flags()&(SourcePackage::LIB|SourcePackage::INCLUDE))
{
- PkgConfig *pc = new PkgConfig(*this, *spkg);
- install->add_depend(new InstalledFile(*this, *spkg, *pc));
+ PkgConfigFile *pc = new PkgConfigFile(*this, *spkg);
+ install->add_depend(toolchain.get_tool("CP").create_target(*pc));
}
}
if(tgt)
{
if(tgt->get_tool())
- IO::print("[%-10s] [%-4s] %s\n", tgt->get_package()->get_name(), tgt->get_tool()->get_tag(), tgt->get_name());
+ IO::print("%-4s %s\n", tgt->get_tool()->get_tag(), tgt->get_name());
Task *task = tgt->build();
if(task)
- tasks.push_back(task);
+ {
+ if(verbose>=2)
+ IO::print("%s\n", task->get_command());
+ if(dry_run)
+ {
+ task->signal_finished.emit(true);
+ delete task;
+ }
+ else
+ {
+ task->start();
+ tasks.push_back(task);
+ }
+ }
if(show_progress)
IO::print("%d of %d target%s built\033[1G", count, total, (total!=1 ? "s" : ""));
for(set<Target *>::iterator i=clean_tgts.begin(); i!=clean_tgts.end(); ++i)
if(FileTarget *ft = dynamic_cast<FileTarget *>(*i))
- unlink(ft->get_path());
+ if(ft->get_mtime())
+ FS::unlink(ft->get_path());
return 0;
}