X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=274230076599f9a78e890514126dbdedc9e5a3ce;hb=276a7c7c046a8f1b692cecbd53f17595ed23264d;hp=f59b353d74d0c3edd5dc6e52409e61c9083fab64;hpb=3e8bf5032e744b5fc3e7680af48f2abacc67addc;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index f59b353..2742300 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -1,312 +1,266 @@
+#include <algorithm>
 #include <cstdlib>
+#include <msp/core/maputils.h>
+#include <msp/fs/utils.h>
 #include <msp/io/print.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
+#include "binarycomponent.h"
 #include "binarypackage.h"
+#include "booleanevaluator.h"
 #include "builder.h"
-#include "misc.h"
+#include "datapackcomponent.h"
+#include "file.h"
+#include "installcomponent.h"
+#include "pkgconfigfile.h"
+#include "sourcearchivecomponent.h"
+#include "sourcegenerator.h"
 #include "sourcepackage.h"
+#include "tool.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 &f):
+	Package(b, n),
+	source_dir(FS::dirname(f)),
+	build_type(0),
+	config(*this),
+	cache(*this)
+{
+	config.load();
 
+	build_file = builder.get_vfs().get_target(f);
+	if(!build_file)
+		build_file = new File(builder, *this, f);
+	source_archive = new SourceArchiveComponent(*this);
+	components.push_back(source_archive);
 }
 
-
-SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &s):
-	Package(b, n),
-	source(s),
-	config(*this),
-	deps_cache(*this)
+SourcePackage::~SourcePackage()
 {
-	components.push_back(Component(*this, Component::TARBALL, "@src"));
+	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
+		delete *i;
 }
 
-FS::Path SourcePackage::get_temp_dir() const
+FS::Path SourcePackage::get_temp_directory() const
 {
-	string subdir = format("%s.%s", builder.get_current_arch().get_name(), config.get_option("profile").value);
-	return source/config.get_option("tempdir").value/subdir;
+	string subdir = builder.get_current_arch().get_name();
+	if(build_type)
+	{
+		subdir += '.';
+		subdir += build_type->get_name();
+	}
+
+	const FS::Path &temp = builder.get_temp_directory();
+	if(temp.is_absolute())
+		return temp/name/subdir;
+	else
+		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())
-		return source/config.get_option("outdir").value;
+		return source_dir;
 	else
-		return source/arch.get_name()/config.get_option("outdir").value;
+		return source_dir/arch.get_name();
 }
 
-unsigned SourcePackage::get_install_flags()
+const Component &SourcePackage::get_component(const string &n) const
 {
-	unsigned flags = 0;
-	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
-		if(i->get_install())
-		{
-			if(i->get_type()==Component::PROGRAM)
-				flags |= BIN;
-			else if(i->get_type()==Component::LIBRARY || i->get_type()==Component::MODULE)
-				flags |= LIB;
-			else if(i->get_type()==Component::HEADERS)
-				flags |= INCLUDE;
-		}
-
-	return flags;
+	for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
+		if((*i)->get_name()==n)
+			return **i;
+	throw key_error(n);
 }
 
-LibMode SourcePackage::get_library_mode() const
+bool SourcePackage::match_feature(const string &feat, const string *comp) const
 {
-	const string &mode = config.get_option("staticlibs").value;
-	if(mode=="all")
-		return ALL_STATIC;
-	else if(mode=="local")
-		return LOCAL_STATIC;
-	else if(mode=="none")
-		return DYNAMIC;
+	string value = config.get_option("with_"+feat).value;
+	if(comp)
+		return value==*comp;
 	else
-		throw runtime_error("unknown library mode");
+		return lexical_cast<bool>(value);
 }
 
-string SourcePackage::expand_string(const string &str) const
+void SourcePackage::set_build_type(const BuildType &t)
 {
-	string result = str;
-	string::size_type dollar = 0;
-	unsigned n = 0;
-	while((dollar = result.find('$'))!=string::npos)
-	{
-		if(n>1000)
-			throw bad_expansion("nested too deep");
-
-		string::size_type end;
-		string var;
-		if(dollar+1<result.size() && result[dollar+1]=='{')
-		{
-			end = result.find('}', dollar+2);
-			if(end==string::npos)
-				throw bad_expansion("unterminated variable reference");
-			var = result.substr(dollar+2, end-dollar-2);
-			++end;
-		}
-		else
-		{
-			for(end=dollar+1; (isalnum(result[end]) || result[end]=='_'); ++end) ;
-			var = result.substr(dollar+1, end-dollar-1);
-		}
-
-		string value;
-		if(config.is_option(var))
-			value = config.get_option(var).value;
-		else if(var=="arch")
-			value = builder.get_current_arch().get_name();
-		else if(var=="system")
-			value = builder.get_current_arch().get_system();
-		else if(const char *ptr = getenv(var.c_str()))
-			value = ptr;
-
-		result.replace(dollar, end-dollar, value);
-
-		++n;
-	}
-
-	return result;
+	build_type = &t;
 }
 
-void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
+void SourcePackage::do_prepare()
 {
-	init_config();
-
-	StringMap::const_iterator prof = opts.find("profile");
-	if(prof!=opts.end() && flag)
-		config.select_profile(prof->second);
-	else
-		config.select_last_profile();
+	BuildInfo final_build_info;
 
-	if(flag && config.update(opts))
-	{
-		if(builder.get_verbose()>=2)
-			IO::print("Configuration of %s changed\n", name);
-		if(!builder.get_dry_run())
-			config.save();
-	}
+	if(build_type)
+		final_build_info.update_from(build_type->get_build_info());
 
-	config.finish();
+	final_build_info.update_from(build_info);
+	build_info = final_build_info;
 
-	for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i)
-		if(i->eval())
-		{
-			const StringList &reqs = i->get_requires();
-			for(StringList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
-				if(Package *pkg = builder.get_package(*j))
-					requires.push_back(pkg);
-		}
+	build_info.incpath.push_back((builder.get_prefix()/"include").str());
+	build_info.libpath.push_back((builder.get_prefix()/"lib").str());
 
-	for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
+	for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
 	{
-		BinaryPackage *bpkg = dynamic_cast<BinaryPackage *>(*i);
-		if(bpkg && bpkg->get_need_path())
-			bpkg->set_path(config.get_option(bpkg->get_name()+"_path").value);
+		string ident = "WITH_"+toupper(i->name);
+		string value = config.get_option("with_"+i->name).value;
+		if(!i->choices.empty())
+			build_info.defines[ident] = value;
+		else if(lexical_cast<bool>(value))
+			build_info.defines[ident] = "1";
 	}
 
-	deps_cache.load();
-
 	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
-		i->configure(opts, flag);
-}
-
-void SourcePackage::init_config()
-{
-	config.add_option("profile",    "default", "Configuration profile");
-	config.add_option("tempdir",    "temp",    "Directory for storing temporary files");
-	config.add_option("outdir",     ".",       "Directory to put build results in");
-	config.add_option("optimize",   "0",       "Compiler optimization level");
-	config.add_option("strip",      "no",      "Strip symbols from programs");
-	config.add_option("debug",      "no",      "Produce debugging symbols");
-	config.add_option("staticlibs", "local",   "Use static libraries");
-
-	for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
-		config.add_option("with_"+i->name, i->def_value, i->descr);
-
-	for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
 	{
-		BinaryPackage *bpkg = dynamic_cast<BinaryPackage *>(*i);
-		if(bpkg && bpkg->get_need_path())
-			config.add_option(bpkg->get_name()+"_path", "/usr", "Path for "+bpkg->get_name());
-	}
-}
+		(*i)->prepare();
+		(*i)->create_build_info();
 
-void SourcePackage::create_build_info()
-{
-	build_info.update_from(builder.get_current_arch().get_build_info());
-
-	// XXX Currently, a package-specific settings will override cmdline.  This might or might not be desirable.
-	const StringList &warnings = builder.get_warnings();
-	build_info.warnings.insert(build_info.warnings.begin(), warnings.begin(), warnings.end());
+		(*i)->update_exported_build_info(export_binfo);
+	}
 
-	unsigned flags = get_install_flags();
+	cache.load();
 
-	build_info.incpath.push_back((builder.get_prefix()/"include").str());
-	build_info.libpath.push_back((builder.get_prefix()/"lib").str());
+	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
+		(*i)->create_targets();
 
-	if(flags&INCLUDE)
+	if(!export_binfo.libs.empty())
+	{
 		export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
-	if(flags&LIB)
 		export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
 
-	string optimize = config.get_option("optimize").value;
-	if(!optimize.empty() && optimize!="0")
-	{
-		build_info.cflags.push_back("-O"+optimize);
-		build_info.ldflags.push_back("-O"+optimize);
+		PkgConfigFile *pc = new PkgConfigFile(builder, *this);
+		builder.get_build_graph().get_target("install")->add_dependency(*builder.get_toolchain().get_tool("CP").create_target(*pc));
 	}
+}
 
-	if(lexical_cast<bool>(config.get_option("debug").value))
-	{
-		build_info.cflags.push_back("-ggdb");
-		build_info.defines.push_back("DEBUG");
-	}
-
-	for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
-		if(lexical_cast<bool>(config.get_option("with_"+i->name).value))
-			build_info.cflags.push_back("-DWITH_"+toupper(i->name));
-
-	for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i)
-		if(i->eval())
-			build_info.update_from(i->get_build_info());
-
-	build_info.unique();
+void SourcePackage::save_caches()
+{
+	config.save();
+	cache.save();
+}
 
-	for(list<Component>::iterator i=components.begin(); i!=components.end(); ++i)
-	{
-		i->create_build_info();
-		if(i->get_type()==Component::LIBRARY)
-			export_binfo.libs.push_back(i->get_name());
-	}
 
-	export_binfo.unique();
+SourcePackage::Loader::Loader(SourcePackage &p):
+	DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>(p)
+{
+	init(0);
 }
 
+SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o):
+	DataFile::DerivedObjectLoader<SourcePackage, Package::Loader>(p)
+{
+	init(&o);
+}
 
-SourcePackage::Loader::Loader(Package &p):
-	Package::Loader(p)
+void SourcePackage::Loader::init(const Config::InputOptions *o)
 {
-	add("version",     &SourcePackage::version);
-	add("description", &SourcePackage::description);
+	options = o;
 	add("build_info",  &Loader::build_info);
+	add("datapack",    &Loader::component<DataPackComponent>);
+	add("description", &SourcePackage::description);
 	add("feature",     &Loader::feature);
-	add("if",          &Loader::condition);
-	add("program",     &Loader::component<Component::PROGRAM>);
-	add("library",     &Loader::component<Component::LIBRARY>);
-	add("module",      &Loader::component<Component::MODULE>);
-	add("headers",     &Loader::component<Component::HEADERS>);
-	add("install",     &Loader::component<Component::INSTALL>);
-	add("datafile",    &Loader::component<Component::DATAFILE>);
+	add("generate",    &Loader::generate);
+	add("if_feature",  &Loader::if_feature);
+	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("source_archive", &Loader::source_archive);
+	add("source_tarball", &Loader::source_archive);
 	add("tarball",     &Loader::tarball);
-	add("tar_file",    &Loader::tar_file);
+	add("version",     &Loader::version);
 }
 
 void SourcePackage::Loader::finish()
 {
-	SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
-	spkg.components.sort(component_sort);
+	/* 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_archive);
+	if(i!=obj.components.end())
+		obj.components.splice(obj.components.end(), obj.components, i);
 }
 
 void SourcePackage::Loader::feature(const string &n, const string &d)
 {
 	Feature feat(n);
-	feat.descr = d;
-	feat.def_value = "no";
+	feat.description = d;
 	load_sub(feat);
-	static_cast<SourcePackage &>(pkg).features.push_back(feat);
+	obj.features.push_back(feat);
+
+	const Config::Option &opt = obj.config.add_option(feat);
+	if(options)
+	{
+		Config::InputOptions::const_iterator i = options->find(opt.name);
+		if(i!=options->end())
+			obj.config.set_option(opt.name, i->second);
+	}
 }
 
-void SourcePackage::Loader::condition(const string &c)
+template<typename C>
+void SourcePackage::Loader::component(const string &n)
 {
-	SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
-	Condition cond(spkg, c);
-	load_sub(cond);
-	spkg.conditions.push_back(cond);
+	C *comp = new C(obj, n);
+	load_sub(*comp);
+	obj.components.push_back(comp);
 }
 
-template<Component::Type t>
-void SourcePackage::Loader::component(const string &n)
+template<typename C, typename A, A a>
+void SourcePackage::Loader::component_arg(const string &n)
 {
-	SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
-	Component comp(spkg, t, n);
-	load_sub(comp);
-	spkg.components.push_back(comp);
+	C *comp = new C(obj, n, a);
+	load_sub(*comp);
+	obj.components.push_back(comp);
 }
 
 void SourcePackage::Loader::build_info()
 {
-	load_sub(static_cast<SourcePackage &>(pkg).build_info);
+	load_sub(obj.build_info);
 }
 
-void SourcePackage::Loader::tarball(const string &n)
+void SourcePackage::Loader::generate(const string &tag)
 {
-	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);
-	}
+	SourceGenerator *gen = new SourceGenerator(obj.builder, obj, tag);
+	load_sub(*gen);
+	obj.local_tools.add_tool(gen);
 }
 
-void SourcePackage::Loader::tar_file(const string &f)
+void SourcePackage::Loader::if_feature(const string &cond)
 {
-	IO::print("%s: Note: tar_file is deprecated\n", get_source());
-	SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
-	for(ComponentList::iterator i=spkg.components.begin(); i!=spkg.components.end(); ++i)
-		if(i->get_type()==Component::TARBALL && i->get_name()=="@src")
-			const_cast<StringList &>(i->get_sources()).push_back((spkg.source/f).str());
+	BooleanEvaluator eval(sigc::mem_fun(&obj, &SourcePackage::match_feature));
+	bool match = eval.evaluate(cond);
+	obj.builder.get_logger().log("configure", format("%s: feature %s %smatched", obj.name, cond, (match ? "" : "not ")));
+	if(match)
+		load_sub_with(*this);
+}
+
+void SourcePackage::Loader::interface_version(const string &v)
+{
+	obj.interface_version = v;
+	if(obj.version.empty())
+		obj.version = v;
+}
+
+void SourcePackage::Loader::source_archive()
+{
+	load_sub(*obj.source_archive);
+}
+
+void SourcePackage::Loader::tarball(const string &)
+{
+	IO::print("%s: Deprecated tarball component ignored\n", get_source());
+}
+
+void SourcePackage::Loader::version(const string &v)
+{
+	obj.version = v;
+
+	string::size_type i = 0;
+	for(unsigned dots=0; i<obj.version.size(); ++i)
+		if(obj.version[i]=='.' && ++dots>=2)
+			break;
+	obj.interface_version = obj.version.substr(0, i);
 }