X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=d598a9f5cb2caa8bc6e5f8d238bdaad9c0ddd86a;hb=23477a725988c3c896c2853c2417054c1310dabc;hp=fde33cc65bd821e1474afdb49986cb3b4250babf;hpb=d80e69473f380cc27d81ed95a5660047128975e2;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index fde33cc..d598a9f 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.");
@@ -165,8 +165,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())
 	{
@@ -207,7 +211,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)
 		{
@@ -216,11 +221,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);
@@ -297,7 +304,7 @@ int Builder::main()
 
 	if(clean)
 		exit_code = do_clean();
-	else if(build)
+	if(build)
 		exit_code = do_build();
 
 	return exit_code;
@@ -345,11 +352,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));
@@ -357,8 +361,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()
@@ -550,9 +552,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;
 }