Separate the command-line interface into its own class

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index b84b22a58f0a33ea326cfc99845e9363ade5081c..faf3bfe3c062d1948af5dd57c7086f3697ae8465 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -37,11 +37,6 @@ SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &f):
        source_tarball = &components.back();
 }
 
-void SourcePackage::set_build_type(const BuildType &t)
-{
-       build_type = &t;
-}
-
 FS::Path SourcePackage::get_temp_directory() const
 {
        string subdir = builder.get_current_arch().get_name();
@@ -88,6 +83,11 @@ bool SourcePackage::match_feature(const string &cond) const
        }
 }
 
+void SourcePackage::set_build_type(const BuildType &t)
+{
+       build_type = &t;
+}
+
 void SourcePackage::do_prepare()
 {
        BuildInfo final_build_info;
@@ -174,7 +174,7 @@ void SourcePackage::Loader::init(const Config::InputOptions *o)
        add("headers",     &Loader::headers);
        add("install",     &Loader::component<Component::INSTALL>);
        add("interface_version", &Loader::interface_version);
-       add("datafile",    &Loader::component<Component::DATAFILE>);
+       add("datapack",    &Loader::component<Component::DATAPACK>);
        add("source_tarball", &Loader::source_tarball);
        add("tarball",     &Loader::tarball);
        add("tar_file",    &Loader::tar_file);