X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=257c931732b556cde8e5b17078dcb91d57f13cd7;hb=a2adbd9c0a8d7a7567848c4c6bdbf0de6ba32bb1;hp=147371cd22519524683df31378fc0b6597d118f7;hpb=7567502e17be7704d58ced2f49703fcf71c7ef38;p=builder.git

diff --git a/source/builder.cpp b/source/builder.cpp
index 147371c..257c931 100644
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -10,10 +10,12 @@ Distributed under the LGPL
 #include <msp/core/except.h>
 #include <msp/core/getopt.h>
 #include <msp/datafile/parser.h>
+#include <msp/fs/dir.h>
+#include <msp/fs/stat.h>
+#include <msp/fs/utils.h>
 #include <msp/io/buffered.h>
 #include <msp/io/except.h>
 #include <msp/io/file.h>
-#include <msp/path/utils.h>
 #include <msp/strings/formatter.h>
 #include <msp/strings/regex.h>
 #include <msp/strings/utils.h>
@@ -60,6 +62,7 @@ Builder::Builder(int argc, char **argv):
 	bool     full_paths=false;
 	unsigned max_depth=5;
 	StringList cmdline_warn;
+	string   prfx;
 
 	GetOpt getopt;
 	getopt.add_option('a', "analyze",    analyze_mode, GetOpt::REQUIRED_ARG);
@@ -80,7 +83,7 @@ Builder::Builder(int argc, char **argv):
 	getopt.add_option(     "full-paths", full_paths,   GetOpt::NO_ARG);
 	//getopt.add_option(     "makefile",   create_makefile, GetOpt::NO_ARG);
 	getopt.add_option(     "max-depth",  max_depth,    GetOpt::REQUIRED_ARG);
-	getopt.add_option(     "prefix",     prefix,       GetOpt::REQUIRED_ARG);
+	getopt.add_option(     "prefix",     prfx,         GetOpt::REQUIRED_ARG);
 	getopt.add_option(     "warnings",   cmdline_warn, GetOpt::REQUIRED_ARG);
 	getopt(argc, argv);
 
@@ -121,7 +124,7 @@ Builder::Builder(int argc, char **argv):
 	if(!work_dir.empty())
 		chdir(work_dir.c_str());
 
-	cwd=getcwd();
+	cwd=FS::getcwd();
 
 	Architecture &native_arch=archs.insert(ArchMap::value_type("native", Architecture(*this, "native"))).first->second;
 	native_arch.set_tool("CC",  "gcc");
@@ -130,15 +133,17 @@ Builder::Builder(int argc, char **argv):
 	native_arch.set_tool("LXX", "g++");
 	native_arch.set_tool("AR",  "ar");
 
-	load_build_file((get_home_dir()/".builderrc").str());
+	load_build_file((FS::get_home_dir()/".builderrc").str());
 
-	if(prefix.empty())
+	if(prfx.empty())
 	{
 		if(current_arch=="native")
-			prefix=(get_home_dir()/"local").str();
+			prefix=(FS::get_home_dir()/"local").str();
 		else
-			prefix=(get_home_dir()/"local"/current_arch).str();
+			prefix=(FS::get_home_dir()/"local"/current_arch).str();
 	}
+	else
+		prefix=prfx;
 
 	warnings.push_back("all");
 	warnings.push_back("extra");
@@ -246,7 +251,7 @@ Target *Builder::get_header(const string &include, const string &from, const lis
 		argv.push_back(get_current_arch().get_tool("CXX"));
 		argv.push_back("--version");
 		cxx_ver=Regex("[0-9]\\.[0-9.]+").match(run_command(argv))[0].str;
-		while(!cxx_ver.empty() && !exists(Path("/usr/include/c++")/cxx_ver))
+		while(!cxx_ver.empty() && !FS::is_dir(FS::Path("/usr/include/c++")/cxx_ver))
 		{
 			unsigned dot=cxx_ver.rfind('.');
 			if(dot==string::npos)
@@ -266,15 +271,15 @@ Target *Builder::get_header(const string &include, const string &from, const lis
 		syspath.push_back("/usr/include");
 	else
 		syspath.push_back("/usr/"+get_architecture(current_arch).get_prefix()+"/include");
-	syspath.push_back((Path("/usr/include/c++/")/cxx_ver/fn).str());
+	syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver/fn).str());
 
 	Target *tgt=0;
 	if(include[0]=='\"')
-		tgt=get_header(Path(from)/fn);
+		tgt=get_header(FS::Path(from)/fn);
 	for(list<string>::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
 		tgt=get_header(cwd/ *j/fn);
 	for(list<string>::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
-		tgt=get_header(Path(*j)/fn);
+		tgt=get_header(FS::Path(*j)/fn);
 
 	includes.insert(TargetMap::value_type(id, tgt));
 
@@ -497,7 +502,7 @@ Loads the given build file.
 
 @return  0 on success, -1 if the file could not be opened
 */
-int Builder::load_build_file(const Path &fn)
+int Builder::load_build_file(const FS::Path &fn)
 {
 	try
 	{
@@ -620,12 +625,12 @@ int Builder::create_targets()
 Check if a header exists, either as a target or a file.  Either an existing
 target or a new SystemHeader target will be returned.
 */
-Target *Builder::get_header(const Msp::Path &fn)
+Target *Builder::get_header(const Msp::FS::Path &fn)
 {
 	Target *tgt=get_target(fn.str());
 	if(tgt) return tgt;
 
-	if(exists(fn))
+	if(FS::is_reg(fn))
 	{
 		tgt=new SystemHeader(*this, fn.str());
 		return tgt;
@@ -633,7 +638,7 @@ Target *Builder::get_header(const Msp::Path &fn)
 	return 0;
 }
 
-Target *Builder::get_library(const string &lib, const Path &path, LibMode mode)
+Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mode)
 {
 	// Populate a list of candidate filenames
 	StringList candidates;
@@ -673,7 +678,7 @@ Target *Builder::get_library(const string &lib, const Path &path, LibMode mode)
 			else if(tgt)
 				return tgt;
 		}
-		else if(exists(full))
+		else if(FS::is_reg(full))
 		{
 			tgt=new SystemLibrary(*this, full);
 			return tgt;
@@ -831,7 +836,7 @@ void Builder::package_help()
 Application::RegApp<Builder> Builder::reg;
 
 
-Builder::Loader::Loader(Builder &b, const Path &s):
+Builder::Loader::Loader(Builder &b, const FS::Path &s):
 	bld(b),
 	src(s)
 {
@@ -858,7 +863,8 @@ void Builder::Loader::binpkg(const string &n)
 void Builder::Loader::profile(const string &n)
 {
 	StringMap prf;
-	load_sub<ProfileLoader>(prf);
+	ProfileLoader ldr(prf);
+	load_sub_with(ldr);
 	bld.profile_tmpl.insert(ProfileTemplateMap::value_type(n, prf));
 }