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

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index f59b353..2371d2c 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;
@@ -51,9 +53,7 @@ unsigned SourcePackage::get_install_flags()
 			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;
+				flags |= LIB|INCLUDE;
 		}
 
 	return flags;
@@ -128,8 +128,7 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
 
 	if(flag && config.update(opts))
 	{
-		if(builder.get_verbose()>=2)
-			IO::print("Configuration of %s changed\n", name);
+		builder.get_logger().log("configure", format("Configuration of %s changed", name));
 		if(!builder.get_dry_run())
 			config.save();
 	}
@@ -141,7 +140,7 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
 		{
 			const StringList &reqs = i->get_requires();
 			for(StringList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
-				if(Package *pkg = builder.get_package(*j))
+				if(Package *pkg = builder.get_package_manager().find_package(*j))
 					requires.push_back(pkg);
 		}
 
@@ -181,8 +180,6 @@ void SourcePackage::init_config()
 
 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());
@@ -200,39 +197,54 @@ void SourcePackage::create_build_info()
 	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);
+		if(optimize=="s" || optimize=="size")
+			build_info.optimize = -1;
+		else
+			build_info.optimize = lexical_cast<unsigned>(optimize);
 	}
 
 	if(lexical_cast<bool>(config.get_option("debug").value))
 	{
-		build_info.cflags.push_back("-ggdb");
-		build_info.defines.push_back("DEBUG");
+		build_info.debug = true;
+		build_info.defines["DEBUG"] = "1";
 	}
 
 	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));
+			build_info.defines["WITH_"+toupper(i->name)] = "1";
 
 	for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i)
 		if(i->eval())
 			build_info.update_from(i->get_build_info());
 
-	build_info.unique();
-
 	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());
 	}
+}
+
+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;
+	}
 
-	export_binfo.unique();
+	if(pc_needed)
+	{
+		PkgConfigFile *pc = new PkgConfigFile(builder, *this);
+		builder.get_target("install")->add_depend(*builder.get_toolchain().get_tool("CP").create_target(*pc));
+	}
 }
 
 
-SourcePackage::Loader::Loader(Package &p):
-	Package::Loader(p)
+SourcePackage::Loader::Loader(SourcePackage &p):
+	DataFile::DerivedObjectLoader<SourcePackage, Package>(p)
 {
 	add("version",     &SourcePackage::version);
 	add("description", &SourcePackage::description);
@@ -242,7 +254,7 @@ SourcePackage::Loader::Loader(Package &p):
 	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 +263,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 +287,50 @@ 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);
 }
 
 void SourcePackage::Loader::condition(const string &c)
 {
-	SourcePackage &spkg = static_cast<SourcePackage &>(pkg);
-	Condition cond(spkg, c);
+	Condition cond(obj, c);
 	load_sub(cond);
-	spkg.conditions.push_back(cond);
+	obj.conditions.push_back(cond);
 }
 
 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::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 +338,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());
 }