X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=92f639c9c594e184f617dce0b204677bb7225ea5;hb=a0868300fc26496b5a7551d1b732925c11350fdd;hp=e45e696a0e4f6e62a67496147b4295502e15473a;hpb=743cfd33ee12718eaa3bdb2d6f15bff15a1d6425;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index e45e696..92f639c 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -68,7 +68,7 @@ Builder::Builder(int argc, char **argv):
 
 	GetOpt getopt;
 	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 doing analysis.");
+	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 build instructions from FILE.", "FILE");
 	getopt.add_option('h', "help",       help,          GetOpt::NO_ARG).set_help("Print this message.");
@@ -108,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, ',');
@@ -168,6 +158,10 @@ Builder::Builder(int argc, char **argv):
 
 	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())
@@ -175,8 +169,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())
 	{
@@ -217,7 +215,8 @@ Builder::~Builder()
 
 int Builder::main()
 {
-	if(load_build_file(cwd/build_file))
+	FS::Path main_file = cwd/build_file;
+	if(!FS::exists(main_file))
 	{
 		if(help)
 		{
@@ -226,11 +225,13 @@ 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;
 		}
 	}
 
+	load_build_file(main_file);
+
 	if(help)
 	{
 		usage(0, "builder", false);
@@ -307,7 +308,7 @@ int Builder::main()
 
 	if(clean)
 		exit_code = do_clean();
-	else if(build)
+	if(build)
 		exit_code = do_build();
 
 	return exit_code;
@@ -355,11 +356,8 @@ 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));
@@ -367,8 +365,6 @@ int Builder::load_build_file(const FS::Path &fn)
 	DataFile::Parser parser(in, fn.str());
 	Loader loader(*this);
 	loader.load(parser);
-
-	return 0;
 }
 
 bool Builder::prepare_build()
@@ -560,9 +556,11 @@ int Builder::do_clean()
 	}
 
 	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;
 }