X-Git-Url: http://git.tdb.fi/?p=builder.git;a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=9738146423de46bc9152b7bdfac60f6734a8b639;hp=1dd7dbd1062263b91f71bc7fd0cd007cd28e8f97;hb=11b4732f81396aa3d8b0fc8928b8e1981032e743;hpb=35f2979869bff43706f3163ec0979c7084aaa3c4

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 1dd7dbd..9738146 100644
--- 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()
@@ -169,7 +169,8 @@ void SourcePackage::Loader::init(const Config::InputOptions *o)
 	add("install",     &Loader::component<InstallComponent>);
 	add("interface_version", &Loader::interface_version);
 	add("datapack",    &Loader::component<DataPackComponent>);
-	add("source_tarball", &Loader::source_tarball);
+	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)