Fix include and library search order

[builder.git] / source / tar.cpp

diff --git a/source/tar.cpp b/source/tar.cpp
index 0b0c38df775696fcf1e98d8333a3357df68af305..da579250a15654b978cda94eef621af1afbe319e 100644 (file)
--- a/source/tar.cpp
+++ b/source/tar.cpp
@@ -8,7 +8,7 @@ Distributed under the LGPL
 #include <iostream>
 #include <msp/path/utils.h>
 #include "builder.h"
-#include "package.h"
+#include "sourcepackage.h"
 #include "tar.h"
 #include "tarball.h"
 
@@ -16,55 +16,29 @@ using namespace std;
 using namespace Msp;
 
 Tar::Tar(Builder &b, const TarBall &t):
-       Action(b),
-       tarball(t),
-       worker(0)
+       InternalAction(b),
+       tarball(t)
 {
        string basename=tarball.get_name().substr(tarball.get_name().rfind('/')+1);
        announce(tarball.get_package()->get_name(), "TAR ", basename);
        if(builder.get_verbose()>=2)
                cout<<"Create "<<basename<<'\n';
-       
+
        if(!builder.get_dry_run())
                worker=new Worker(*this);
 }
 
-Tar::~Tar()
-{
-       delete worker;
-}
-
-int Tar::check()
-{
-       if(!worker)  // True for dry run
-       {
-               signal_done.emit();
-               return 0;
-       }
-       
-       if(worker->get_done())
-       {
-               signal_done.emit();
-               worker->join();
-               return worker->get_error()?1:0;
-       }
-       
-       return -1;
-}
-
 
 Tar::Worker::Worker(Tar &t):
-       tar(t),
-       done(false),
-       error(false)
+       tar(t)
 {
        launch();
 }
 
 void Tar::Worker::main()
 {
-       const Path::Path &pkg_src=tar.tarball.get_package()->get_source();
-       Path::Path basedir=Path::splitext(Path::basename(tar.tarball.get_name())).base;
+       const Path &pkg_src=tar.tarball.get_package()->get_source();
+       Path basedir=splitext(basename(tar.tarball.get_name())).base;
 
        ofstream out(tar.tarball.get_name().c_str());
        const TargetList &deps=tar.tarball.get_depends();
@@ -83,8 +57,7 @@ void Tar::Worker::main()
 
                memcpy(buf, rel_path.data(), rel_path.size());
 
-               struct stat st;
-               Path::stat((*i)->get_name(), st);
+               struct stat st=stat((*i)->get_name());
                store_number(buf+100, st.st_mode, 7);
                store_number(buf+108, st.st_uid, 7);
                store_number(buf+116, st.st_gid, 7);