X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=15c9e5455f84e0946fc01ef8c569181063d79394;hb=69ad3610053e140cb5108f53e4c46a0583e33559;hp=d4669520abd93fd7aabaf4b9b1ba7cf2bfc690ac;hpb=1968c546cfb30214e8dc5afc722bec14aa8373f5;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index d466952..15c9e54 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -8,11 +8,12 @@ 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/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,7 +44,7 @@ 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),
@@ -68,8 +69,8 @@ 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(     "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);
@@ -97,8 +98,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,20 +114,18 @@ Builder::Builder(int argc, char **argv):
 	if(!work_dir.empty())
 		chdir(work_dir.c_str());
 
-	cwd=Path::getcwd();
+	cwd=getcwd();
 
-	archs.insert(StringMap::value_type("native", ""));
-
-	StringMap &native_tools=tools.insert(ToolMap::value_type("native", StringMap())).first->second;
-	native_tools.insert(StringMap::value_type("CC",   "gcc"));
-	native_tools.insert(StringMap::value_type("CXX",  "g++"));
-	native_tools.insert(StringMap::value_type("LD",   "gcc"));
-	native_tools.insert(StringMap::value_type("LDXX", "g++"));
-	native_tools.insert(StringMap::value_type("AR",   "ar"));
+	Architecture &native_arch=archs.insert(ArchMap::value_type("native", Architecture(*this, "native"))).first->second;
+	native_arch.set_tool("CC",  "gcc");
+	native_arch.set_tool("CXX", "g++");
+	native_arch.set_tool("LD",  "gcc");
+	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((Path(home)/".builderrc").str());
 }
 
 /**
@@ -147,6 +146,8 @@ Package *Builder::get_package(const string &n)
 	argv.push_back("pkg-config");
 	argv.push_back("--variable=source");
 	argv.push_back(n);
+	if(verbose>=4)
+		cout<<"Running "<<join(argv.begin(), argv.end())<<'\n';
 	string srcdir=strip(run_command(argv));
 
 	PathList dirs;
@@ -198,7 +199,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 &arch, const string &from, const list<string> &path)
 {
 	string hash(8, 0);
 	update_hash(hash, from);
@@ -210,21 +211,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_architecture(arch).get_tool("CXX"));
+		argv.push_back("--version");
+		cxx_ver=Regex(" ([0-9.]+) ").match(run_command(argv))[1].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(include[0]=='\"')
+		syspath.push_back(from);
+	if(arch=="native")
+		syspath.push_back("/usr/include");
+	else
+		syspath.push_back("/usr/"+get_architecture(arch).get_prefix()+"/include");
+	syspath.push_back((Path("/usr/include/c++/")/cxx_ver/fn).str());
+
+	Target *tgt=0;
+	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;
@@ -260,47 +283,31 @@ Target *Builder::get_library(const string &lib, const string &arch, const list<s
 		syspath.push_back("/usr/lib");
 	}
 	else
-		syspath.push_back("/usr/"+get_arch_prefix(arch)+"/lib");
+		syspath.push_back("/usr/"+get_architecture(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);
+	for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
+		tgt=get_library(lib, arch, *j, mode);
 
 	libraries.insert(TargetMap::value_type(id, tgt));
 
 	return tgt;
 }
 
-const string &Builder::get_arch_prefix(const string &arch) const
+const Architecture &Builder::get_architecture(const string &arch) const
 {
-	StringMap::const_iterator i=archs.find(arch);
+	ArchMap::const_iterator i=archs.find(arch);
 	if(i==archs.end())
 		throw InvalidParameterValue("Unknown architecture");
 
 	return i->second;
 }
 
-string Builder::get_tool(const std::string &tool, const std::string &arch)
-{
-	ToolMap::iterator i=tools.find(arch);
-	if(i!=tools.end())
-	{
-		StringMap::iterator j=i->second.find(tool);
-		if(j!=i->second.end())
-			return j->second;
-	}
-
-	// Either the arch, or the tool within the arch was not found
-	i=tools.find("native");
-	StringMap::iterator j=i->second.find(tool);
-	if(j==i->second.end())
-		throw InvalidParameterValue("Unknown tool");
-
-	return get_arch_prefix(arch)+"-"+j->second;
-}
-
 void Builder::apply_profile_template(Config &config, const string &pt) const
 {
 	vector<string> parts=split(pt, '-');
@@ -361,15 +368,6 @@ int Builder::main()
 			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;
 
@@ -404,6 +402,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)
@@ -447,8 +454,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"
@@ -463,7 +470,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::Path &fn)
+int Builder::load_build_file(const Path &fn)
 {
 	ifstream in(fn.str().c_str());
 	if(!in)
@@ -580,12 +587,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;
@@ -593,7 +600,7 @@ 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 string &arch, const Path &path, LibMode mode)
 {
 	// Populate a list of candidate filenames
 	StringList candidates;
@@ -630,7 +637,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;
@@ -667,8 +674,6 @@ int Builder::do_build()
 
 	vector<Action *> actions;
 
-	if(chrome)
-		cout<<"0 targets built\n";
 	unsigned count=0;
 
 	bool fail=false;
@@ -684,6 +689,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;
@@ -697,17 +708,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)
@@ -720,8 +721,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;
 }
@@ -790,7 +795,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)
 {
@@ -800,9 +805,11 @@ Builder::Loader::Loader(Builder &b, const Path::Path &s):
 	add("package", &Loader::package);
 }
 
-void Builder::Loader::architecture(const string &a, const string &p)
+void Builder::Loader::architecture(const string &n)
 {
-	bld.archs.insert(StringMap::value_type(a, p));
+	Architecture arch(bld, n);
+	load_sub(arch);
+	bld.archs.insert(ArchMap::value_type(n, arch));
 }
 
 void Builder::Loader::binpkg(const string &n)