X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=aaea4e68c3002428bfd937778a7e694f601bcaf9;hb=c679a9dd1a97ae3b1ffa568143d42d02c2ca9e74;hp=5d1d6837ed5e903a07dc6423d28154ad442a7cc4;hpb=654de39b62a9a58fd8e1b5a557361d628345788b;p=builder.git

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 5d1d683..aaea4e6 100644
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -75,36 +75,6 @@ LibMode SourcePackage::get_library_mode() const
 		throw Exception("Unknown library mode");
 }
 
-/**
-Tries to resolve all references to dependency packages.
-*/
-void SourcePackage::resolve_refs()
-{
-	Package::resolve_refs();
-
-	for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
-		if(i->get_package())
-			all_reqs.push_back(i->get_package());
-
-	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
-	{
-		i->resolve_refs();
-		const PkgRefList &creqs=i->get_requires();
-		for(PkgRefList::const_iterator j=creqs.begin(); j!=creqs.end(); ++j)
-			if(j->get_package())
-				all_reqs.push_back(j->get_package());
-	}
-
-	for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i)
-	{
-		i->resolve_refs();
-		const PkgRefList &creqs=i->get_requires();
-		for(PkgRefList::const_iterator j=creqs.begin(); j!=creqs.end(); ++j)
-			if(j->get_package())
-				all_reqs.push_back(j->get_package());
-	}
-}
-
 /*** private ***/
 
 /**
@@ -134,12 +104,20 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
 	for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i)
 		if(i->eval())
 		{
-			const PkgRefList &reqs=i->get_requires();
-			requires.insert(requires.end(), reqs.begin(), reqs.end());
-			build_info.add(i->get_build_info());
+			const StringList &reqs=i->get_requires();
+			for(StringList::const_iterator j=reqs.begin(); j!=reqs.end(); ++j)
+				requires.push_back(builder.get_package(*j));
 		}
 
-	for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+	base_reqs=requires;
+
+	for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
+	{
+		const PackageList &reqs=i->get_requires();
+		requires.insert(requires.end(), reqs.begin(), reqs.end());
+	}
+
+	for(PackageList::iterator i=requires.begin(); i!=requires.end(); ++i)
 	{
 		BinaryPackage *bpkg=dynamic_cast<BinaryPackage *>(*i);
 		if(bpkg && bpkg->get_need_path())
@@ -148,8 +126,8 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
 
 	deps_cache.load();
 
-	for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
-		(*i)->configure(opts, flag&2);
+	/*for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+		(*i)->configure(opts, flag&2);*/
 }
 
 /**
@@ -182,7 +160,7 @@ void SourcePackage::init_config()
 	for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
 		config.add_option("with_"+i->name, "0", i->descr);
 
-	for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+	for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
 	{
 		BinaryPackage *bpkg=dynamic_cast<BinaryPackage *>(*i);
 		if(bpkg && bpkg->get_need_path())
@@ -196,12 +174,9 @@ configured when this is called.
 */
 void SourcePackage::create_build_info()
 {
-	for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
+	for(PackageList::iterator i=base_reqs.begin(); i!=base_reqs.end(); ++i)
 	{
-		Package *pkg=i->get_package();
-		if(!pkg)
-			continue;
-		const BuildInfo &ebi=pkg->get_exported_binfo();
+		const BuildInfo &ebi=(*i)->get_exported_binfo();
 		build_info.add(ebi);
 
 		export_binfo.cflags.insert(export_binfo.cflags.end(), ebi.cflags.begin(), ebi.cflags.end());