X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=c599e269408adb38d4b38c75808d19ef71dc83a6;hb=ac1f35e436dbe86f903dce2f49b002ff17f1ca50;hp=c0574e924d51512ba5af04ff11e14517e78bebf0;hpb=30b1243ff16b908ae18b4ab9d70f772c9196b949;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index c0574e9..c599e26 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -1,5 +1,4 @@
 #include <set>
-#include <cstdlib>
 #include <msp/core/getopt.h>
 #include <msp/datafile/parser.h>
 #include <msp/fs/dir.h>
@@ -22,6 +21,7 @@
 #include "gnucxxcompiler.h"
 #include "gnulinker.h"
 #include "installedfile.h"
+#include "mingwdlltool.h"
 #include "package.h"
 #include "pkgconfiggenerator.h"
 #include "sharedlibrary.h"
@@ -35,10 +35,10 @@ using namespace Msp;
 
 Builder::Builder(int argc, char **argv):
 	package_manager(*this),
-	main_pkg(0),
 	native_arch(*this, string()),
 	build_type(0),
 	vfs(*this),
+	build_graph(*this),
 	analyzer(0),
 	build(false),
 	clean(0),
@@ -50,14 +50,15 @@ Builder::Builder(int argc, char **argv):
 	conf_all(false),
 	conf_only(false),
 	build_all(false),
-	create_makefile(false)
+	create_makefile(false),
+	tempdir("temp")
 {
 	string analyze_mode;
 	string work_dir;
 	bool full_paths = false;
-	unsigned max_depth = 5;
-	StringList cmdline_warn;
+	unsigned max_depth = 4;
 	string prfx;
+	string temp_str;
 	string arch;
 	bool no_externals = false;
 	unsigned verbose = 1;
@@ -66,14 +67,14 @@ Builder::Builder(int argc, char **argv):
 	string build_type_name;
 
 	GetOpt getopt;
-	getopt.add_option('a', "analyze",    analyze_mode,  GetOpt::REQUIRED_ARG).set_help("Perform analysis.  MODE can be deps, alldeps or rebuild.", "MODE");
-	getopt.add_option('b', "build",      build,         GetOpt::NO_ARG).set_help("Perform build even if doing analysis.");
+	getopt.add_option('a', "analyze",    analyze_mode,  GetOpt::REQUIRED_ARG).set_help("Perform dependency analysis.", "MODE");
+	getopt.add_option('b', "build",      build,         GetOpt::NO_ARG).set_help("Perform build even if also doing something else.");
 	getopt.add_option('c', "clean",      clean,         GetOpt::NO_ARG).set_help("Clean buildable targets.");
-	getopt.add_option('f', "file",       build_file,    GetOpt::REQUIRED_ARG).set_help("Read info from FILE instead of Build.", "FILE");
+	getopt.add_option('f', "file",       build_file,    GetOpt::REQUIRED_ARG).set_help("Read build instructions from FILE.", "FILE");
 	getopt.add_option('h', "help",       help,          GetOpt::NO_ARG).set_help("Print this message.");
-	getopt.add_option('j', "jobs",       jobs,          GetOpt::REQUIRED_ARG).set_help("Run NUM commands at once, whenever possible.", "NUM");
-	getopt.add_option('l', "log",        log_channels,  GetOpt::REQUIRED_ARG).set_help("Set log channels to be displayed.", "LIST");
-	getopt.add_option('n', "dry-run",    dry_run,       GetOpt::NO_ARG).set_help("Don't actually do anything, only show what would be done.");
+	getopt.add_option('j', "jobs",       jobs,          GetOpt::REQUIRED_ARG).set_help("Run up to NUM tasks in parallel.", "NUM");
+	getopt.add_option('l', "log",        log_channels,  GetOpt::REQUIRED_ARG).set_help("Enable listed log channels.", "LIST");
+	getopt.add_option('n', "dry-run",    dry_run,       GetOpt::NO_ARG).set_help("Show what would be done without actually doing it.");
 	getopt.add_option('s', "silent",     silent,        GetOpt::NO_ARG).set_help("Don't print any messages other than errors.");
 	getopt.add_option('t', "build-type", build_type_name, GetOpt::REQUIRED_ARG).set_help("Set build type.", "TYPE");
 	getopt.add_option('v', "verbose",    verbose,       GetOpt::NO_ARG).set_help("Print more information about what's going on.");
@@ -83,12 +84,12 @@ Builder::Builder(int argc, char **argv):
 	getopt.add_option('C', "chdir",      work_dir,      GetOpt::REQUIRED_ARG).set_help("Change to DIR before doing anything else.", "DIR");
 	getopt.add_option('P', "progress",   show_progress, GetOpt::NO_ARG).set_help("Display progress while building.");
 	getopt.add_option('W', "what-if",    what_if,       GetOpt::REQUIRED_ARG).set_help("Pretend that FILE has changed.", "FILE");
-	getopt.add_option(     "arch",       arch,          GetOpt::REQUIRED_ARG).set_help("Architecture to build for.", "ARCH");
+	getopt.add_option(     "arch",       arch,          GetOpt::REQUIRED_ARG).set_help("Build for architecture ARCH.", "ARCH");
 	getopt.add_option(     "conf-only",  conf_only,     GetOpt::NO_ARG).set_help("Stop after configuring packages.");
 	getopt.add_option(     "full-paths", full_paths,    GetOpt::NO_ARG).set_help("Output full paths in analysis.");
-	getopt.add_option(     "max-depth",  max_depth,     GetOpt::REQUIRED_ARG).set_help("Maximum depth to show in analysis.", "NUM");
-	getopt.add_option(     "prefix",     prfx,          GetOpt::REQUIRED_ARG).set_help("Directory to install things to.", "DIR");
-	getopt.add_option(     "warnings",   cmdline_warn,  GetOpt::REQUIRED_ARG).set_help("Compiler warnings to use.", "LIST");
+	getopt.add_option(     "max-depth",  max_depth,     GetOpt::REQUIRED_ARG).set_help("Show up to NUM levels in analysis.", "NUM");
+	getopt.add_option(     "prefix",     prfx,          GetOpt::REQUIRED_ARG).set_help("Install things to DIR.", "DIR");
+	getopt.add_option(     "tempdir",    temp_str,      GetOpt::REQUIRED_ARG).set_help("Store temporary files in DIR.", "DIR");
 	usagemsg = getopt.generate_usage(argv[0])+" [<target> ...]";
 	helpmsg = getopt.generate_help();
 	getopt(argc, argv);
@@ -107,20 +108,10 @@ Builder::Builder(int argc, char **argv):
 		logger.enable_channel("commands");
 	}
 	if(verbose>=3)
-	{
-		logger.enable_channel("packagemgr");
-		logger.enable_channel("configure");
-	}
-	if(verbose>=4)
 	{
 		logger.enable_channel("files");
 		logger.enable_channel("auxcommands");
 	}
-	if(verbose>=5)
-	{
-		logger.enable_channel("tools");
-		logger.enable_channel("vfs");
-	}
 	for(list<string>::const_iterator i=log_channels.begin(); i!=log_channels.end(); ++i)
 	{
 		vector<string> parts = split(*i, ',');
@@ -154,19 +145,20 @@ Builder::Builder(int argc, char **argv):
 	{
 		string::size_type equal = i->find('=');
 		if(equal!=string::npos)
-			cmdline_options.insert(StringMap::value_type(i->substr(0, equal), i->substr(equal+1)));
+			cmdline_options.insert(Config::InputOptions::value_type(i->substr(0, equal), i->substr(equal+1)));
 		else
 			cmdline_targets.push_back(*i);
 	}
 
-	if(cmdline_targets.empty())
-		cmdline_targets.push_back("default");
-
 	if(!work_dir.empty())
 		FS::chdir(work_dir);
 
 	cwd = FS::getcwd();
 
+	package_manager.append_package_path(cwd);
+	package_manager.append_package_path(cwd/"..");
+	package_manager.append_binary_package_path(FS::get_sys_data_dir(argv[0], "builder"));
+
 	package_manager.set_no_externals(no_externals);
 
 	if(arch.empty())
@@ -174,8 +166,12 @@ Builder::Builder(int argc, char **argv):
 	else
 		current_arch = new Architecture(*this, arch);
 
-	load_build_file((FS::get_sys_data_dir(argv[0], "builder")/"builderrc").str());
-	load_build_file((FS::get_user_data_dir("builder")/"rc").str());
+	list<FS::Path> start_files;
+	start_files.push_back(FS::get_sys_data_dir(argv[0], "builder")/"builderrc");
+	start_files.push_back(FS::get_user_data_dir("builder")/"rc");
+	for(list<FS::Path>::const_iterator i=start_files.begin(); i!=start_files.end(); ++i)
+		if(FS::exists(*i))
+			load_build_file(*i);
 
 	if(prfx.empty())
 	{
@@ -185,7 +181,10 @@ Builder::Builder(int argc, char **argv):
 			prefix = (FS::get_home_dir()/"local"/current_arch->get_name()).str();
 	}
 	else
-		prefix = FS::getcwd()/prfx;
+		prefix = cwd/prfx;
+
+	if(!temp_str.empty())
+		tempdir = temp_str;
 
 	if(!build_type_name.empty())
 	{
@@ -195,17 +194,6 @@ Builder::Builder(int argc, char **argv):
 		build_type = &i->second;
 	}
 
-	warnings.push_back("all");
-	warnings.push_back("extra");
-	warnings.push_back("shadow");
-	warnings.push_back("pointer-arith");
-	warnings.push_back("error");
-	for(StringList::iterator i=cmdline_warn.begin(); i!=cmdline_warn.end(); ++i)
-	{
-		vector<string> warns = split(*i, ',');
-		warnings.insert(warnings.end(), warns.begin(), warns.end());
-	}
-
 	toolchain.add_tool(new GnuCCompiler(*this, *current_arch));
 	toolchain.add_tool(new GnuCxxCompiler(*this, *current_arch));
 	toolchain.add_tool(new GnuLinker(*this, *current_arch));
@@ -213,37 +201,19 @@ Builder::Builder(int argc, char **argv):
 	toolchain.add_tool(new Copy(*this));
 	toolchain.add_tool(new Tar(*this));
 	toolchain.add_tool(new PkgConfigGenerator(*this));
+	if(current_arch->get_system()=="windows")
+		toolchain.add_tool(new MingwDllTool(*this, *current_arch));
 }
 
 Builder::~Builder()
 {
-	for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
-		delete i->second;
 	delete analyzer;
 }
 
 int Builder::main()
 {
-	if(prefix.str()!="/usr")
-	{
-		FS::Path pcdir = prefix/"lib"/"pkgconfig";
-		if(const char *pcp = getenv("PKG_CONFIG_PATH"))
-		{
-			vector<string> path = split(pcp, ':');
-			bool found = false;
-			for(vector<string>::const_iterator i=path.begin(); (!found && i!=path.end()); ++i)
-				found = (*i==pcdir.str());
-			if(!found)
-			{
-				path.push_back(pcdir.str());
-				setenv("PKG_CONFIG_PATH", join(path.begin(), path.end(), ":").c_str(), true);
-			}
-		}
-		else
-			setenv("PKG_CONFIG_PATH", pcdir.str().c_str(), true);
-	}
-
-	if(load_build_file(cwd/build_file))
+	FS::Path main_file = cwd/build_file;
+	if(!FS::exists(main_file))
 	{
 		if(help)
 		{
@@ -252,12 +222,12 @@ int Builder::main()
 		}
 		else
 		{
-			IO::print(IO::cerr, "No build info here.\n");
+			IO::print(IO::cerr, "The file %s does not exist.\n", main_file);
 			return 1;
 		}
 	}
 
-	main_pkg->configure(cmdline_options, conf_all?2:1);
+	load_build_file(main_file);
 
 	if(help)
 	{
@@ -267,15 +237,19 @@ int Builder::main()
 		return 0;
 	}
 
+	if(!prepare_build())
+		return 1;
+
 	if(conf_only)
 		return 0;
 
-	if(create_targets())
-		return 1;
-
 	logger.log("environment", format("Building on %s, for %s%s", native_arch.get_name(),
 		current_arch->get_name(), (current_arch->is_native() ? " (native)" : "")));
 	logger.log("environment", format("Prefix is %s", prefix));
+	if(tempdir.is_absolute())
+		logger.log("environment", format("Temporary directory is %s", tempdir));
+	else
+		logger.log("environment", format("Using per-package temporary directory %s", tempdir));
 	if(build_type)
 		logger.log("environment", format("Build type is %s", build_type->get_name()));
 
@@ -283,7 +257,7 @@ int Builder::main()
 	list<string> package_details;
 	for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
 	{
-		if(!i->second || !i->second->is_configured())
+		if(!i->second->is_prepared())
 			continue;
 
 		string line = i->second->get_name();
@@ -293,7 +267,8 @@ int Builder::main()
 
 			unsigned count = 0;
 			unsigned to_be_built = 0;
-			for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j)
+			const BuildGraph::TargetMap &targets = build_graph.get_targets();
+			for(BuildGraph::TargetMap::const_iterator j=targets.begin(); j!=targets.end(); ++j)
 				if(j->second->get_package()==i->second)
 				{
 					++count;
@@ -312,7 +287,7 @@ int Builder::main()
 		package_details.push_back(line);
 	}
 
-	logger.log("summary", format("%d active packages, %d targets", package_details.size(), targets.size()));
+	logger.log("summary", format("%d active packages, %d targets", package_details.size(), build_graph.get_targets().size()));
 	for(list<string>::const_iterator i=package_details.begin(); i!=package_details.end(); ++i)
 		logger.log("packages", *i);
 
@@ -331,30 +306,17 @@ int Builder::main()
 
 	if(clean)
 		exit_code = do_clean();
-	else if(build)
+	if(build)
 		exit_code = do_build();
 
 	return exit_code;
 }
 
-Target *Builder::get_target(const string &n) const
-{
-	TargetMap::const_iterator i = targets.find(n);
-	if(i!=targets.end())
-		return i->second;
-	return 0;
-}
-
 void Builder::problem(const string &p, const string &d)
 {
 	problems.push_back(Problem(p, d));
 }
 
-void Builder::add_target(Target *t)
-{
-	targets.insert(TargetMap::value_type(t->get_name(), t));
-}
-
 void Builder::usage(const char *reason, const char *argv0, bool brief)
 {
 	if(reason)
@@ -371,45 +333,25 @@ void Builder::usage(const char *reason, const char *argv0, bool brief)
 	}
 }
 
-int Builder::load_build_file(const FS::Path &fn)
+void Builder::load_build_file(const FS::Path &fn)
 {
-	if(!FS::exists(fn))
-		return -1;
-
 	IO::BufferedFile in(fn.str());
 
 	logger.log("files", format("Reading %s", fn));
 
 	DataFile::Parser parser(in, fn.str());
-	Loader loader(*this, fn.subpath(0, fn.size()-1));
+	Loader loader(*this);
 	loader.load(parser);
-
-	return 0;
 }
 
-int Builder::create_targets()
+bool Builder::prepare_build()
 {
-	Target *world = new VirtualTarget(*this, "world");
-
-	Target *def_tgt = new VirtualTarget(*this, "default");
-	world->add_depend(*def_tgt);
-
-	Target *install = new VirtualTarget(*this, "install");
-	world->add_depend(*install);
-
-	Target *tarballs = new VirtualTarget(*this, "tarballs");
-	world->add_depend(*tarballs);
+	package_manager.get_main_package().prepare();
 
-	const PackageManager::PackageMap &packages = package_manager.get_packages();
-	for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
-		if(i->second && i->second->is_configured())
-			i->second->create_targets();
-
-	// Make the cmdline target depend on all targets mentioned on the command line
-	Target *cmdline = new VirtualTarget(*this, "cmdline");
-	for(list<string>::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i)
+	// Add targets from command line as goals
+	for(NameList::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i)
 	{
-		Target *tgt = get_target(*i);
+		Target *tgt = build_graph.get_target(*i);
 		if(!tgt)
 			tgt = vfs.get_target(*i);
 		if(!tgt)
@@ -417,50 +359,42 @@ int Builder::create_targets()
 		if(!tgt)
 		{
 			IO::print("I don't know anything about %s\n", *i);
-			return -1;
+			return false;
 		}
 
-		cmdline->add_depend(*tgt);
+		build_graph.add_goal(*tgt);
 	}
 
-	cmdline->prepare();
+	build_graph.prepare();
 
 	// Apply what-ifs
-	for(StringList::iterator i=what_if.begin(); i!=what_if.end(); ++i)
+	for(NameList::iterator i=what_if.begin(); i!=what_if.end(); ++i)
 	{
 		FileTarget *tgt = vfs.get_target(cwd/ *i);
 		if(!tgt)
 		{
 			IO::print(IO::cerr, "Unknown what-if target %s\n", *i);
-			return -1;
+			return false;
 		}
 		tgt->touch();
 	}
 
 	if(build_all)
-	{
-		for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
-			if(i->second->is_buildable() && !i->second->needs_rebuild())
-				i->second->force_rebuild();
-	}
+		build_graph.force_full_rebuild();
 
 	if(!dry_run)
 	{
+		const PackageManager::PackageMap &packages = package_manager.get_packages();
 		for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
 			i->second->save_caches();
 	}
 
-	return 0;
+	return true;
 }
 
 int Builder::do_build()
 {
-	Target *cmdline = get_target("cmdline");
-
-	unsigned total = 0;
-	for(map<string, Target *>::const_iterator i=targets.begin(); i!=targets.end(); ++i)
-		if(i->second->is_buildable() && i->second->needs_rebuild())
-			++total;
+	unsigned total = build_graph.count_rebuild_targets();
 
 	if(!total)
 	{
@@ -475,12 +409,13 @@ int Builder::do_build()
 
 	bool fail = false;
 	bool finish = false;
+	bool starved = false;
 
 	while(!finish)
 	{
-		if(tasks.size()<jobs && !fail)
+		if(tasks.size()<jobs && !fail && !starved)
 		{
-			Target *tgt = cmdline->get_buildable_target();
+			Target *tgt = build_graph.get_buildable_target();
 			if(tgt)
 			{
 				if(tgt->get_tool())
@@ -506,13 +441,20 @@ int Builder::do_build()
 			}
 			else if(tasks.empty())
 				finish = true;
+			else
+				starved = true;
 		}
 		else
 			Time::sleep(10*Time::msec);
 
 		for(unsigned i=0; i<tasks.size();)
 		{
-			Task::Status status = tasks[i]->check();
+			Task::Status status;
+			if(jobs==1 || (tasks.size()==1 && starved))
+				status = tasks[i]->wait();
+			else
+				status = tasks[i]->check();
+
 			if(status!=Task::RUNNING)
 			{
 				++count;
@@ -523,6 +465,7 @@ int Builder::do_build()
 					fail = true;
 				if(tasks.empty() && fail)
 					finish = true;
+				starved = false;
 			}
 			else
 				++i;
@@ -536,6 +479,13 @@ int Builder::do_build()
 	else if(show_progress)
 		logger.log("summary", "Build complete");
 
+	if(!dry_run)
+	{
+		const PackageManager::PackageMap &packages = package_manager.get_packages();
+		for(PackageManager::PackageMap::const_iterator i=packages.begin(); i!=packages.end(); ++i)
+			i->second->save_caches();
+	}
+
 	return fail;
 }
 
@@ -545,38 +495,41 @@ int Builder::do_clean()
 
 	set<Target *> clean_tgts;
 	list<Target *> queue;
-	queue.push_back(get_target("cmdline"));
+	queue.push_back(build_graph.get_target("cmdline"));
 
 	while(!queue.empty())
 	{
 		Target *tgt = queue.front();
 		queue.erase(queue.begin());
 
-		if(tgt->is_buildable() && (tgt->get_package()==main_pkg || clean>=2))
+		if(tgt->is_buildable() && (tgt->get_package()==&package_manager.get_main_package() || clean>=2))
 			clean_tgts.insert(tgt);
 
-		const Target::Dependencies &deps = tgt->get_depends();
+		const Target::Dependencies &deps = tgt->get_dependencies();
 		for(list<Target *>::const_iterator i=deps.begin(); i!=deps.end(); ++i)
 			if(!clean_tgts.count(*i))
 				queue.push_back(*i);
 	}
 
 	for(set<Target *>::iterator i=clean_tgts.begin(); i!=clean_tgts.end(); ++i)
-		if(FileTarget *ft = dynamic_cast<FileTarget *>(*i))
-			if(ft->get_mtime())
-				FS::unlink(ft->get_path());
+	{
+		logger.log("tasks", format("RM    %s", (*i)->get_name()));
+		if(!dry_run)
+			(*i)->clean();
+	}
 
 	return 0;
 }
 
 void Builder::package_help()
 {
-	const Config &config = main_pkg->get_config();
+	SourcePackage &main_pkg = dynamic_cast<SourcePackage &>(package_manager.get_main_package());
+	const Config &config = main_pkg.get_config();
 	const Config::OptionMap &options = config.get_options();
 
 	IO::print("Required packages:\n  ");
-	const PackageList &requires = main_pkg->get_requires();
-	for(PackageList::const_iterator i=requires.begin(); i!=requires.end(); ++i)
+	const Package::Requirements &requires = main_pkg.get_required_packages();
+	for(Package::Requirements::const_iterator i=requires.begin(); i!=requires.end(); ++i)
 	{
 		if(i!=requires.begin())
 			IO::print(", ");
@@ -586,9 +539,9 @@ void Builder::package_help()
 	for(Config::OptionMap::const_iterator i=options.begin(); i!=options.end(); ++i)
 	{
 		const Config::Option &opt = i->second;
-		IO::print("  %s: %s (%s)", opt.name, opt.descr, opt.value);
-		if(opt.value!=opt.defv)
-			IO::print(" [%s]", opt.defv);
+		IO::print("  %s: %s (%s)", opt.name, opt.description, opt.value);
+		if(opt.value!=opt.default_value)
+			IO::print(" [%s]", opt.default_value);
 		IO::print("\n");
 	}
 }
@@ -597,9 +550,8 @@ string Builder::usagemsg;
 string Builder::helpmsg;
 
 
-Builder::Loader::Loader(Builder &b, const FS::Path &s):
-	DataFile::ObjectLoader<Builder>(b),
-	src(s)
+Builder::Loader::Loader(Builder &b):
+	DataFile::ObjectLoader<Builder>(b)
 {
 	add("architecture", &Loader::architecture);
 	add("binary_package", &Loader::binpkg);
@@ -636,11 +588,13 @@ void Builder::Loader::profile(const string &)
 
 void Builder::Loader::package(const string &n)
 {
-	SourcePackage *pkg = new SourcePackage(obj, n, src);
-	if(!obj.main_pkg)
-		obj.main_pkg = pkg;
+	SourcePackage *pkg = new SourcePackage(obj, n, get_source());
+
+	if(obj.conf_all || pkg==&obj.package_manager.get_main_package())
+		load_sub(*pkg, obj.cmdline_options);
+	else
+		load_sub(*pkg);
 
-	load_sub(*pkg);
 	if(obj.build_type)
 		pkg->set_build_type(*obj.build_type);
 }