X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackage.cpp;h=14d2321e26964229a04d68cc72716b791bc15978;hb=1a46151c99a406123c4ddfc797a7841baf3e4cc2;hp=58611800db87bc510db83997daddc0d352499cc0;hpb=683301f94f4a3c5b7e2a7f21087f4185b07c4858;p=builder.git

diff --git a/source/package.cpp b/source/package.cpp
index 5861180..14d2321 100644
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -7,50 +7,27 @@
 using namespace std;
 using namespace Msp;
 
-PackageRef::PackageRef(Builder &b, const string &n):
-	builder(b),
-	name(n),
-	package(0)
-{ }
-
-Package *PackageRef::resolve()
-{
-	if(!package)
-		package=builder.get_package(name);
-	return package;
-}
+#include <iostream>
 
 Package::Package(Builder &b, const string &n, const Path::Path &s):
 	builder(b),
 	name(n),
-	source(s),
 	buildable(true),
+	source(s),
 	build_info_ready(false)
 { }
 
-Package::Package(Builder &b, const string &n, const vector<string> &info):
-	builder(b),
-	name(n),
-	buildable(false),
-	build_info_ready(true)
+void Package::set_path(const Msp::Path::Path &p)
 {
-	for(vector<string>::const_iterator i=info.begin(); i!=info.end(); ++i)
-	{
-		if(!i->compare(0, 2, "-I"))
-			export_binfo.incpath.push_back(i->substr(2));
-		else if(!i->compare(0, 2, "-D"))
-			export_binfo.defines.push_back(i->substr(2));
-		else if(!i->compare(0, 2, "-L"))
-			export_binfo.libpath.push_back(i->substr(2));
-		else if(!i->compare(0, 2, "-l"))
-			export_binfo.libs.push_back(i->substr(2));
-	}
+	path=builder.get_cwd()/p;
 }
 
 void Package::resolve_refs()
 {
-	for(list<PackageRef>::iterator i=requires.begin(); i!=requires.end(); ++i)
+	for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
 		i->resolve();
+	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
+		i->resolve_refs();
 }
 
 void Package::create_build_info()
@@ -58,49 +35,68 @@ void Package::create_build_info()
 	if(build_info_ready)
 		return;
 	
-	for(list<PackageRef>::iterator i=requires.begin(); i!=requires.end(); ++i)
+	if(buildable)
 	{
-		if(!i->get_package())
-			continue;
-		i->get_package()->create_build_info();
-		build_info.add(i->get_package()->get_exported_binfo());
-	}
+		for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
+		{
+			Package *pkg=i->get_package();
+			if(!pkg)
+				continue;
+			if(pkg->get_need_path())
+				pkg->set_path(config.get_option(pkg->get_name()+"_path").value);
+			pkg->create_build_info();
+			build_info.add(pkg->get_exported_binfo());
+			export_binfo.add(pkg->get_exported_binfo());
+		}
 	
-	build_info.cflags.push_back("-Wall");
-	build_info.cflags.push_back("-Wshadow");
-	build_info.cflags.push_back("-Wextra");
-	build_info.cflags.push_back("-Wpointer-arith");
-	build_info.cflags.push_back("-Wconversion");
-	build_info.cflags.push_back("-Werror");
+		build_info.cflags.push_back("-Wall");
+		build_info.cflags.push_back("-Wshadow");
+		build_info.cflags.push_back("-Wextra");
+		build_info.cflags.push_back("-Wpointer-arith");
+		build_info.cflags.push_back("-Wconversion");
+		build_info.cflags.push_back("-Werror");
+
+		unsigned flags=get_install_flags();
+
+		if(flags&INCLUDE)
+			export_binfo.incpath.push_back((Path::Path(config.get_option("prefix").value)/"include").str());
+		if(flags&LIB)
+			export_binfo.libpath.push_back((Path::Path(config.get_option("prefix").value)/"lib").str());
+
+		string optimize=config.get_option("optimize").value;
+		if(strtol(optimize))
+		{
+			build_info.cflags.push_back("-O"+optimize);
+			string cpu=config.get_option("cpu").value;
+			if(cpu!="auto")
+				build_info.cflags.push_back("-march="+cpu);
+		}
 
-	unsigned flags=get_install_flags();
+		if(strtobool(config.get_option("debug").value))
+		{
+			build_info.cflags.push_back("-ggdb");
+			build_info.defines.push_back("DEBUG");
+		}
 
-	if(flags&INCLUDE)
-		export_binfo.incpath.push_back((Path::Path(config.get_option("prefix").value)/"include").str());
-	if(flags&LIB)
-		export_binfo.libpath.push_back((Path::Path(config.get_option("prefix").value)/"lib").str());
+		build_info.unique();
 
-	string optimize=config.get_option("optimize").value;
-	if(strtol(optimize))
-	{
-		build_info.cflags.push_back("-O"+optimize);
-		string cpu=config.get_option("cpu").value;
-		if(cpu!="auto")
-			build_info.cflags.push_back("-march="+cpu);
+		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());
+		}
 	}
-
-	if(strtobool(config.get_option("debug").value))
-		build_info.cflags.push_back("-ggdb");
-
-	build_info.unique();
-	export_binfo.unique();
-
-	for(list<Component>::iterator i=components.begin(); i!=components.end(); ++i)
+	else if(name=="fmod4")
 	{
-		i->create_build_info();
-		if(i->get_type()==Component::LIBRARY)
-			export_binfo.libs.push_back(i->get_name());
+		export_binfo.libs.push_back("fmodex");
+		if(!path.empty())
+		{
+			export_binfo.libpath.push_back((path/"api"/"lib").str());
+			export_binfo.incpath.push_back((path/"api"/"inc").str());
+		}
 	}
+	export_binfo.unique();
 
 	build_info_ready=true;
 }
@@ -121,6 +117,7 @@ Package *Package::create(Builder &b, const string &name)
 	argv.push_back(name);
 	vector<string> info=split(run_command(argv));
 	
+	bool need_path=false;
 	if(info.empty())
 	{
 		if(name=="opengl")
@@ -129,14 +126,38 @@ Package *Package::create(Builder &b, const string &name)
 			info.push_back("-lpthread");
 		else if(name=="gmpxx")
 			info.push_back("-lgmpxx");
+		else if(name=="fmod4")
+			need_path=true;
 		else
 			return 0;
 	}
 	
 	Package *pkg=new Package(b, name, info);
+	pkg->need_path=need_path;
 	return pkg;
 }
 
+/*** private ***/
+
+Package::Package(Builder &b, const string &n, const vector<string> &info):
+	builder(b),
+	name(n),
+	buildable(false),
+	build_info_ready(false)
+{
+	for(vector<string>::const_iterator i=info.begin(); i!=info.end(); ++i)
+	{
+		if(!i->compare(0, 2, "-I"))
+			export_binfo.incpath.push_back(i->substr(2));
+		else if(!i->compare(0, 2, "-D"))
+			export_binfo.defines.push_back(i->substr(2));
+		else if(!i->compare(0, 2, "-L"))
+			export_binfo.libpath.push_back(i->substr(2));
+		else if(!i->compare(0, 2, "-l"))
+			export_binfo.libs.push_back(i->substr(2));
+	}
+}
+
 void Package::init_buildable()
 {
 	buildable=true;
@@ -160,6 +181,9 @@ void Package::init_buildable()
 	if(flags&DATA)
 		config.add_option("includedir", "$prefix/share",   "Data installation directory");*/
 
+	for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
+		config.add_option(i->get_name()+"_path", "", "Path for "+i->get_name());
+
 	config.load(source/".options.cache");
 }