Additional MSVC fixes

[builder.git] / source / copy.cpp

diff --git a/source/copy.cpp b/source/copy.cpp
index b756e0c037412012a828075735a7b6fb8eb3b679..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>
@@ -16,11 +18,10 @@ Copy::Copy(Builder &b):
        Tool(b, "CP")
 { }
 
-Target *Copy::create_target(const list<Target *> &sources, const string &arg) const
+Target *Copy::create_target(const list<Target *> &sources, const string &arg)
 {
        FileTarget &file_tgt = dynamic_cast<FileTarget &>(*sources.front());
-       const SourcePackage &pkg = dynamic_cast<const SourcePackage &>(*file_tgt.get_package());
-       InstalledFile *inst = new InstalledFile(builder, pkg, file_tgt, arg);
+       InstalledFile *inst = new InstalledFile(builder, *file_tgt.get_package(), file_tgt, arg);
        inst->set_tool(*this);
        return inst;
 }
@@ -29,37 +30,22 @@ 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)
-{
-       launch();
-}
+{ }
 
 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
        {
@@ -81,6 +67,7 @@ void Copy::Worker::main()
                return;
        }
 
+#ifndef _WIN32
        // Preserve file permissions
        struct stat st;
        if(stat(src_path.str().c_str(), &st)==0)
@@ -90,8 +77,11 @@ void Copy::Worker::main()
        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;
 }