X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=58288ffbfa096a71e4dfbe82fe360c207824f7b7;hb=refs%2Ftags%2F0.9;hp=147371cd22519524683df31378fc0b6597d118f7;hpb=7567502e17be7704d58ced2f49703fcf71c7ef38;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index 147371c..58288ff 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -10,10 +10,12 @@ Distributed under the LGPL
 #include <msp/core/except.h>
 #include <msp/core/getopt.h>
 #include <msp/datafile/parser.h>
+#include <msp/fs/dir.h>
+#include <msp/fs/stat.h>
+#include <msp/fs/utils.h>
 #include <msp/io/buffered.h>
 #include <msp/io/except.h>
 #include <msp/io/file.h>
-#include <msp/path/utils.h>
 #include <msp/strings/formatter.h>
 #include <msp/strings/regex.h>
 #include <msp/strings/utils.h>
@@ -60,6 +62,7 @@ Builder::Builder(int argc, char **argv):
 	bool     full_paths=false;
 	unsigned max_depth=5;
 	StringList cmdline_warn;
+	string   prfx;
 
 	GetOpt getopt;
 	getopt.add_option('a', "analyze",    analyze_mode, GetOpt::REQUIRED_ARG);
@@ -80,7 +83,7 @@ Builder::Builder(int argc, char **argv):
 	getopt.add_option(     "full-paths", full_paths,   GetOpt::NO_ARG);
 	//getopt.add_option(     "makefile",   create_makefile, GetOpt::NO_ARG);
 	getopt.add_option(     "max-depth",  max_depth,    GetOpt::REQUIRED_ARG);
-	getopt.add_option(     "prefix",     prefix,       GetOpt::REQUIRED_ARG);
+	getopt.add_option(     "prefix",     prfx,         GetOpt::REQUIRED_ARG);
 	getopt.add_option(     "warnings",   cmdline_warn, GetOpt::REQUIRED_ARG);
 	getopt(argc, argv);
 
@@ -121,7 +124,7 @@ Builder::Builder(int argc, char **argv):
 	if(!work_dir.empty())
 		chdir(work_dir.c_str());
 
-	cwd=getcwd();
+	cwd=FS::getcwd();
 
 	Architecture &native_arch=archs.insert(ArchMap::value_type("native", Architecture(*this, "native"))).first->second;
 	native_arch.set_tool("CC",  "gcc");
@@ -130,15 +133,17 @@ Builder::Builder(int argc, char **argv):
 	native_arch.set_tool("LXX", "g++");
 	native_arch.set_tool("AR",  "ar");
 
-	load_build_file((get_home_dir()/".builderrc").str());
+	load_build_file((FS::get_home_dir()/".builderrc").str());
 
-	if(prefix.empty())
+	if(prfx.empty())
 	{
 		if(current_arch=="native")
-			prefix=(get_home_dir()/"local").str();
+			prefix=(FS::get_home_dir()/"local").str();
 		else
-			prefix=(get_home_dir()/"local"/current_arch).str();
+			prefix=(FS::get_home_dir()/"local"/current_arch).str();
 	}
+	else
+		prefix=FS::getcwd()/prfx;
 
 	warnings.push_back("all");
 	warnings.push_back("extra");
@@ -150,6 +155,9 @@ Builder::Builder(int argc, char **argv):
 		vector<string> warns=split(*i, ',');
 		warnings.insert(warnings.end(), warns.begin(), warns.end());
 	}
+
+	pkg_path.push_back(cwd/".");
+	pkg_path.push_back(cwd/"..");
 }
 
 /**
@@ -167,38 +175,14 @@ Package *Builder::get_package(const string &name)
 	if(i!=packages.end())
 		return i->second;
 
-	// Try to get source directory with pkgconfig
-	list<string> argv;
-	argv.push_back("pkg-config");
-	argv.push_back("--variable=source");
-	argv.push_back(name);
-	if(verbose>=4)
-		cout<<"Running "<<join(argv.begin(), argv.end())<<'\n';
-	string srcdir=strip(run_command(argv));
-
-	PathList dirs;
-	if(!srcdir.empty())
-		dirs.push_back(srcdir);
-
-	// Make some other guesses about the source directory
-	dirs.push_back(cwd/name);
-	dirs.push_back(cwd/".."/name);
-	if(!name.compare(0, 3, "msp"))
+	FS::Path path=get_package_location(name);
+	if(!path.empty() && !load_build_file(path/"Build"))
 	{
-		dirs.push_back(cwd/name.substr(3));
-		dirs.push_back(cwd/".."/name.substr(3));
+		i=packages.find(name);
+		if(i!=packages.end())
+			return i->second;
 	}
 
-	// Go through the candidate directories and look for a Build file
-	for(PathList::iterator j=dirs.begin(); j!=dirs.end(); ++j)
-		if(!load_build_file(*j/"Build"))
-		{
-			i=packages.find(name);
-			if(i!=packages.end())
-				return i->second;
-			break;
-		}
-
 	// Package source not found - create a binary package
 	Package *pkg=BinaryPackage::from_pkgconfig(*this, name);
 
@@ -246,7 +230,7 @@ Target *Builder::get_header(const string &include, const string &from, const lis
 		argv.push_back(get_current_arch().get_tool("CXX"));
 		argv.push_back("--version");
 		cxx_ver=Regex("[0-9]\\.[0-9.]+").match(run_command(argv))[0].str;
-		while(!cxx_ver.empty() && !exists(Path("/usr/include/c++")/cxx_ver))
+		while(!cxx_ver.empty() && !FS::is_dir(FS::Path("/usr/include/c++")/cxx_ver))
 		{
 			unsigned dot=cxx_ver.rfind('.');
 			if(dot==string::npos)
@@ -266,15 +250,15 @@ Target *Builder::get_header(const string &include, const string &from, const lis
 		syspath.push_back("/usr/include");
 	else
 		syspath.push_back("/usr/"+get_architecture(current_arch).get_prefix()+"/include");
-	syspath.push_back((Path("/usr/include/c++/")/cxx_ver/fn).str());
+	syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver/fn).str());
 
 	Target *tgt=0;
 	if(include[0]=='\"')
-		tgt=get_header(Path(from)/fn);
+		tgt=get_header(FS::Path(from)/fn);
 	for(list<string>::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
 		tgt=get_header(cwd/ *j/fn);
 	for(list<string>::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
-		tgt=get_header(Path(*j)/fn);
+		tgt=get_header(FS::Path(*j)/fn);
 
 	includes.insert(TargetMap::value_type(id, tgt));
 
@@ -395,7 +379,8 @@ int Builder::main()
 	if(conf_only)
 		return 0;
 
-	cout<<all_reqs.size()<<" active packages, "<<targets.size()<<" targets\n";
+	if(verbose>=1)
+		cout<<all_reqs.size()<<" active packages, "<<targets.size()<<" targets\n";
 	if(verbose>=2)
 	{
 		for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
@@ -490,6 +475,52 @@ void Builder::usage(const char *reason, const char *argv0, bool brief)
 	}
 }
 
+/**
+Determines the source directory of a package.  pkg-config is consulted first,
+and if it fails, the package path is searched for matches.
+*/
+FS::Path Builder::get_package_location(const string &name)
+{
+	// Try to get source directory with pkgconfig
+	list<string> argv;
+	argv.push_back("pkg-config");
+	argv.push_back("--variable=source");
+	argv.push_back(name);
+	if(verbose>=4)
+		cout<<"Running "<<join(argv.begin(), argv.end())<<'\n';
+	string srcdir=strip(run_command(argv));
+	if(!srcdir.empty())
+		return srcdir;
+
+	if(pkg_dirs.empty())
+	{
+		for(list<FS::Path>::const_iterator i=pkg_path.begin(); i!=pkg_path.end(); ++i)
+		{
+			list<string> files=list_files(*i);
+			for(list<string>::const_iterator j=files.begin(); j!=files.end(); ++j)
+			{
+				FS::Path full=*i / *j;
+				if(FS::exists(full/"Build"))
+					pkg_dirs.push_back(full);
+			}
+		}
+	}
+
+	bool msp=!name.compare(0, 3, "msp");
+	for(list<FS::Path>::const_iterator i=pkg_dirs.begin(); i!=pkg_dirs.end(); ++i)
+	{
+		string base=basename(*i);
+		unsigned dash=base.rfind('-');
+
+		if(!base.compare(0, dash, name))
+			return *i;
+		else if(msp && !base.compare(0, dash-3, name, 3, string::npos))
+			return *i;
+	}
+
+	return FS::Path();
+}
+
 /**
 Loads the given build file.
 
@@ -497,7 +528,7 @@ Loads the given build file.
 
 @return  0 on success, -1 if the file could not be opened
 */
-int Builder::load_build_file(const Path &fn)
+int Builder::load_build_file(const FS::Path &fn)
 {
 	try
 	{
@@ -620,12 +651,12 @@ int Builder::create_targets()
 Check if a header exists, either as a target or a file.  Either an existing
 target or a new SystemHeader target will be returned.
 */
-Target *Builder::get_header(const Msp::Path &fn)
+Target *Builder::get_header(const Msp::FS::Path &fn)
 {
 	Target *tgt=get_target(fn.str());
 	if(tgt) return tgt;
 
-	if(exists(fn))
+	if(FS::is_reg(fn))
 	{
 		tgt=new SystemHeader(*this, fn.str());
 		return tgt;
@@ -633,7 +664,7 @@ Target *Builder::get_header(const Msp::Path &fn)
 	return 0;
 }
 
-Target *Builder::get_library(const string &lib, const Path &path, LibMode mode)
+Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mode)
 {
 	// Populate a list of candidate filenames
 	StringList candidates;
@@ -673,7 +704,7 @@ Target *Builder::get_library(const string &lib, const Path &path, LibMode mode)
 			else if(tgt)
 				return tgt;
 		}
-		else if(exists(full))
+		else if(FS::is_reg(full))
 		{
 			tgt=new SystemLibrary(*this, full);
 			return tgt;
@@ -706,7 +737,8 @@ int Builder::do_build()
 		cout<<"Already up to date\n";
 		return 0;
 	}
-	cout<<"Will build "<<total<<" target(s)\n";
+	if(verbose>=1)
+		cout<<"Will build "<<total<<" target(s)\n";
 
 	vector<Action *> actions;
 
@@ -831,7 +863,7 @@ void Builder::package_help()
 Application::RegApp<Builder> Builder::reg;
 
 
-Builder::Loader::Loader(Builder &b, const Path &s):
+Builder::Loader::Loader(Builder &b, const FS::Path &s):
 	bld(b),
 	src(s)
 {
@@ -858,7 +890,8 @@ void Builder::Loader::binpkg(const string &n)
 void Builder::Loader::profile(const string &n)
 {
 	StringMap prf;
-	load_sub<ProfileLoader>(prf);
+	ProfileLoader ldr(prf);
+	load_sub_with(ldr);
 	bld.profile_tmpl.insert(ProfileTemplateMap::value_type(n, prf));
 }