X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcopy.cpp;h=2d2a7ca9c023c557954e05924d9181f4280dae97;hb=8b00d5bf0babe27131fd340319c632aa61a03a96;hp=75d047df7ef50c6371835f456a747f2c34b6121a;hpb=dfa45a1b64f59515a0b62f0912250fa1cf08b8b9;p=builder.git

diff --git a/source/copy.cpp b/source/copy.cpp
index 75d047d..2d2a7ca 100644
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -16,7 +16,7 @@ Copy::Copy(Builder &b):
 	Tool(b, "CP")
 { }
 
-Target *Copy::create_target(const list<Target *> &sources, const string &arg) const
+Target *Copy::create_target(const list<Target *> &sources, const string &arg)
 {
 	FileTarget &file_tgt = dynamic_cast<FileTarget &>(*sources.front());
 	InstalledFile *inst = new InstalledFile(builder, *file_tgt.get_package(), file_tgt, arg);
@@ -28,7 +28,10 @@ Task *Copy::run(const Target &target) const
 {
 	const InstalledFile &install = dynamic_cast<const InstalledFile &>(target);
 	Worker *worker = new Worker(install);
-	return new InternalTask(worker);
+	InternalTask *task = new InternalTask(worker);
+	task->add_file(install.get_path());
+	task->set_unlink();
+	return task;
 }
 
 
@@ -41,22 +44,6 @@ void Copy::Worker::main()
 	const FileTarget &source = target.get_source();
 	const FS::Path &src_path = source.get_path();
 	const FS::Path &dst_path = target.get_path();
-	FS::mkpath(FS::dirname(dst_path), 0755);
-
-	// Remove old file.  Not doing this would cause Bad Stuff when installing libraries.
-	if(FS::exists(dst_path))
-	{
-		try
-		{
-			unlink(dst_path);
-		}
-		catch(const exception &e)
-		{
-			IO::print(IO::cerr, "%s\n", e.what());
-			status = Task::ERROR;
-			return;
-		}
-	}
 
 	try
 	{