Get rid of the global TargetList typedef

[builder.git] / source / tar.cpp

diff --git a/source/tar.cpp b/source/tar.cpp
index bfb4f5f9761f245dfa83cd8279a0b7a01c05bab0..b49e6fe08a7279b3bdddcde002955b4516cf50df 100644 (file)
--- a/source/tar.cpp
+++ b/source/tar.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <cstring>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
@@ -18,34 +11,45 @@ Distributed under the LGPL
 using namespace std;
 using namespace Msp;
 
-Tar::Tar(Builder &b, const TarBall &t):
-       InternalAction(b),
-       tarball(t)
+Tar::Tar(Builder &b):
+       Tool(b, "TAR")
+{ }
+
+Target *Tar::create_target(const list<Target *> &sources, const string &arg) const
 {
-       string basename = FS::basename(tarball.get_path());
-       announce(tarball.get_package()->get_name(), "TAR ", basename);
-       if(builder.get_verbose()>=2)
-               IO::print("Create %s\n", basename);
+       if(!sources.front()->get_package())
+               throw invalid_argument("Tar::create_target");
+       const SourcePackage &src_pkg = dynamic_cast<const SourcePackage &>(*sources.front()->get_package());
+
+       TarBall *tarball = new TarBall(builder, src_pkg, arg);
+       for(list<Target *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+               tarball->add_depend(*i);
 
-       if(!builder.get_dry_run())
-               worker = new Worker(*this);
+       return tarball;
+}
+
+Task *Tar::run(const Target &target) const
+{
+       const TarBall &tarball = dynamic_cast<const TarBall &>(target);
+       Worker *worker = new Worker(tarball);
+       return new InternalTask(worker);
 }
 
 
-Tar::Worker::Worker(Tar &t):
-       tar(t)
+Tar::Worker::Worker(const TarBall &tb):
+       tarball(tb)
 {
        launch();
 }
 
 void Tar::Worker::main()
 {
-       const FS::Path &pkg_src = tar.tarball.get_package()->get_source();
-       FS::Path basedir = FS::basepart(FS::basename(tar.tarball.get_path()));
+       const FS::Path &pkg_src = tarball.get_package()->get_source();
+       FS::Path basedir = FS::basepart(FS::basename(tarball.get_path()));
 
-       IO::File out(tar.tarball.get_path().str(), IO::M_WRITE);
-       const TargetList &deps = tar.tarball.get_depends();
-       for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
+       IO::File out(tarball.get_path().str(), IO::M_WRITE);
+       const Target::Dependencies &deps = tarball.get_depends();
+       for(Target::Dependencies::const_iterator i=deps.begin(); i!=deps.end(); ++i)
        {
                FileTarget *ft = dynamic_cast<FileTarget *>(*i);
                if(!ft)
@@ -58,18 +62,18 @@ void Tar::Worker::main()
                if(rel_path.size()>99)
                {
                        IO::print("Can't store %s in tar archive - too long name\n", rel_path);
-                       error = true;
-                       break;
+                       status = Task::ERROR;
+                       return;
                }
 
                memcpy(buf, rel_path.data(), rel_path.size());
 
-               struct stat st = FS::stat(ft->get_path());
-               store_number(buf+100, st.st_mode, 7);
-               store_number(buf+108, st.st_uid, 7);
-               store_number(buf+116, st.st_gid, 7);
-               store_number(buf+124, st.st_size, 11);
-               store_number(buf+136, st.st_mtime, 11);
+               FS::Stat st = FS::stat(ft->get_path());
+               store_number(buf+100, 0666, 7);
+               store_number(buf+108, 0, 7);
+               store_number(buf+116, 0, 7);
+               store_number(buf+124, st.get_size(), 11);
+               store_number(buf+136, st.get_modify_time().to_unixtime(), 11);
                buf[156] = '0';
 
                memset(buf+148, ' ', 8);
@@ -81,7 +85,7 @@ void Tar::Worker::main()
 
                out.write(buf, 512);
                IO::File in(ft->get_path().str());
-               for(int j=0; j<st.st_size; j+=4096)
+               for(unsigned j=0; j<st.get_size(); j+=4096)
                {
                        unsigned len = in.read(buf, 4096);
                        len += ((~len)+1)&0777;
@@ -89,7 +93,7 @@ void Tar::Worker::main()
                }
        }
 
-       done = true;
+       status = Task::SUCCESS;
 }
 
 void Tar::Worker::store_number(char *buf, unsigned value, unsigned length)