X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcopy.cpp;h=31e62100d9751d991a0bf59529dd7699973e8ac5;hb=d1eb133ab529cdae131be7b150209f03189248f3;hp=a08085da42d7c09f9014ccd8c71e1fc749e67c5f;hpb=7edb751727a176f58da886c2424d4840a0a910fd;p=builder.git

diff --git a/source/copy.cpp b/source/copy.cpp
index a08085d..31e6210 100644
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -1,85 +1,77 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <errno.h>
-#include <iostream>
+#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>
 #include <msp/io/file.h>
+#include <msp/io/print.h>
 #include "builder.h"
 #include "copy.h"
-#include "package.h"
+#include "installedfile.h"
+#include "internaltask.h"
 
 using namespace std;
 using namespace Msp;
 
-Copy::Copy(Builder &b, const Package &pkg, const FS::Path &s, const FS::Path &d):
-	InternalAction(b),
-	src(s),
-	dest(d)
+Target *Copy::create_target(const vector<Target *> &sources, const string &arg)
 {
-	announce(pkg.get_name(), "COPY", dest[-1]);
-	if(builder.get_verbose()>=2)
-		cout<<s<<" -> "<<d<<'\n';
-
-	if(!builder.get_dry_run())
-		worker=new Worker(*this);
+	FileTarget &file_tgt = dynamic_cast<FileTarget &>(*sources.front());
+	InstalledFile *inst = new InstalledFile(builder, *file_tgt.get_package(), file_tgt, arg);
+	inst->set_tool(*this);
+	return inst;
 }
 
-
-Copy::Worker::Worker(Copy &c):
-	copy(c)
+Task *Copy::run(const Target &target) const
 {
-	launch();
+	const InstalledFile &install = dynamic_cast<const InstalledFile &>(target);
+	InternalTask *task = new InternalTask([&install]{ return _run(install); });
+	task->add_file(install.get_path());
+	task->set_unlink();
+	return task;
 }
 
-void Copy::Worker::main()
+bool Copy::_run(const InstalledFile &install)
 {
-	FS::mkpath(FS::dirname(copy.dest), 0755);
+	const FileTarget &source = install.get_source();
+	const FS::Path &src_path = source.get_path();
+	const FS::Path &dst_path = install.get_path();
 
 	try
 	{
-		// Remove old file.  Not doing this would cause Bad Stuff when installing libraries.
-		unlink(copy.dest);
-	}
-	catch(const SystemError &e)
-	{
-		if(e.get_error_code()!=ENOENT)
-		{
-			cerr<<e.what()<<'\n';
-			done=error=true;
-			return;
-		}
-	}
-
-	try
-	{
-		IO::File in(copy.src.str());
-		IO::File out(copy.dest.str(), IO::M_WRITE);
+		IO::File in(src_path.str());
+		IO::File out(dst_path.str(), IO::M_WRITE);
 
 		// Actual transfer loop
 		char buf[16384];
 		while(!in.eof())
 		{
-			unsigned len=in.read(buf, sizeof(buf));
+			unsigned len = in.read(buf, sizeof(buf));
 			out.write(buf, len);
 		}
 	}
-	catch(const Exception &e)
+	catch(const exception &e)
 	{
-		cerr<<e.what()<<'\n';
-		done=error=true;
-		return;
+		IO::print(IO::cerr, "%s\n", e.what());
+		return false;
 	}
 
+#ifndef _WIN32
 	// Preserve file permissions
-	struct stat st=FS::stat(copy.src);
-	chmod(copy.dest.str().c_str(), st.st_mode&0777);
+	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 = 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
 
-	done=true;
+	return true;
 }