X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcopy.cpp;h=2d2a7ca9c023c557954e05924d9181f4280dae97;hb=d6f7c89d762191e0845e3636c0bc0cc1989b209f;hp=5b524a40cd367d5e1973c6d2edfacc7d17ef33d5;hpb=b5ccba555f4985233532041c34e28d71dd58933f;p=builder.git

diff --git a/source/copy.cpp b/source/copy.cpp
index 5b524a4..2d2a7ca 100644
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -16,11 +16,10 @@ 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());
-	const SourcePackage &pkg = dynamic_cast<const SourcePackage &>(*file_tgt.get_package());
-	InstalledFile *inst = new InstalledFile(builder, pkg, file_tgt, arg);
+	InstalledFile *inst = new InstalledFile(builder, *file_tgt.get_package(), file_tgt, arg);
 	inst->set_tool(*this);
 	return inst;
 }
@@ -29,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;
 }
 
 
@@ -42,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
 	{
@@ -88,6 +74,8 @@ void Copy::Worker::main()
 	if(!link.empty())
 	{
 		FS::Path relpath = FS::relative(dst_path, FS::dirname(link));
+		if(FS::exists(link))
+			FS::unlink(link);
 		symlink(relpath.str().c_str(), link.str().c_str());
 	}