X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcopy.cpp;h=9bca33f3050989900407937c3fd68bb0536f76c6;hb=36c90dafd6ff514919b802ccb54404b882afc944;hp=0073320504b0daff45e2c9577a93e9ab4c095dff;hpb=ad88e1ba08cf798e5f87796021c947cf500a02e1;p=builder.git

diff --git a/source/copy.cpp b/source/copy.cpp
index 0073320..9bca33f 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>
@@ -8,15 +10,12 @@
 #include "builder.h"
 #include "copy.h"
 #include "installedfile.h"
+#include "internaltask.h"
 
 using namespace std;
 using namespace Msp;
 
-Copy::Copy(Builder &b):
-	Tool(b, "CP")
-{ }
-
-Target *Copy::create_target(const list<Target *> &sources, const string &arg) const
+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);
@@ -27,36 +26,14 @@ Target *Copy::create_target(const list<Target *> &sources, const string &arg) co
 Task *Copy::run(const Target &target) const
 {
 	const InstalledFile &install = dynamic_cast<const InstalledFile &>(target);
-	Worker *worker = new Worker(install);
-	return new InternalTask(worker);
+	return new InternalTask([&install]{ return _run(install); });
 }
 
-
-Copy::Worker::Worker(const InstalledFile &t):
-	target(t)
-{ }
-
-void Copy::Worker::main()
+bool Copy::_run(const InstalledFile &install)
 {
-	const FileTarget &source = target.get_source();
+	const FileTarget &source = install.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;
-		}
-	}
+	const FS::Path &dst_path = install.get_path();
 
 	try
 	{
@@ -74,21 +51,24 @@ void Copy::Worker::main()
 	catch(const exception &e)
 	{
 		IO::print(IO::cerr, "%s\n", e.what());
-		status = Task::ERROR;
-		return;
+		return false;
 	}
 
+#ifndef _WIN32
 	// Preserve file permissions
 	struct stat st;
 	if(stat(src_path.str().c_str(), &st)==0)
 		chmod(dst_path.str().c_str(), st.st_mode&0777);
 
-	const FS::Path &link = target.get_symlink();
+	const FS::Path &link = install.get_symlink();
 	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());
 	}
+#endif
 
-	status = Task::SUCCESS;
+	return true;
 }