Improve cleaning

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 3b9f7f0ebebafcbd58f391fe39fe76cec57fa277..e74c0b7540c409fd07e0ed3048dd7ee167da3be4 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -27,7 +27,7 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &f):
        source_dir(FS::dirname(f)),
        build_type(0),
        config(*this),
-       deps_cache(*this)
+       cache(*this)
 {
        config.load();
 
@@ -35,6 +35,7 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &f):
        if(!build_file)
                build_file = new File(builder, *this, f);
        components.push_back(Component(*this, Component::TARBALL, "@src"));
+       source_tarball = &components.back();
 }
 
 void SourcePackage::set_build_type(const BuildType &t)
@@ -61,11 +62,10 @@ FS::Path SourcePackage::get_temp_dir() const
 FS::Path SourcePackage::get_out_dir() const
 {
        const Architecture &arch = builder.get_current_arch();
-       string detail = (build_type ? build_type->get_name() : string());
        if(arch.is_native())
-               return source_dir/detail;
+               return source_dir;
        else
-               return source_dir/arch.get_name()/detail;
+               return source_dir/arch.get_name();
 }
 
 void SourcePackage::create_build_info()
@@ -107,7 +107,7 @@ void SourcePackage::create_build_info()
 
 void SourcePackage::create_targets()
 {
-       deps_cache.load();
+       cache.load();
 
        bool pc_needed = false;
        for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
@@ -127,7 +127,7 @@ void SourcePackage::create_targets()
 void SourcePackage::save_caches()
 {
        config.save();
-       deps_cache.save();
+       cache.save();
 }
 
 
@@ -159,6 +159,7 @@ void SourcePackage::Loader::init(const Config::InputOptions *o)
        add("headers",     &Loader::headers);
        add("install",     &Loader::component<Component::INSTALL>);
        add("datafile",    &Loader::component<Component::DATAFILE>);
+       add("source_tarball", &Loader::source_tarball);
        add("tarball",     &Loader::tarball);
        add("tar_file",    &Loader::tar_file);
 }
@@ -267,13 +268,17 @@ void SourcePackage::Loader::if_feature(const string &cond)
                load_sub_with(*this);
 }
 
+void SourcePackage::Loader::source_tarball()
+{
+       load_sub(*obj.source_tarball);
+}
+
 void SourcePackage::Loader::tarball(const string &n)
 {
        if(n=="@src")
        {
-               for(ComponentList::iterator i=obj.components.begin(); i!=obj.components.end(); ++i)
-                       if(i->get_type()==Component::TARBALL && i->get_name()==n)
-                               load_sub(*i);
+               IO::print("%s: Note: Use source_tarball instead of tarball \"@src\"\n", get_source());
+               load_sub(*obj.source_tarball);
        }
        else
        {