Distributed under the LGPL
*/
-#include <iostream>
+#include <msp/io/print.h>
#include <msp/strings/lexicalcast.h>
#include <msp/strings/utils.h>
#include "binarypackage.h"
using namespace std;
using namespace Msp;
+namespace {
+
+bool component_sort(const Component &c1, const Component &c2)
+{ return c1.get_type()<c2.get_type(); }
+
+}
+
+
SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &s):
Package(b, n),
source(s),
config(*this),
deps_cache(*this)
{
- tar_files.push_back(source/"Build");
+ components.push_back(Component(*this, Component::TARBALL, "@src"));
}
-Msp::FS::Path SourcePackage::get_temp_dir() const
+FS::Path SourcePackage::get_temp_dir() const
{
return source/config.get_option("tempdir").value/builder.get_current_arch().get_name()/config.get_option("profile").value;
}
-Msp::FS::Path SourcePackage::get_out_dir() const
+FS::Path SourcePackage::get_out_dir() const
{
const Architecture &arch=builder.get_current_arch();
if(arch.is_native())
if(flag && config.update(opts))
{
if(builder.get_verbose()>=2)
- cout<<"Configuration of "<<name<<" changed\n";
+ IO::print("Configuration of %s changed\n", name);
if(!builder.get_dry_run())
config.save();
}
add("library", &Loader::library);
add("module", &Loader::module);
add("headers", &Loader::headers);
+ add("tarball", &Loader::tarball);
add("tar_file", &Loader::tar_file);
}
+void SourcePackage::Loader::finish()
+{
+ SourcePackage &spkg=static_cast<SourcePackage &>(pkg);
+ spkg.components.sort(component_sort);
+}
+
void SourcePackage::Loader::feature(const string &n, const string &d)
{
static_cast<SourcePackage &>(pkg).features.push_back(Feature(n, d));
load_sub(static_cast<SourcePackage &>(pkg).build_info);
}
+void SourcePackage::Loader::tarball(const string &n)
+{
+ SourcePackage &spkg=static_cast<SourcePackage &>(pkg);
+ if(n=="@src")
+ {
+ for(ComponentList::iterator i=spkg.components.begin(); i!=spkg.components.end(); ++i)
+ if(i->get_type()==Component::TARBALL && i->get_name()==n)
+ load_sub(*i);
+ }
+ else
+ {
+ Component trbl(spkg, Component::TARBALL, n);
+ load_sub(trbl);
+ }
+}
+
void SourcePackage::Loader::tar_file(const string &f)
{
+ IO::print("%s: Note: tar_file is deprecated\n", get_source());
SourcePackage &spkg=static_cast<SourcePackage &>(pkg);
- spkg.tar_files.push_back(spkg.source/f);
+ for(ComponentList::iterator i=spkg.components.begin(); i!=spkg.components.end(); ++i)
+ if(i->get_type()==Component::TARBALL && i->get_name()=="@src")
+ const_cast<PathList &>(i->get_sources()).push_back(spkg.source/f);
}