X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=f894de08fda7bfb55d0bade32d1f94055a7d26b9;hb=5cfcbc7507b14df81018f734ae47f92b231b10d2;hp=92f639c9c594e184f617dce0b204677bb7225ea5;hpb=a5ea586a080ef6766a7d68b1c40633c6ae8b8ba4;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index 92f639c..f894de0 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -56,7 +56,6 @@ Builder::Builder(int argc, char **argv):
 	string work_dir;
 	bool full_paths = false;
 	unsigned max_depth = 4;
-	StringList cmdline_warn;
 	string prfx;
 	string temp_str;
 	string arch;
@@ -145,7 +144,7 @@ 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);
 	}
@@ -384,7 +383,7 @@ bool Builder::prepare_build()
 
 	// 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)
+	for(NameList::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i)
 	{
 		Target *tgt = get_target(*i);
 		if(!tgt)
@@ -403,7 +402,7 @@ bool Builder::prepare_build()
 	cmdline->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)
@@ -571,8 +570,8 @@ void Builder::package_help()
 	const Config::OptionMap &options = config.get_options();
 
 	IO::print("Required packages:\n  ");
-	const PackageList &requires = main_pkg->get_required_packages();
-	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(", ");