X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=bb239b22b7d60cc83e1486aa1860aa4666a37258;hb=3f541fceb5aeb5d685ceb2363ebbca1cb1c3eb84;hp=4f42051e6b654d9baac64fabde7bb44e479e6ebe;hpb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 4f42051..bb239b2 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -5,6 +5,8 @@
 #include "binarypackage.h"
 #include "builder.h"
 #include "misc.h"
+#include "pkgconfigfile.h"
+#include "tool.h"
 #include "sourcepackage.h"
 
 using namespace std;
@@ -21,55 +23,44 @@ bool component_sort(const Component &c1, const Component &c2)
 SourcePackage::SourcePackage(Builder &b, const string &n, const FS::Path &s):
 	Package(b, n),
 	source(s),
+	build_type(0),
 	config(*this),
 	deps_cache(*this)
 {
-	components.push_back(Component(*this, Component::TARBALL, "@src"));
-}
+	config.load();
 
-FS::Path SourcePackage::get_temp_dir() 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;
+	components.push_back(Component(*this, Component::TARBALL, "@src"));
 }
 
-FS::Path SourcePackage::get_out_dir() const
+void SourcePackage::set_build_type(const BuildType &t)
 {
-	const Architecture &arch = builder.get_current_arch();
-	if(arch.is_native())
-		return source/config.get_option("outdir").value;
-	else
-		return source/arch.get_name()/config.get_option("outdir").value;
+	build_type = &t;
 }
 
-unsigned SourcePackage::get_install_flags()
+FS::Path SourcePackage::get_temp_dir() 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;
-		}
+	string subdir = builder.get_current_arch().get_name();
+	if(build_type)
+	{
+		subdir += '.';
+		subdir += build_type->get_name();
+	}
 
-	return flags;
+	const FS::Path &temp = builder.get_temp_directory();
+	if(temp.is_absolute())
+		return temp/name/subdir;
+	else
+		return source/temp/subdir;
 }
 
-LibMode SourcePackage::get_library_mode() const
+FS::Path SourcePackage::get_out_dir() 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;
+	const Architecture &arch = builder.get_current_arch();
+	string detail = (build_type ? build_type->get_name() : string());
+	if(arch.is_native())
+		return source/detail;
 	else
-		throw runtime_error("unknown library mode");
+		return source/arch.get_name()/detail;
 }
 
 string SourcePackage::expand_string(const string &str) const
@@ -120,31 +111,13 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
 {
 	init_config();
 
-	StringMap::const_iterator prof = opts.find("profile");
-	if(prof!=opts.end() && flag)
-		config.select_profile(prof->second);
-	else
-		config.select_last_profile();
+	config.load();
 
 	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();
-	}
+		builder.get_logger().log("configure", format("Configuration of %s changed", name));
 
 	config.finish();
 
-	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);
-		}
-
 	for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
 	{
 		BinaryPackage *bpkg = dynamic_cast<BinaryPackage *>(*i);
@@ -160,17 +133,6 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned 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);
@@ -181,44 +143,29 @@ void SourcePackage::init_config()
 
 void SourcePackage::create_build_info()
 {
-	build_info.add(builder.get_current_arch().get_build_info());
+	if(build_type)
+		build_info.update_from(build_type->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());
 
-	unsigned flags = get_install_flags();
-
 	build_info.incpath.push_back((builder.get_prefix()/"include").str());
 	build_info.libpath.push_back((builder.get_prefix()/"lib").str());
 
-	if(flags&INCLUDE)
-		export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
-	if(flags&LIB)
-		export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
+	bool export_paths = false;
+	for(ComponentList::const_iterator i=components.begin(); (!export_paths && i!=components.end()); ++i)
+		export_paths = (i->get_type()==Component::LIBRARY);
 
-	string optimize = config.get_option("optimize").value;
-	if(!optimize.empty() && optimize!="0")
+	if(export_paths)
 	{
-		build_info.cflags.push_back("-O"+optimize);
-		build_info.ldflags.push_back("-O"+optimize);
-	}
-
-	if(lexical_cast<bool>(config.get_option("debug").value))
-	{
-		build_info.cflags.push_back("-ggdb");
-		build_info.defines.push_back("DEBUG");
+		export_binfo.incpath.push_back((builder.get_prefix()/"include").str());
+		export_binfo.libpath.push_back((builder.get_prefix()/"lib").str());
 	}
 
 	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.add(i->get_build_info());
-
-	build_info.unique();
+			build_info.defines["WITH_"+toupper(i->name)] = "1";
 
 	for(list<Component>::iterator i=components.begin(); i!=components.end(); ++i)
 	{
@@ -226,23 +173,58 @@ void SourcePackage::create_build_info()
 		if(i->get_type()==Component::LIBRARY)
 			export_binfo.libs.push_back(i->get_name());
 	}
+}
 
-	export_binfo.unique();
+void SourcePackage::create_targets()
+{
+	bool pc_needed = false;
+	for(ComponentList::const_iterator i=components.begin(); i!=components.end(); ++i)
+	{
+		i->create_targets();
+		if(i->get_type()==Component::LIBRARY)
+			pc_needed = true;
+	}
+
+	if(pc_needed)
+	{
+		PkgConfigFile *pc = new PkgConfigFile(builder, *this);
+		builder.get_target("install")->add_depend(*builder.get_toolchain().get_tool("CP").create_target(*pc));
+	}
+}
+
+void SourcePackage::save_caches()
+{
+	config.save();
+	deps_cache.save();
 }
 
 
-SourcePackage::Loader::Loader(Package &p):
-	Package::Loader(p)
+SourcePackage::Loader::Loader(SourcePackage &p):
+	DataFile::DerivedObjectLoader<SourcePackage, Package>(p)
 {
+	init(0);
+}
+
+SourcePackage::Loader::Loader(SourcePackage &p, const Config::InputOptions &o):
+	DataFile::DerivedObjectLoader<SourcePackage, Package>(p)
+{
+	init(&o);
+}
+
+void SourcePackage::Loader::init(const Config::InputOptions *o)
+{
+	options = o;
 	add("version",     &SourcePackage::version);
 	add("description", &SourcePackage::description);
 	add("build_info",  &Loader::build_info);
 	add("feature",     &Loader::feature);
 	add("if",          &Loader::condition);
+	add("if_arch",     &Loader::if_arch);
+	add("if_feat",     &Loader::if_feature);
 	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("headers",     &Loader::headers);
 	add("install",     &Loader::component<Component::INSTALL>);
 	add("datafile",    &Loader::component<Component::DATAFILE>);
 	add("tarball",     &Loader::tarball);
@@ -251,8 +233,22 @@ SourcePackage::Loader::Loader(Package &p):
 
 void SourcePackage::Loader::finish()
 {
-	SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
-	spkg.components.sort(component_sort);
+	obj.components.sort(component_sort);
+
+	for(map<string, string>::const_iterator i=install_map.begin(); i!=install_map.end(); ++i)
+	{
+		for(ComponentList::iterator j=obj.components.begin(); j!=obj.components.end(); ++j)
+		{
+			const StringList &sources = j->get_sources();
+			for(StringList::const_iterator k=sources.begin(); k!=sources.end(); ++k)
+			{
+				if(!i->first.compare(0, k->size(), *k))
+				{
+					const_cast<InstallMap &>(j->get_install_map()).add_mapping(obj.source/i->first, i->second);
+				}
+			}
+		}
+	}
 }
 
 void SourcePackage::Loader::feature(const string &n, const string &d)
@@ -261,43 +257,95 @@ void SourcePackage::Loader::feature(const string &n, const string &d)
 	feat.descr = d;
 	feat.def_value = "no";
 	load_sub(feat);
-	static_cast<SourcePackage &>(pkg).features.push_back(feat);
+	obj.features.push_back(feat);
+	string config_key = "with_"+feat.name;
+	obj.config.add_option(config_key, feat.def_value, feat.descr);
+	if(options)
+	{
+		Config::InputOptions::const_iterator i = options->find(config_key);
+		if(i!=options->end())
+			obj.config.set_option(config_key, i->second);
+	}
 }
 
 void SourcePackage::Loader::condition(const string &c)
 {
-	SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
-	Condition cond(spkg, c);
-	load_sub(cond);
-	spkg.conditions.push_back(cond);
+	IO::print("%s: Note: Old-style conditions are deprecated\n", get_source());
+	Condition cond(obj, c);
+	if(cond.eval())
+		load_sub_with(*this);
 }
 
 template<Component::Type t>
 void SourcePackage::Loader::component(const string &n)
 {
-	SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
-	Component comp(spkg, t, n);
+	Component comp(obj, t, n);
 	load_sub(comp);
-	spkg.components.push_back(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::headers(const string &n)
+{
+	IO::print("%s: Note: headers components are deprecated\n", get_source());
+	Component comp(obj, Component::LIBRARY, n);
+	load_sub(comp);
+	const StringList &sources = comp.get_sources();
+	for(StringList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
+		install_map[*i] = "include/"+comp.get_name();
+}
+
+void SourcePackage::Loader::if_arch(const string &cond)
+{
+	const Architecture &arch = obj.builder.get_current_arch();
+	bool negate = (cond[0]=='!');
+	bool match = (arch.match_name(cond.substr(negate))!=negate);
+	obj.builder.get_logger().log("configure", format("%s: arch %s %smatched", obj.name, cond, (match ? "" : "not ")));
+	if(match)
+		load_sub_with(*this);
+}
+
+void SourcePackage::Loader::if_feature(const string &cond)
+{
+	bool match = false;
+	string::size_type equals = cond.find('=');
+	if(equals!=string::npos)
+	{
+		if(equals==0)
+			error("No feature name specified");
+		bool negate = cond[equals-1]=='!';
+		string name = cond.substr(0, equals-negate);
+		string value = obj.config.get_option("with_"+name).value;
+		match = (value==cond.substr(equals+1))!=negate;
+		value = cond.substr(equals+1);
+	}
+	else
+	{
+		bool negate = (cond[0]=='!');
+		string name = cond.substr(negate);
+		string value = obj.config.get_option("with_"+name).value;
+		match = lexical_cast<bool>(value)!=negate;
+	}
+	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::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)
+		for(ComponentList::iterator i=obj.components.begin(); i!=obj.components.end(); ++i)
 			if(i->get_type()==Component::TARBALL && i->get_name()==n)
 				load_sub(*i);
 	}
 	else
 	{
-		Component trbl(spkg, Component::TARBALL, n);
+		Component trbl(obj, Component::TARBALL, n);
 		load_sub(trbl);
 	}
 }
@@ -305,8 +353,7 @@ void SourcePackage::Loader::tarball(const string &n)
 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);
-	for(ComponentList::iterator i=spkg.components.begin(); i!=spkg.components.end(); ++i)
+	for(ComponentList::iterator i=obj.components.begin(); i!=obj.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());
+			const_cast<StringList &>(i->get_sources()).push_back((obj.source/f).str());
 }