Additional MSVC fixes

[builder.git] / source / copy.cpp

diff --git a/source/copy.cpp b/source/copy.cpp
index 2c35ef30e1b1f3467421170df7f0f41525ffa318..53118de754963dc04095c11be4107a49c0ca9ab2 100644 (file)
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -1,5 +1,7 @@
-#include <errno.h>
+#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>
@@ -7,54 +9,48 @@
 #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.str());
-       if(builder.get_verbose()>=2)
-               IO::print("%s -> %s\n", s, d);
+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);
-
-       // Remove old file.  Not doing this would cause Bad Stuff when installing libraries.
-       if(FS::exists(copy.dest))
-       {
-               try
-               {
-                       unlink(copy.dest);
-               }
-               catch(const exception &e)
-               {
-                       IO::print(IO::cerr, "%s\n", e.what());
-                       done = error = true;
-                       return;
-               }
-       }
+       const FileTarget &source = target.get_source();
+       const FS::Path &src_path = source.get_path();
+       const FS::Path &dst_path = target.get_path();
 
        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];
@@ -67,14 +63,25 @@ void Copy::Worker::main()
        catch(const exception &e)
        {
                IO::print(IO::cerr, "%s\n", e.what());
-               done = error = true;
+               status = Task::ERROR;
                return;
        }
 
+#ifndef _WIN32
        // Preserve file permissions
        struct stat st;
-       if(stat(copy.src.str().c_str(), &st)==0)
-               chmod(copy.dest.str().c_str(), st.st_mode&0777);
+       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();
+       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;
+       status = Task::SUCCESS;
 }