Additional MSVC fixes

[builder.git] / source / copy.cpp

diff --git a/source/copy.cpp b/source/copy.cpp
index f8c581bd5664ca123f4f657da77883c7dff1003b..53118de754963dc04095c11be4107a49c0ca9ab2 100644 (file)
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -1,89 +1,87 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <errno.h>
-#include <fstream>
-#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"
 
 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)
-{
-       announce(pkg.get_name(), "COPY", dest[-1]);
-       if(builder.get_verbose()>=2)
-               cout<<s<<" -> "<<d<<'\n';
+Copy::Copy(Builder &b):
+       Tool(b, "CP")
+{ }
 
-       if(!builder.get_dry_run())
-               worker=new Worker(*this);
+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);
+       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);
+       Worker *worker = new Worker(install);
+       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()
 {
-       FS::mkpath(FS::dirname(copy.dest), 0755);
+       const FileTarget &source = target.get_source();
+       const FS::Path &src_path = source.get_path();
+       const FS::Path &dst_path = target.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)
+               IO::File in(src_path.str());
+               IO::File out(dst_path.str(), IO::M_WRITE);
+
+               // Actual transfer loop
+               char buf[16384];
+               while(!in.eof())
                {
-                       cerr<<e.what()<<'\n';
-                       done=error=true;
-                       return;
+                       unsigned len = in.read(buf, sizeof(buf));
+                       out.write(buf, len);
                }
        }
-
-       ifstream in(copy.src.str().c_str());
-       if(!in)
+       catch(const exception &e)
        {
-               cerr<<"Can't open "<<copy.src<<" for reading\n";
-               done=error=true;
+               IO::print(IO::cerr, "%s\n", e.what());
+               status = Task::ERROR;
                return;
        }
 
-       ofstream out(copy.dest.str().c_str());
-       if(!out)
-       {
-               cerr<<"Can't open "<<copy.dest<<" for writing\n";
-               done=error=true;
-               return;
-       }
+#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);
 
-       // Actual transfer loop
-       char buf[16384];
-       while(!in.eof())
+       const FS::Path &link = target.get_symlink();
+       if(!link.empty())
        {
-               in.read(buf, sizeof(buf));
-               out.write(buf, in.gcount());
+               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
 
-       // Preserve file permissions
-       struct stat st=FS::stat(copy.src);
-       chmod(copy.dest.str().c_str(), st.st_mode&0777);
-
-       done=true;
+       status = Task::SUCCESS;
 }