From: Mikko Rasa <tdb@tdb.fi>
Date: Tue, 5 May 2009 19:44:22 +0000 (+0000)
Subject: Deprecate the install_headers statement
X-Git-Tag: 1.0~16
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=96e132661ec82c9347f9155d3f30cd99ea8eca47;p=builder.git

Deprecate the install_headers statement
Use the headers component name as install location
---

diff --git a/source/component.cpp b/source/component.cpp
index dd33941..338b44f 100644
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -5,6 +5,7 @@ Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <iostream>
 #include <msp/core/except.h>
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
@@ -109,7 +110,7 @@ void Component::create_targets() const
 				hdr=new Header(builder, this, i->str());
 
 			// Install headers if requested
-			if(!install_headers.empty())
+			if(type==HEADERS && install)
 				inst_tgts.push_back(hdr);
 		}
 	}
@@ -174,7 +175,7 @@ Component::Loader::Loader(Component &c):
 {
 	add("source",          &Loader::source);
 	add("install",         &Component::install);
-	add("install_headers", &Component::install_headers);
+	add("install_headers", &Loader::install_headers);
 	add("build_info",      &Loader::build_info);
 	add("require",         &Loader::require);
 	add("modular",         &Loader::modular);
@@ -182,6 +183,17 @@ Component::Loader::Loader(Component &c):
 	add("default",         &Component::deflt);
 }
 
+void Component::Loader::finish()
+{
+	if(!inst_hdr.empty())
+	{
+		Component hdrcomp(comp.pkg, HEADERS, inst_hdr);
+		hdrcomp.sources=comp.sources;
+		hdrcomp.install=true;
+		const_cast<ComponentList &>(comp.pkg.get_components()).push_back(hdrcomp);
+	}
+}
+
 void Component::Loader::source(const string &s)
 {
 	comp.sources.push_back(comp.pkg.get_source()/s);
@@ -216,6 +228,18 @@ void Component::Loader::host(const string &n)
 	throw Msp::Exception("Unknown component");
 }
 
+void Component::Loader::install_headers(const string &p)
+{
+	cout<<get_source()<<": Note: install_headers is deprecated\n";
+	if(comp.type==HEADERS)
+	{
+		comp.name=p;
+		comp.install=true;
+	}
+	else
+		inst_hdr=p;
+}
+
 void Component::Loader::build_info()
 {
 	load_sub(comp.build_info);
diff --git a/source/component.h b/source/component.h
index ce4a821..899abc3 100644
--- a/source/component.h
+++ b/source/component.h
@@ -30,15 +30,18 @@ public:
 	{
 	private:
 		Component &comp;
+		std::string inst_hdr;
 
 	public:
 		Loader(Component &);
 		Component &get_object() { return comp; }
 	private:
+		virtual void finish();
 		void source(const std::string &);
 		void require(const std::string &);
 		void modular();
 		void host(const std::string &);
+		void install_headers(const std::string &);
 		void build_info();
 	};
 
@@ -56,7 +59,6 @@ protected:
 	std::string name;
 	PathList sources;
 	bool install;
-	std::string install_headers;
 	const Component *module_host;
 	bool modular;
 	BuildInfo build_info;
@@ -71,7 +73,6 @@ public:
 	const PathList &get_sources() const { return sources; }
 	const BuildInfo &get_build_info() const { return build_info; }
 	bool get_install() const { return install; }
-	const std::string &get_install_headers() const { return install_headers; }
 	bool get_modular() const { return modular; }
 	const PackageList &get_requires() const { return requires; }
 	bool get_default() const { return deflt; }
diff --git a/source/install.cpp b/source/install.cpp
index 1eb510e..d80f9a7 100644
--- a/source/install.cpp
+++ b/source/install.cpp
@@ -51,7 +51,11 @@ FS::Path Install::generate_target_path(const FileTarget &tgt)
 
 	string mid;
 	if(const Header *hdr=dynamic_cast<const Header *>(&tgt))
-		mid="include/"+hdr->get_component()->get_install_headers();
+	{
+		if(hdr->get_component()->get_type()!=Component::HEADERS)
+			throw Exception("Header install from non-header component?");
+		mid="include/"+hdr->get_component()->get_name();
+	}
 	else if(dynamic_cast<const Executable *>(&tgt))
 		mid="bin";
 	else if(const SharedLibrary *shlib=dynamic_cast<const SharedLibrary *>(&tgt))
diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 4edb702..432575f 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -43,17 +43,15 @@ unsigned SourcePackage::get_install_flags()
 {
 	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;
 		}
-		if(!i->get_install_headers().empty())
-			flags|=INCLUDE;
-	}
 
 	return flags;
 }