conf_all(false),
conf_only(false),
build_all(false),
- create_makefile(false)
+ create_makefile(false),
+ current_arch("native")
{
string analyze_mode;
string work_dir;
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", prefix, GetOpt::REQUIRED_ARG);
getopt(argc, argv);
if(!analyze_mode.empty())
native_arch.set_tool("LXX", "g++");
native_arch.set_tool("AR", "ar");
- const char *home=getenv("HOME");
- if(home)
- load_build_file((Path(home)/".builderrc").str());
+ load_build_file((get_home_dir()/".builderrc").str());
+
+ if(prefix.empty())
+ {
+ if(current_arch=="native")
+ prefix=(get_home_dir()/"local").str();
+ else
+ prefix=(get_home_dir()/"local"/current_arch).str();
+ }
}
/**
-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));
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 &arch, 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(cxx_ver.empty())
{
StringList argv;
- argv.push_back(get_architecture(arch).get_tool("CXX"));
+ 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))
cout<<"Looking for include "<<fn<<" with path "<<join(path.begin(), path.end())<<'\n';
StringList syspath;
- if(arch=="native")
+ if(current_arch=="native")
syspath.push_back("/usr/include");
else
- syspath.push_back("/usr/"+get_architecture(arch).get_prefix()+"/include");
+ syspath.push_back("/usr/"+get_architecture(current_arch).get_prefix()+"/include");
syspath.push_back((Path("/usr/include/c++/")/cxx_ver/fn).str());
Target *tgt=0;
@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)
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::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, arch, *j, mode);
+ 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(conf_only)
return 0;
return 0;
}
-Target *Builder::get_library(const string &lib, const string &arch, const Path &path, LibMode mode)
+Target *Builder::get_library(const string &lib, const 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");
/* 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)
projects / builder.git / blobdiff