X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpackagemanager.cpp;h=2ee3c30de63f67bca4f649d27326d9b97e05d4f1;hb=f5d23e3e6ad425075182982c1ef717cb0873bbdc;hp=746755eaf2d36b4afac5273fbfc5fc9375c9f183;hpb=241934daad13f83e86983b474dcadb0190e1cf0b;p=builder.git

diff --git a/source/packagemanager.cpp b/source/packagemanager.cpp
index 746755e..2ee3c30 100644
--- a/source/packagemanager.cpp
+++ b/source/packagemanager.cpp
@@ -5,7 +5,7 @@
 #include <msp/io/print.h>
 #include <msp/strings/format.h>
 #include <msp/strings/utils.h>
-#include <msp/time/units.h>
+#include <msp/time/timedelta.h>
 #include <msp/time/utils.h>
 #include "binarypackage.h"
 #include "builder.h"
@@ -19,6 +19,7 @@ using namespace Msp;
 PackageManager::PackageManager(Builder &b):
 	builder(b),
 	no_externals(false),
+	main_pkg(0),
 	env_set(false)
 { }
 
@@ -54,22 +55,43 @@ void PackageManager::add_package(Package *pkg)
 			throw logic_error("Package is already managed");
 	}
 
+	if(packages.empty())
+		main_pkg = pkg;
+
 	packages.insert(PackageMap::value_type(pkg->get_name(), pkg));
 }
 
-Package *PackageManager::find_package(const string &name)
+Package *PackageManager::get_package(const string &name) const
 {
-	PackageMap::iterator i = packages.find(name);
+	PackageMap::const_iterator i = packages.find(name);
 	if(i!=packages.end())
 		return i->second;
 
+	return 0;
+}
+
+Package &PackageManager::get_main_package() const
+{
+	if(!main_pkg)
+		throw logic_error("No packages");
+	return *main_pkg;
+}
+
+Package *PackageManager::find_package(const string &name)
+{
+	if(not_found.count(name))
+		return 0;
+
+	if(Package *pkg = get_package(name))
+		return pkg;
+
 	if(!no_externals)
 	{
 		FS::Path path = get_package_location(name);
 		if(!path.empty())
 		{
 			builder.load_build_file(path/"Build");
-			i = packages.find(name);
+			PackageMap::iterator i = packages.find(name);
 			if(i!=packages.end())
 				return i->second;
 		}
@@ -79,31 +101,31 @@ Package *PackageManager::find_package(const string &name)
 	if(!path.empty())
 	{
 		builder.load_build_file(path);
-		i = packages.find(name);
-		if(i!=packages.end())
-			return i->second;
+		if(Package *pkg = get_package(name))
+			return pkg;
 	}
 
-	Package *pkg = 0;
 	try
 	{
 		// Package source not found - create a binary package
 		string flags_str = run_pkgconfig(name, "flags");
-		vector<string> flags = split(flags_str);
-		pkg = BinaryPackage::from_flags(builder, name, flags);
+		BinaryPackage::Flags flags = split(flags_str);
+		flags_str = run_pkgconfig(name, "staticflags");
+		BinaryPackage::Flags static_flags = split(flags_str);
+		Package *pkg = BinaryPackage::from_flags(builder, name, flags, static_flags);
+		packages.insert(PackageMap::value_type(name, pkg));
+		return pkg;
 	}
 	catch(...)
 	{
-		builder.problem(name, "not found");
+		not_found.insert(name);
+		return 0;
 	}
-
-	packages.insert(PackageMap::value_type(name, pkg));
-
-	return pkg;
 }
 
 string PackageManager::run_pkgconfig(const string &pkg, const string &what)
 {
+#ifndef _WIN32
 	if(!env_set)
 	{
 		const FS::Path &prefix = builder.get_prefix();
@@ -131,10 +153,12 @@ string PackageManager::run_pkgconfig(const string &pkg, const string &what)
 	argv.push_back("pkg-config");
 	if(what=="cflags" || what=="libs")
 		argv.push_back("--"+what);
-	else if(what=="flags")
+	else if(what=="flags" || what=="staticflags")
 	{
 		argv.push_back("--cflags");
 		argv.push_back("--libs");
+		if(what=="staticflags")
+			argv.push_back("--static");
 	}
 	else
 		argv.push_back("--variable="+what);
@@ -143,6 +167,11 @@ string PackageManager::run_pkgconfig(const string &pkg, const string &what)
 	builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
 
 	return ExternalTask::run_and_capture_output(argv);
+#else
+	(void)pkg;
+	(void)what;
+	return string();
+#endif
 }
 
 FS::Path PackageManager::get_package_location(const string &name)
@@ -224,3 +253,9 @@ FS::Path PackageManager::get_binary_package_file(const string &name)
 
 	return FS::Path();
 }
+
+void PackageManager::save_all_caches() const
+{
+	for(PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
+		i->second->save_caches();
+}