add("generate", &Loader::generate);
add("install", &Loader::component<InstallComponent>);
add("interface_version", &Loader::interface_version);
- 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("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);
other components wil be created first */
auto i = find(obj.components, obj.source_archive);
if(i!=obj.components.end())
- obj.components.splice(obj.components.end(), obj.components, i);
+ {
+ obj.components.erase(i);
+ obj.components.push_back(obj.source_archive);
+ }
}
void SourcePackage::Loader::feature(const string &n, const string &d)
obj.components.push_back(comp);
}
-template<typename C, typename A, A a>
-void SourcePackage::Loader::component_arg(const string &n)
+template<typename C, typename A>
+void SourcePackage::Loader::component_arg(A a, const string &n)
{
C *comp = new C(obj, n, a);
load_sub(*comp);