Not all tools can create sources

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index ea63655368b7eadc60b9c4fcdc0335c25f83f18f..e74c0b7540c409fd07e0ed3048dd7ee167da3be4 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -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)
@@ -158,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);
 }
@@ -266,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
        {