X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcopy.cpp;h=45c5a81fa9ba60533a0471b105a2a26c4d25d2c0;hb=451ef4f33b5a57dcb56bd7cb671bed359ac86247;hp=24be942532b83ab52a0dcfdeb8446ad29d708edf;hpb=9e28243c9687608ec3c32954b4031490296ae877;p=builder.git

diff --git a/source/copy.cpp b/source/copy.cpp
index 24be942..45c5a81 100644
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -1,5 +1,7 @@
+#ifndef _WIN32
 #include <unistd.h>
 #include <sys/stat.h>
+#endif
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
@@ -12,11 +14,7 @@
 using namespace std;
 using namespace Msp;
 
-Copy::Copy(Builder &b):
-	Tool(b, "CP")
-{ }
-
-Target *Copy::create_target(const list<Target *> &sources, const string &arg)
+Target *Copy::create_target(const vector<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,35 +26,18 @@ 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;
 }
 
 
-Copy::Worker::Worker(const InstalledFile &t):
-	target(t)
-{ }
-
 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
 	{
@@ -78,6 +59,7 @@ void Copy::Worker::main()
 		return;
 	}
 
+#ifndef _WIN32
 	// Preserve file permissions
 	struct stat st;
 	if(stat(src_path.str().c_str(), &st)==0)
@@ -91,6 +73,7 @@ void Copy::Worker::main()
 			FS::unlink(link);
 		symlink(relpath.str().c_str(), link.str().c_str());
 	}
+#endif
 
 	status = Task::SUCCESS;
 }