A bunch of minor cleanups

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 1dd7dbd1062263b91f71bc7fd0cd007cd28e8f97..274230076599f9a78e890514126dbdedc9e5a3ce 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -13,10 +13,10 @@
 #include "file.h"
 #include "installcomponent.h"
 #include "pkgconfigfile.h"
-#include "tarballcomponent.h"
-#include "tool.h"
+#include "sourcearchivecomponent.h"
 #include "sourcegenerator.h"
 #include "sourcepackage.h"
+#include "tool.h"
 
 using namespace std;
 using namespace Msp;
@@ -33,8 +33,8 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &f):
        build_file = builder.get_vfs().get_target(f);
        if(!build_file)
                build_file = new File(builder, *this, f);
-       source_tarball = new TarballComponent(*this, "@src");
-       components.push_back(source_tarball);
+       source_archive = new SourceArchiveComponent(*this);
+       components.push_back(source_archive);
 }
 
 SourcePackage::~SourcePackage()
@@ -158,18 +158,19 @@ SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o):
 void SourcePackage::Loader::init(const Config::InputOptions *o)
 {
        options = o;
-       add("description", &SourcePackage::description);
        add("build_info",  &Loader::build_info);
+       add("datapack",    &Loader::component<DataPackComponent>);
+       add("description", &SourcePackage::description);
        add("feature",     &Loader::feature);
        add("generate",    &Loader::generate);
        add("if_feature",  &Loader::if_feature);
-       add("program",     &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::PROGRAM>);
-       add("library",     &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::LIBRARY>);
-       add("module",      &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::MODULE>);
        add("install",     &Loader::component<InstallComponent>);
        add("interface_version", &Loader::interface_version);
-       add("datapack",    &Loader::component<DataPackComponent>);
-       add("source_tarball", &Loader::source_tarball);
+       add("library",     &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::LIBRARY>);
+       add("module",      &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::MODULE>);
+       add("program",     &Loader::component_arg<BinaryComponent, BinaryComponent::Type, BinaryComponent::PROGRAM>);
+       add("source_archive", &Loader::source_archive);
+       add("source_tarball", &Loader::source_archive);
        add("tarball",     &Loader::tarball);
        add("version",     &Loader::version);
 }
@@ -178,7 +179,7 @@ void SourcePackage::Loader::finish()
 {
        /* Make sure the source tarball is last in the list so targets from all
        other components wil be created first */
-       ComponentList::iterator i = find(obj.components.begin(), obj.components.end(), obj.source_tarball);
+       ComponentList::iterator i = find(obj.components.begin(), obj.components.end(), obj.source_archive);
        if(i!=obj.components.end())
                obj.components.splice(obj.components.end(), obj.components, i);
 }
@@ -243,15 +244,14 @@ void SourcePackage::Loader::interface_version(const string &v)
                obj.version = v;
 }
 
-void SourcePackage::Loader::source_tarball()
+void SourcePackage::Loader::source_archive()
 {
-       load_sub(*obj.source_tarball);
+       load_sub(*obj.source_archive);
 }
 
-void SourcePackage::Loader::tarball(const string &n)
+void SourcePackage::Loader::tarball(const string &)
 {
-       TarballComponent trbl(obj, n);
-       load_sub(trbl);
+       IO::print("%s: Deprecated tarball component ignored\n", get_source());
 }
 
 void SourcePackage::Loader::version(const string &v)