From: Mikko Rasa Date: Thu, 19 Jul 2012 12:53:37 +0000 (+0300) Subject: Better way of specifying the source tarball in Build files X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=5b7f561504df231c23ecd9b6f3b3847cfe0cbd1f;p=builder.git Better way of specifying the source tarball in Build files --- diff --git a/Build b/Build index d51fa01..9e7ee86 100644 --- a/Build +++ b/Build @@ -15,7 +15,7 @@ package "builder" install true; }; - tarball "@src" + source_tarball { source "bootstrap.sh"; source "Readme.txt"; diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp index ea63655..e74c0b7 100644 --- 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); add("datafile", &Loader::component); + 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 { diff --git a/source/sourcepackage.h b/source/sourcepackage.h index 97c9b32..bdcba47 100644 --- a/source/sourcepackage.h +++ b/source/sourcepackage.h @@ -48,6 +48,7 @@ public: void headers(const std::string &); void if_arch(const std::string &); void if_feature(const std::string &); + void source_tarball(); void tarball(const std::string &); void tar_file(const std::string &); }; @@ -64,6 +65,7 @@ private: FeatureList features; BuildInfo build_info; ComponentList components; + Component *source_tarball; Config config; mutable Cache cache;