#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;
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()
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);
}
{
/* 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);
}
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)