X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fbuilder.cpp;h=34c65af48be88df4d0be392b9735bad57472a3ea;hb=4d0d003b022943d8a0e39ba19078bab8d32d8857;hp=f10f0eb9cb331eb41f32b2b053786366fdb19b2f;hpb=654de39b62a9a58fd8e1b5a557361d628345788b;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index f10f0eb..34c65af 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -12,6 +12,7 @@ Distributed under the LGPL
 #include <msp/core/getopt.h>
 #include <msp/datafile/parser.h>
 #include <msp/path/utils.h>
+#include <msp/strings/formatter.h>
 #include <msp/strings/utils.h>
 #include <msp/time/units.h>
 #include <msp/time/utils.h>
@@ -35,14 +36,14 @@ using namespace std;
 using namespace Msp;
 
 Builder::Builder(int argc, char **argv):
-	default_pkg(0),
+	main_pkg(0),
 	analyzer(0),
 	build(false),
 	clean(0),
 	dry_run(false),
 	help(false),
 	verbose(1),
-	chrome(false),
+	show_progress(false),
 	build_file("Build"),
 	jobs(1),
 	conf_all(false),
@@ -67,8 +68,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);
@@ -96,8 +97,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)
@@ -112,20 +113,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());
 }
 
 /**
@@ -146,6 +145,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;
@@ -173,8 +174,9 @@ Package *Builder::get_package(const string &n)
 	Package *pkg=BinaryPackage::from_pkgconfig(*this, n);
 
 	packages.insert(PackageMap::value_type(n, pkg));
-	if(pkg)
-		new_pkgs.push_back(pkg);
+
+	if(!pkg)
+		problem(n, "not found");
 
 	return pkg;
 }
@@ -210,12 +212,12 @@ Target *Builder::get_header(const string &include, const string &, const string
 
 	string fn=include.substr(1);
 	Target *tgt=0;
-	if(include[0]=='"' && (tgt=get_header(Path::Path(from)/fn)))
+	if(include[0]=='"' && (tgt=get_header(Path(from)/fn)))
 		;
-	else if((tgt=get_header(Path::Path("/usr/include")/fn)))
+	else if((tgt=get_header(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 if((tgt=get_header(Path("/usr/include/c++/4.1.2")/fn)))
 		;
 	else
 	{
@@ -258,7 +260,7 @@ 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");
 
 	Target *tgt=0;
 	for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
@@ -271,34 +273,15 @@ Target *Builder::get_library(const string &lib, const string &arch, const list<s
 	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, '-');
@@ -313,6 +296,11 @@ void Builder::apply_profile_template(Config &config, const string &pt) const
 	}
 }
 
+void Builder::problem(const string &p, const string &d)
+{
+	problems.push_back(Problem(p, d));
+}
+
 /**
 Adds a target to both the target map and the new target queue.  Called from
 Target constructor.
@@ -331,14 +319,7 @@ int Builder::main()
 		return 1;
 	}
 
-	while(!new_pkgs.empty())
-	{
-		Package *pkg=new_pkgs.front();
-		new_pkgs.erase(new_pkgs.begin());
-		pkg->resolve_refs();
-	}
-
-	default_pkg->configure(cmdline_options, conf_all?2:1);
+	main_pkg->configure(cmdline_options, conf_all?2:1);
 
 	if(help)
 	{
@@ -348,24 +329,24 @@ int Builder::main()
 		return 0;
 	}
 
-	StringMap problems;
-	for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
+	if(!conf_only && create_targets())
+		return 1;
+
+	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->second);
+		SourcePackage *spkg=dynamic_cast<SourcePackage *>(*i);
 		string prob;
-		if(!i->second)
-			prob="missing";
-		else if(spkg && spkg->get_arch()!=default_pkg->get_arch())
-			prob="wrong architecture ("+spkg->get_arch()+")";
-		if(!prob.empty())
-			problems.insert(StringMap::value_type(i->first, 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(StringMap::iterator i=problems.begin(); i!=problems.end(); ++i)
-			cerr<<"  "<<i->first<<": "<<i->second<<'\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;
 	}
@@ -373,21 +354,18 @@ int Builder::main()
 	if(conf_only)
 		return 0;
 
-	if(create_targets())
-		return 1;
-
-	cout<<packages.size()<<" packages, "<<targets.size()<<" targets\n";
+	cout<<all_reqs.size()<<" active packages, "<<targets.size()<<" targets\n";
 	if(verbose>=2)
 	{
-		for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
+		for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
 		{
-			cout<<' '<<i->second->get_name();
-			if(dynamic_cast<SourcePackage *>(i->second))
+			cout<<' '<<(*i)->get_name();
+			if(dynamic_cast<SourcePackage *>(*i))
 				cout<<'*';
 			unsigned count=0;
 			unsigned ood_count=0;
 			for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j)
-				if(j->second->get_package()==i->second)
+				if(j->second->get_package()==*i)
 				{
 					++count;
 					if(j->second->get_rebuild())
@@ -450,8 +428,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"
@@ -466,7 +444,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)
@@ -501,9 +479,10 @@ int Builder::create_targets()
 	Target *tarballs=new VirtualTarget(*this, "tarballs");
 	world->add_depend(tarballs);
 
-	for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
+	PackageList all_reqs=main_pkg->collect_requires();
+	for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
 	{
-		SourcePackage *spkg=dynamic_cast<SourcePackage *>(i->second);
+		SourcePackage *spkg=dynamic_cast<SourcePackage *>(*i);
 		if(!spkg)
 			continue;
 
@@ -582,12 +561,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;
@@ -595,7 +574,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;
@@ -632,7 +611,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;
@@ -669,8 +648,6 @@ int Builder::do_build()
 
 	vector<Action *> actions;
 
-	if(chrome)
-		cout<<"0 targets built\n";
 	unsigned count=0;
 
 	bool fail=false;
@@ -686,6 +663,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;
@@ -699,17 +682,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)
@@ -722,8 +695,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;
 }
@@ -745,7 +722,7 @@ int Builder::do_clean()
 		Target *tgt=queue.front();
 		queue.erase(queue.begin());
 
-		if(tgt->get_buildable() && (tgt->get_package()==default_pkg || clean>=2))
+		if(tgt->get_buildable() && (tgt->get_package()==main_pkg || clean>=2))
 			clean_tgts.insert(tgt);
 
 		const TargetList &deps=tgt->get_depends();
@@ -769,16 +746,16 @@ Prints out information about the default package.
 */
 void Builder::package_help()
 {
-	const Config &config=default_pkg->get_config();
+	const Config &config=main_pkg->get_config();
 	const Config::OptionMap &options=config.get_options();
 
 	cout<<"Required packages:\n  ";
-	const PkgRefList &requires=default_pkg->get_requires();
-	for(PkgRefList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+	const PackageList &requires=main_pkg->get_requires();
+	for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
 	{
 		if(i!=requires.begin())
 			cout<<", ";
-		cout<<i->get_name();
+		cout<<(*i)->get_name();
 	}
 	cout<<"\n\n";
 	cout<<"Package configuration:\n";
@@ -792,7 +769,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)
 {
@@ -802,9 +779,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)
@@ -812,7 +791,6 @@ void Builder::Loader::binpkg(const string &n)
 	BinaryPackage *pkg=new BinaryPackage(bld, n);
 	load_sub(*pkg);
 	bld.packages.insert(PackageMap::value_type(n, pkg));
-	bld.new_pkgs.push_back(pkg);
 }
 
 void Builder::Loader::profile(const string &n)
@@ -825,11 +803,11 @@ void Builder::Loader::profile(const string &n)
 void Builder::Loader::package(const string &n)
 {
 	SourcePackage *pkg=new SourcePackage(bld, n, src);
+	if(!bld.main_pkg)
+		bld.main_pkg=pkg;
+
 	load_sub(*pkg);
 	bld.packages.insert(PackageMap::value_type(n, pkg));
-	bld.new_pkgs.push_back(pkg);
-	if(!bld.default_pkg)
-		bld.default_pkg=pkg;
 }