#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>
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);
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);
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");
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");
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)
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));
@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
{
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;
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;
else if(tgt)
return tgt;
}
- else if(exists(full))
+ else if(FS::is_reg(full))
{
tgt=new SystemLibrary(*this, full);
return tgt;
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)
{
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));
}