From: Mikko Rasa <tdb@tdb.fi>
Date: Tue, 17 Oct 2006 20:51:51 +0000 (+0000)
Subject: Change conf_all into a normal commandline option
X-Git-Tag: 0.9~55
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=7e17b52f23dbbf06b425f69f4b8a84867e2f0597;p=builder.git

Change conf_all into a normal commandline option
---

diff --git a/source/builder.cpp b/source/builder.cpp
index 1917cd4..bab8eb0 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -47,6 +47,7 @@ Builder::Builder(int argc, char **argv):
 	getopt.add_option(GetOpt::Option('f', "file", GetOpt::REQUIRED, "Build"));
 	getopt.add_option(GetOpt::Option("chrome", GetOpt::NONE));
 	getopt.add_option(GetOpt::Option("full-paths", GetOpt::NONE));
+	getopt.add_option(GetOpt::Option('A', "conf-all", GetOpt::NONE));
 	int index=getopt(argc, argv);
 
 	verbose+=getopt['v'].count();
@@ -81,6 +82,8 @@ Builder::Builder(int argc, char **argv):
 
 	chrome=getopt["chrome"];
 
+	conf_all=getopt['A'];
+
 	if(getopt['C'])
 		chdir(getopt['C'].arg().c_str());
 
@@ -234,7 +237,6 @@ int Builder::main()
 
 	default_pkg=packages.begin()->second;
 
-	bool conf_all=cmdline_options.count("conf_all");
 	while(!new_pkgs.empty())
 	{
 		Package *pkg=new_pkgs.front();
diff --git a/source/builder.h b/source/builder.h
index cff7c4e..400be8a 100644
--- a/source/builder.h
+++ b/source/builder.h
@@ -63,6 +63,7 @@ private:
 	unsigned    jobs;
 	std::list<std::string> what_if;
 	bool        chrome;
+	bool        conf_all;
 
 	int load_build_file(const Msp::Path::Path &);
 	int create_targets();