Distributed under the LGPL
*/
-#include <fstream>
#include <iostream>
#include <set>
-#include <msp/core/error.h>
+#include <msp/core/except.h>
#include <msp/core/getopt.h>
#include <msp/datafile/parser.h>
-#include <msp/path/utils.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/strings/formatter.h>
+#include <msp/strings/regex.h>
#include <msp/strings/utils.h>
#include <msp/time/units.h>
#include <msp/time/utils.h>
conf_all(false),
conf_only(false),
build_all(false),
- create_makefile(false)
+ create_makefile(false),
+ current_arch("native")
{
string analyze_mode;
string work_dir;
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('C', "chdir", work_dir, GetOpt::REQUIRED_ARG);
getopt.add_option('P', "progress", show_progress, GetOpt::NO_ARG);
getopt.add_option('W', "what-if", what_if, GetOpt::REQUIRED_ARG);
+ getopt.add_option( "arch", current_arch, GetOpt::REQUIRED_ARG);
getopt.add_option( "conf-only", conf_only, GetOpt::NO_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", prfx, GetOpt::REQUIRED_ARG);
+ getopt.add_option( "warnings", cmdline_warn, GetOpt::REQUIRED_ARG);
getopt(argc, argv);
if(!analyze_mode.empty())
if(!work_dir.empty())
chdir(work_dir.c_str());
- cwd=Path::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");
- const char *home=getenv("HOME");
- if(home)
- load_build_file((Path::Path(home)/".builderrc").str());
+ load_build_file((FS::get_home_dir()/".builderrc").str());
+
+ if(prfx.empty())
+ {
+ if(current_arch=="native")
+ prefix=(FS::get_home_dir()/"local").str();
+ else
+ prefix=(FS::get_home_dir()/"local"/current_arch).str();
+ }
+ else
+ prefix=prfx;
+
+ warnings.push_back("all");
+ warnings.push_back("extra");
+ warnings.push_back("shadow");
+ warnings.push_back("pointer-arith");
+ warnings.push_back("error");
+ for(StringList::iterator i=cmdline_warn.begin(); i!=cmdline_warn.end(); ++i)
+ {
+ vector<string> warns=split(*i, ',');
+ warnings.insert(warnings.end(), warns.begin(), warns.end());
+ }
}
/**
-Gets a package with the specified name, possibly creating it.
+Gets a package by name, possibly creating it.
-@param n Package name
+@param name Package name
@return Pointer to the package, or 0 if the package could not be located
*/
-Package *Builder::get_package(const string &n)
+Package *Builder::get_package(const string &name)
{
- PackageMap::iterator i=packages.find(n);
+ PackageMap::iterator i=packages.find(format("%s/%s", name, current_arch));
+ if(i==packages.end())
+ i=packages.find(name);
if(i!=packages.end())
return i->second;
list<string> argv;
argv.push_back("pkg-config");
argv.push_back("--variable=source");
- argv.push_back(n);
+ argv.push_back(name);
+ if(verbose>=4)
+ cout<<"Running "<<join(argv.begin(), argv.end())<<'\n';
string srcdir=strip(run_command(argv));
PathList dirs;
dirs.push_back(srcdir);
// Make some other guesses about the source directory
- string dirname=n;
- if(!dirname.compare(0, 3, "msp"))
- dirname.erase(0, 3);
- dirs.push_back(cwd/dirname);
- dirs.push_back(cwd/".."/dirname);
+ dirs.push_back(cwd/name);
+ dirs.push_back(cwd/".."/name);
+ if(!name.compare(0, 3, "msp"))
+ {
+ dirs.push_back(cwd/name.substr(3));
+ dirs.push_back(cwd/".."/name.substr(3));
+ }
// Go through the candidate directories and look for a Build file
for(PathList::iterator j=dirs.begin(); j!=dirs.end(); ++j)
if(!load_build_file(*j/"Build"))
{
- i=packages.find(n);
+ i=packages.find(name);
if(i!=packages.end())
return i->second;
break;
}
// Package source not found - create a binary package
- Package *pkg=BinaryPackage::from_pkgconfig(*this, n);
+ Package *pkg=BinaryPackage::from_pkgconfig(*this, name);
- packages.insert(PackageMap::value_type(n, pkg));
+ packages.insert(PackageMap::value_type(name, pkg));
if(!pkg)
- problem(n, "not found");
+ problem(name, "not found");
return pkg;
}
is not found but a file exists, a new SystemHeader target will be created and
returned.
*/
-Target *Builder::get_header(const string &include, const string &, const string &from, const list<string> &path)
+Target *Builder::get_header(const string &include, const string &from, const list<string> &path)
{
string hash(8, 0);
update_hash(hash, from);
if(i!=includes.end())
return i->second;
- string fn=include.substr(1);
- Target *tgt=0;
- if(include[0]=='"' && (tgt=get_header(Path::Path(from)/fn)))
- ;
- else if((tgt=get_header(Path::Path("/usr/include")/fn)))
- ;
- //XXX Determine the C++ header location dynamically
- else if((tgt=get_header(Path::Path("/usr/include/c++/4.1.2")/fn)))
- ;
- else
+ static string cxx_ver;
+ if(cxx_ver.empty())
{
- for(list<string>::const_iterator j=path.begin(); (j!=path.end() && !tgt); ++j)
- tgt=get_header(cwd/ *j/fn);
+ StringList argv;
+ 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() && !FS::is_dir(FS::Path("/usr/include/c++")/cxx_ver))
+ {
+ unsigned dot=cxx_ver.rfind('.');
+ if(dot==string::npos)
+ break;
+ cxx_ver.erase(dot);
+ }
+ if(verbose>=5)
+ cout<<"C++ version is "<<cxx_ver<<'\n';
}
+ string fn=include.substr(1);
+ if(verbose>=5)
+ cout<<"Looking for include "<<fn<<" with path "<<join(path.begin(), path.end())<<'\n';
+
+ StringList syspath;
+ if(current_arch=="native")
+ syspath.push_back("/usr/include");
+ else
+ syspath.push_back("/usr/"+get_architecture(current_arch).get_prefix()+"/include");
+ syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver/fn).str());
+
+ Target *tgt=0;
+ if(include[0]=='\"')
+ 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(FS::Path(*j)/fn);
+
includes.insert(TargetMap::value_type(id, tgt));
return tgt;
@return Some kind of library target, if a match was found
*/
-Target *Builder::get_library(const string &lib, const string &arch, const list<string> &path, LibMode mode)
+Target *Builder::get_library(const string &lib, const list<string> &path, LibMode mode)
{
string hash(8, 0);
for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
update_hash(hash, *i);
- //XXX Incorporate mode into id
- string id=hash+lib;
+ string id=hash+string(1, mode)+lib;
TargetMap::iterator i=libraries.find(id);
if(i!=libraries.end())
return i->second;
StringList syspath;
- if(arch=="native")
+ if(current_arch=="native")
{
syspath.push_back("/lib");
syspath.push_back("/usr/lib");
}
else
- syspath.push_back("/usr/"+get_architecture(arch).get_prefix()+"/lib");
+ syspath.push_back("/usr/"+get_current_arch().get_prefix()+"/lib");
+
+ if(verbose>=5)
+ cout<<"Looking for library "<<lib<<" with path "<<join(path.begin(), path.end())<<'\n';
Target *tgt=0;
- for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
- tgt=get_library(lib, arch, *j, mode);
for(StringList::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j)
- tgt=get_library(lib, arch, cwd/ *j, mode);
+ tgt=get_library(lib, cwd/ *j, mode);
+ for(StringList::iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j)
+ tgt=get_library(lib, *j, mode);
libraries.insert(TargetMap::value_type(id, tgt));
{
ArchMap::const_iterator i=archs.find(arch);
if(i==archs.end())
- throw InvalidParameterValue("Unknown architecture");
+ throw KeyError("Unknown architecture", arch);
return i->second;
}
+const Architecture &Builder::get_current_arch() const
+{
+ return get_architecture(current_arch);
+}
+
void Builder::apply_profile_template(Config &config, const string &pt) const
{
vector<string> parts=split(pt, '-');
PackageList all_reqs=main_pkg->collect_requires();
- for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
- {
- SourcePackage *spkg=dynamic_cast<SourcePackage *>(*i);
- string prob;
- if(spkg && spkg->get_arch()!=main_pkg->get_arch())
- problem(spkg->get_name(), format("wrong architecture (%s)", spkg->get_arch()));
- }
-
- if(!problems.empty())
- {
- cerr<<"The following problems were detected:\n";
- for(ProblemList::iterator i=problems.begin(); i!=problems.end(); ++i)
- cerr<<" "<<i->package<<": "<<i->descr<<'\n';
- cerr<<"Please fix them and try again.\n";
- return 1;
- }
-
if(conf_only)
return 0;
if(analyzer)
analyzer->analyze();
+ if(!problems.empty())
+ {
+ cerr<<"The following problems were detected:\n";
+ for(ProblemList::iterator i=problems.begin(); i!=problems.end(); ++i)
+ cerr<<" "<<i->package<<": "<<i->descr<<'\n';
+ cerr<<"Please fix them and try again.\n";
+ return 1;
+ }
+
//if(create_makefile
if(clean)
cerr<<reason<<'\n';
if(brief)
- cerr<<"Usage: "<<argv0<<" [-a|--analyze MODE] [-b|--build] [-c|--clean] [-f|--file FILE] [-h|--help] [-j|--jobs NUM] [-n||--dry-run] [-v|--verbose] [-A|--conf-all] [-B|--build-all] [-C|--chdir DIRECTORY] [-W|--what-if FILE] [--chrome] [--conf-only] [--full-paths] [--max-depth NUM] [<target> ...]";
+ cerr<<"Usage: "<<argv0<<" [-a|--analyze MODE] [-b|--build] [-c|--clean] [-f|--file FILE] [-h|--help] [-j|--jobs NUM] [-n||--dry-run] [-v|--verbose] [-A|--conf-all] [-B|--build-all] [-C|--chdir DIRECTORY] [-W|--what-if FILE] [--chrome] [--conf-only] [--full-paths] [--max-depth NUM] [<target> ...]\n";
else
{
cerr<<
" -C, --chdir DIR Change to DIR before doing anything else.\n"
" -P, --progress Display progress while building.\n"
" -W, --what-if FILE Pretend that FILE has changed.\n"
+ " --arch ARCH Architecture to build for.\n"
" --conf-only Stop after configuring packages.\n"
" --full-paths Output full paths in analysis.\n"
//" --makefile Create a makefile for this package.\n"
- " --max-depth NUM Maximum depth to show in analysis.\n";
+ " --max-depth NUM Maximum depth to show in analysis.\n"
+ " --prefix DIR Directory to install things to.\n"
+ " --warnings LIST Compiler warnings to use.\n";
}
}
@return 0 on success, -1 if the file could not be opened
*/
-int Builder::load_build_file(const Path::Path &fn)
+int Builder::load_build_file(const FS::Path &fn)
{
- ifstream in(fn.str().c_str());
- if(!in)
- return -1;
+ try
+ {
+ IO::File inf(fn.str());
+ IO::Buffered in(inf);
- if(verbose>=3)
- cout<<"Reading "<<fn<<'\n';
+ if(verbose>=3)
+ cout<<"Reading "<<fn<<'\n';
- DataFile::Parser parser(in, fn.str());
- Loader loader(*this, fn.subpath(0, fn.size()-1));
- loader.load(parser);
+ DataFile::Parser parser(in, fn.str());
+ Loader loader(*this, fn.subpath(0, fn.size()-1));
+ loader.load(parser);
+ }
+ catch(const IO::FileNotFound &)
+ {
+ return -1;
+ }
return 0;
}
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::Path &fn)
+Target *Builder::get_header(const Msp::FS::Path &fn)
{
Target *tgt=get_target(fn.str());
if(tgt) return tgt;
- if(Path::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 string &arch, const Path::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;
if(mode!=ALL_STATIC)
{
- if(arch=="win32")
+ if(current_arch=="win32")
+ {
candidates.push_back("lib"+lib+".dll");
+ candidates.push_back(lib+".dll");
+ }
else
candidates.push_back("lib"+lib+".so");
}
/* Static libraries are always considered, since sometimes shared versions
may not be available */
candidates.push_back("lib"+lib+".a");
- if(arch=="win32")
+ if(current_arch=="win32")
candidates.push_back("lib"+lib+".dll.a");
for(StringList::iterator i=candidates.begin(); i!=candidates.end(); ++i)
else if(tgt)
return tgt;
}
- else if(Path::exists(full))
+ else if(FS::is_reg(full))
{
tgt=new SystemLibrary(*this, full);
return tgt;
for(set<Target *>::iterator i=clean_tgts.begin(); i!=clean_tgts.end(); ++i)
{
Action *action=new Unlink(*this, **i);
- while(action->check()<0);
+ while(action->check()<0) ;
delete action;
}
Application::RegApp<Builder> Builder::reg;
-Builder::Loader::Loader(Builder &b, const Path::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));
}
projects / builder.git / blobdiff