X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=aabfc00f3908213795ad2fd2a73fb67e6b4dbbb1;hb=0f5283a54fd188072eca23fbd980a43c6c869913;hp=ee7eabfd1c9e93ff3913f510fb8e0ee09563cc7d;hpb=329dc80e392faf7354338621e73dba1880fc767d;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index ee7eabf..aabfc00 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -5,14 +5,17 @@ Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <fstream>
 #include <iostream>
 #include <set>
-#include <msp/core/error.h>
+#include <msp/core/except.h>
 #include <msp/core/getopt.h>
 #include <msp/datafile/parser.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>
 #include <msp/time/units.h>
 #include <msp/time/utils.h>
@@ -43,13 +46,14 @@ Builder::Builder(int argc, char **argv):
 	dry_run(false),
 	help(false),
 	verbose(1),
-	chrome(false),
+	show_progress(false),
 	build_file("Build"),
 	jobs(1),
 	conf_all(false),
 	conf_only(false),
 	build_all(false),
-	create_makefile(false)
+	create_makefile(false),
+	current_arch("native")
 {
 	string   analyze_mode;
 	string   work_dir;
@@ -68,12 +72,14 @@ Builder::Builder(int argc, char **argv):
 	getopt.add_option('A', "conf-all",   conf_all,     GetOpt::NO_ARG);
 	getopt.add_option('B', "build-all",  build_all,    GetOpt::NO_ARG);
 	getopt.add_option('C', "chdir",      work_dir,     GetOpt::REQUIRED_ARG);
+	getopt.add_option('P', "progress",   show_progress, GetOpt::NO_ARG);
 	getopt.add_option('W', "what-if",    what_if,      GetOpt::REQUIRED_ARG);
-	getopt.add_option(     "chrome",     chrome,       GetOpt::NO_ARG);
+	getopt.add_option(     "arch",       current_arch, GetOpt::REQUIRED_ARG);
 	getopt.add_option(     "conf-only",  conf_only,    GetOpt::NO_ARG);
 	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(argc, argv);
 
 	if(!analyze_mode.empty())
@@ -97,8 +103,8 @@ Builder::Builder(int argc, char **argv):
 	else if(!clean && !create_makefile)
 		build=true;
 
-	const list<string> &args=getopt.get_args();
-	for(list<string>::const_iterator i=args.begin(); i!=args.end(); ++i)
+	const vector<string> &args=getopt.get_args();
+	for(vector<string>::const_iterator i=args.begin(); i!=args.end(); ++i)
 	{
 		unsigned equal=i->find('=');
 		if(equal!=string::npos)
@@ -113,7 +119,7 @@ Builder::Builder(int argc, char **argv):
 	if(!work_dir.empty())
 		chdir(work_dir.c_str());
 
-	cwd=Path::getcwd();
+	cwd=getcwd();
 
 	Architecture &native_arch=archs.insert(ArchMap::value_type("native", Architecture(*this, "native"))).first->second;
 	native_arch.set_tool("CC",  "gcc");
@@ -122,21 +128,29 @@ Builder::Builder(int argc, char **argv):
 	native_arch.set_tool("LXX", "g++");
 	native_arch.set_tool("AR",  "ar");
 
-	const char *home=getenv("HOME");
-	if(home)
-		load_build_file((Path::Path(home)/".builderrc").str());
+	load_build_file((get_home_dir()/".builderrc").str());
+
+	if(prefix.empty())
+	{
+		if(current_arch=="native")
+			prefix=(get_home_dir()/"local").str();
+		else
+			prefix=(get_home_dir()/"local"/current_arch).str();
+	}
 }
 
 /**
-Gets a package with the specified name, possibly creating it.
+Gets a package by name, possibly creating it.
 
-@param   n  Package name
+@param   name  Package name
 
 @return  Pointer to the package, or 0 if the package could not be located
 */
-Package *Builder::get_package(const string &n)
+Package *Builder::get_package(const string &name)
 {
-	PackageMap::iterator i=packages.find(n);
+	PackageMap::iterator i=packages.find(format("%s/%s", name, current_arch));
+	if(i==packages.end())
+		i=packages.find(name);
 	if(i!=packages.end())
 		return i->second;
 
@@ -144,7 +158,9 @@ Package *Builder::get_package(const string &n)
 	list<string> argv;
 	argv.push_back("pkg-config");
 	argv.push_back("--variable=source");
-	argv.push_back(n);
+	argv.push_back(name);
+	if(verbose>=4)
+		cout<<"Running "<<join(argv.begin(), argv.end())<<'\n';
 	string srcdir=strip(run_command(argv));
 
 	PathList dirs;
@@ -152,29 +168,31 @@ Package *Builder::get_package(const string &n)
 		dirs.push_back(srcdir);
 
 	// Make some other guesses about the source directory
-	string dirname=n;
-	if(!dirname.compare(0, 3, "msp"))
-		dirname.erase(0, 3);
-	dirs.push_back(cwd/dirname);
-	dirs.push_back(cwd/".."/dirname);
+	dirs.push_back(cwd/name);
+	dirs.push_back(cwd/".."/name);
+	if(!name.compare(0, 3, "msp"))
+	{
+		dirs.push_back(cwd/name.substr(3));
+		dirs.push_back(cwd/".."/name.substr(3));
+	}
 
 	// 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(n);
+			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, n);
+	Package *pkg=BinaryPackage::from_pkgconfig(*this, name);
 
-	packages.insert(PackageMap::value_type(n, pkg));
+	packages.insert(PackageMap::value_type(name, pkg));
 
 	if(!pkg)
-		problem(n, "not found");
+		problem(name, "not found");
 
 	return pkg;
 }
@@ -196,7 +214,7 @@ path.  Considers known targets as well as existing files.  If a matching target
 is not found but a file exists, a new SystemHeader target will be created and
 returned.
 */
-Target *Builder::get_header(const string &include, const string &, const string &from, const list<string> &path)
+Target *Builder::get_header(const string &include, const string &from, const list<string> &path)
 {
 	string hash(8, 0);
 	update_hash(hash, from);
@@ -208,21 +226,43 @@ Target *Builder::get_header(const string &include, const string &, const string
 	if(i!=includes.end())
 		return i->second;
 
-	string fn=include.substr(1);
-	Target *tgt=0;
-	if(include[0]=='"' && (tgt=get_header(Path::Path(from)/fn)))
-		;
-	else if((tgt=get_header(Path::Path("/usr/include")/fn)))
-		;
-	//XXX Determine the C++ header location dynamically
-	else if((tgt=get_header(Path::Path("/usr/include/c++/4.1.2")/fn)))
-		;
-	else
+	static string cxx_ver;
+	if(cxx_ver.empty())
 	{
-		for(list<string>::const_iterator j=path.begin(); (j!=path.end() && !tgt); ++j)
-			tgt=get_header(cwd/ *j/fn);
+		StringList argv;
+		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))
+		{
+			unsigned dot=cxx_ver.rfind('.');
+			if(dot==string::npos)
+				break;
+			cxx_ver.erase(dot);
+		}
+		if(verbose>=5)
+			cout<<"C++ version is "<<cxx_ver<<'\n';
 	}
 
+	string fn=include.substr(1);
+	if(verbose>=5)
+		cout<<"Looking for include "<<fn<<" with path "<<join(path.begin(), path.end())<<'\n';
+
+	StringList syspath;
+	if(current_arch=="native")
+		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());
+
+	Target *tgt=0;
+	if(include[0]=='\"')
+		tgt=get_header(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);
+
 	includes.insert(TargetMap::value_type(id, tgt));
 
 	return tgt;
@@ -239,7 +279,7 @@ a new SystemLibrary target will be created and returned.
 
 @return  Some kind of library target, if a match was found
 */
-Target *Builder::get_library(const string &lib, const string &arch, const list<string> &path, LibMode mode)
+Target *Builder::get_library(const string &lib, const list<string> &path, LibMode mode)
 {
 	string hash(8, 0);
 	for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
@@ -252,19 +292,22 @@ Target *Builder::get_library(const string &lib, const string &arch, const list<s
 		return i->second;
 
 	StringList syspath;
-	if(arch=="native")
+	if(current_arch=="native")
 	{
 		syspath.push_back("/lib");
 		syspath.push_back("/usr/lib");
 	}
 	else
-		syspath.push_back("/usr/"+get_architecture(arch).get_prefix()+"/lib");
+		syspath.push_back("/usr/"+get_current_arch().get_prefix()+"/lib");
+
+	if(verbose>=5)
+		cout<<"Looking for library "<<lib<<" with path "<<join(path.begin(), path.end())<<'\n';
 
 	Target *tgt=0;
-	for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
-		tgt=get_library(lib, arch, *j, mode);
 	for(StringList::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
-		tgt=get_library(lib, arch, cwd/ *j, mode);
+		tgt=get_library(lib, cwd/ *j, mode);
+	for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
+		tgt=get_library(lib, *j, mode);
 
 	libraries.insert(TargetMap::value_type(id, tgt));
 
@@ -275,11 +318,16 @@ const Architecture &Builder::get_architecture(const string &arch) const
 {
 	ArchMap::const_iterator i=archs.find(arch);
 	if(i==archs.end())
-		throw InvalidParameterValue("Unknown architecture");
+		throw KeyError("Unknown architecture", arch);
 
 	return i->second;
 }
 
+const Architecture &Builder::get_current_arch() const
+{
+	return get_architecture(current_arch);
+}
+
 void Builder::apply_profile_template(Config &config, const string &pt) const
 {
 	vector<string> parts=split(pt, '-');
@@ -332,23 +380,6 @@ int Builder::main()
 
 	PackageList all_reqs=main_pkg->collect_requires();
 
-	for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
-	{
-		SourcePackage *spkg=dynamic_cast<SourcePackage *>(*i);
-		string prob;
-		if(spkg && spkg->get_arch()!=main_pkg->get_arch())
-			problem(spkg->get_name(), format("wrong architecture (%s)", spkg->get_arch()));
-	}
-
-	if(!problems.empty())
-	{
-		cerr<<"The following problems were detected:\n";
-		for(ProblemList::iterator i=problems.begin(); i!=problems.end(); ++i)
-			cerr<<"  "<<i->package<<": "<<i->descr<<'\n';
-		cerr<<"Please fix them and try again.\n";
-		return 1;
-	}
-
 	if(conf_only)
 		return 0;
 
@@ -383,6 +414,15 @@ int Builder::main()
 	if(analyzer)
 		analyzer->analyze();
 
+	if(!problems.empty())
+	{
+		cerr<<"The following problems were detected:\n";
+		for(ProblemList::iterator i=problems.begin(); i!=problems.end(); ++i)
+			cerr<<"  "<<i->package<<": "<<i->descr<<'\n';
+		cerr<<"Please fix them and try again.\n";
+		return 1;
+	}
+
 	//if(create_makefile
 
 	if(clean)
@@ -426,8 +466,8 @@ void Builder::usage(const char *reason, const char *argv0, bool brief)
 			"  -A, --conf-all      Apply configuration to all packages.\n"
 			"  -B, --build-all     Build all targets unconditionally.\n"
 			"  -C, --chdir DIR     Change to DIR before doing anything else.\n"
+			"  -P, --progress      Display progress while building.\n"
 			"  -W, --what-if FILE  Pretend that FILE has changed.\n"
-			"  --chrome            Use extra chrome to print status.\n"
 			"  --conf-only         Stop after configuring packages.\n"
 			"  --full-paths        Output full paths in analysis.\n"
 			//"  --makefile          Create a makefile for this package.\n"
@@ -442,18 +482,24 @@ Loads the given build file.
 
 @return  0 on success, -1 if the file could not be opened
 */
-int Builder::load_build_file(const Path::Path &fn)
+int Builder::load_build_file(const Path &fn)
 {
-	ifstream in(fn.str().c_str());
-	if(!in)
-		return -1;
+	try
+	{
+		IO::File inf(fn.str());
+		IO::Buffered in(inf);
 
-	if(verbose>=3)
-		cout<<"Reading "<<fn<<'\n';
+		if(verbose>=3)
+			cout<<"Reading "<<fn<<'\n';
 
-	DataFile::Parser parser(in, fn.str());
-	Loader loader(*this, fn.subpath(0, fn.size()-1));
-	loader.load(parser);
+		DataFile::Parser parser(in, fn.str());
+		Loader loader(*this, fn.subpath(0, fn.size()-1));
+		loader.load(parser);
+	}
+	catch(const IO::FileNotFound &)
+	{
+		return -1;
+	}
 
 	return 0;
 }
@@ -559,12 +605,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::Path &fn)
+Target *Builder::get_header(const Msp::Path &fn)
 {
 	Target *tgt=get_target(fn.str());
 	if(tgt) return tgt;
 
-	if(Path::exists(fn))
+	if(exists(fn))
 	{
 		tgt=new SystemHeader(*this, fn.str());
 		return tgt;
@@ -572,15 +618,18 @@ Target *Builder::get_header(const Msp::Path::Path &fn)
 	return 0;
 }
 
-Target *Builder::get_library(const string &lib, const string &arch, const Path::Path &path, LibMode mode)
+Target *Builder::get_library(const string &lib, const Path &path, LibMode mode)
 {
 	// Populate a list of candidate filenames
 	StringList candidates;
 
 	if(mode!=ALL_STATIC)
 	{
-		if(arch=="win32")
+		if(current_arch=="win32")
+		{
 			candidates.push_back("lib"+lib+".dll");
+			candidates.push_back(lib+".dll");
+		}
 		else
 			candidates.push_back("lib"+lib+".so");
 	}
@@ -588,7 +637,7 @@ Target *Builder::get_library(const string &lib, const string &arch, const Path::
 	/* Static libraries are always considered, since sometimes shared versions
 	may not be available */
 	candidates.push_back("lib"+lib+".a");
-	if(arch=="win32")
+	if(current_arch=="win32")
 		candidates.push_back("lib"+lib+".dll.a");
 
 	for(StringList::iterator i=candidates.begin(); i!=candidates.end(); ++i)
@@ -609,7 +658,7 @@ Target *Builder::get_library(const string &lib, const string &arch, const Path::
 			else if(tgt)
 				return tgt;
 		}
-		else if(Path::exists(full))
+		else if(exists(full))
 		{
 			tgt=new SystemLibrary(*this, full);
 			return tgt;
@@ -646,8 +695,6 @@ int Builder::do_build()
 
 	vector<Action *> actions;
 
-	if(chrome)
-		cout<<"0 targets built\n";
 	unsigned count=0;
 
 	bool fail=false;
@@ -663,6 +710,12 @@ int Builder::do_build()
 				Action *action=tgt->build();
 				if(action)
 					actions.push_back(action);
+
+				if(show_progress)
+				{
+					cout<<count<<" of "<<total<<" targets built\033[1G";
+					cout.flush();
+				}
 			}
 			else if(actions.empty())
 				finish=true;
@@ -676,17 +729,7 @@ int Builder::do_build()
 			if(status>=0)
 			{
 				++count;
-				if(chrome)
-				{
-					cout<<"\e["<<actions.size()+1<<'A';
-					cout<<count<<" targets built\n";
-					if(i)
-						cout<<"\e["<<i<<"B";
-					cout<<"\e[M";
-					if(i<actions.size()-1)
-						cout<<"\e["<<actions.size()-i-1<<"B";
-					cout.flush();
-				}
+
 				delete actions[i];
 				actions.erase(actions.begin()+i);
 				if(status>0)
@@ -699,8 +742,12 @@ int Builder::do_build()
 		}
 	}
 
+	if(show_progress)
+		cout<<"\033[K";
 	if(fail)
 		cout<<"Build failed\n";
+	else if(show_progress)
+		cout<<"Build complete\n";
 
 	return fail?1:0;
 }
@@ -769,7 +816,7 @@ void Builder::package_help()
 Application::RegApp<Builder> Builder::reg;
 
 
-Builder::Loader::Loader(Builder &b, const Path::Path &s):
+Builder::Loader::Loader(Builder &b, const Path &s):
 	bld(b),
 	src(s)
 {