Make tarballs work again

diff --git a/source/component.cpp b/source/component.cpp
index 5a735d09c4e6561484704d33e388906d542e404c..b486c6c36a45174c12dfa39146e42950e16a1418 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -93,38 +93,33 @@ void Component::create_targets() const
        string inst_loc;
        if(type==TARBALL)
        {
-               //const Tool &tar = toolchain.get_tool("TAR");
-
-               string tarname = name;
-               if(name=="@src")
-               {
-                       tarname = package.get_name()+"-"+package.get_version();
-                       source_filenames.push_back(package.get_source_directory()/"Build");
-               }
+               const Tool &tar = toolchain.get_tool("TAR");
 
                list<Target *> files;
                for(PathList::const_iterator i=source_filenames.begin(); i!=source_filenames.end(); ++i)
                {
                        FileTarget *file = builder.get_vfs().get_target(*i);
                        if(!file)
-                               file = new File(builder, *i);
+                               file = new File(builder, package, *i);
                        files.push_back(file);
                }
 
+               string tarname = name;
                if(name=="@src")
                {
+                       tarname = package.get_name()+"-"+package.get_version();
+                       files.insert(files.begin(), &package.get_build_file());
+
                        const Builder::TargetMap &targets = builder.get_targets();
                        for(Builder::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
                                if(i->second->get_package()==&package && !i->second->is_buildable())
-                                       files.push_back(i->second);
+                                       if(find(files.begin(), files.end(), i->second)==files.end())
+                                               files.push_back(i->second);
                }
 
-               /* XXX The source files don't have a package at the moment, so we can't
-               create the tarball target until things get fixed up a bit */
-               /*Target *result = tar.create_target(files, tarname);
+               Target *result = tar.create_target(files, tarname);
 
-               Target *tarballs_tgt = builder.get_target("tarballs");
-               tarballs_tgt->add_dependency(*result);*/
+               builder.get_target("tarballs")->add_dependency(*result);
 
                return;
        }

diff --git a/source/tar.cpp b/source/tar.cpp
index b4ba71e52518c815c45e620fe247e586044f1fde..ac2f9e800788513947335dc8a70d326a6830261e 100644 (file)
--- a/source/tar.cpp
+++ b/source/tar.cpp
@@ -24,6 +24,8 @@ Target *Tar::create_target(const list<Target *> &sources, const string &arg) con
        for(list<Target *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)
                tarball->add_dependency(**i);
 
+       tarball->set_tool(*this);
+
        return tarball;
 }