X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=faf3bfe3c062d1948af5dd57c7086f3697ae8465;hb=d334fc1d04b7f83c7a2e9f16439fec884f4de471;hp=cb4f978aedba7c6e61c5fb4f8719e67e05f0123f;hpb=5ed38947b3fabd977a7f68b512115fe1456ea096;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index cb4f978..faf3bfe 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -37,12 +37,7 @@ 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_dir() const
+FS::Path SourcePackage::get_temp_directory() const
 {
 	string subdir = builder.get_current_arch().get_name();
 	if(build_type)
@@ -58,7 +53,7 @@ FS::Path SourcePackage::get_temp_dir() const
 		return source_dir/temp/subdir;
 }
 
-FS::Path SourcePackage::get_out_dir() const
+FS::Path SourcePackage::get_output_directory() const
 {
 	const Architecture &arch = builder.get_current_arch();
 	if(arch.is_native())
@@ -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);