#include <fstream>
#include <iostream>
#include <msp/progress.h>
-#include <msp/strconv.h>
-#include <msp/strutils.h>
#include <msp/core/error.h>
#include <msp/getopt++/getopt++.h>
#include <msp/parser/parser.h>
#include <msp/path/utils.h>
+#include <msp/strings/utils.h>
#include <msp/time/units.h>
#include <msp/time/utils.h>
#include "action.h"
#include "misc.h"
#include "objectfile.h"
#include "package.h"
+#include "pkgconfig.h"
#include "sharedlibrary.h"
#include "staticlibrary.h"
#include "systemlibrary.h"
Builder::Builder(int argc, char **argv):
analyzer(0),
- do_build(true),
+ do_build(false),
verbose(1),
chrome(false),
build_file("Build"),
jobs(1)
{
+ string analyze_mode;
+ string work_dir;
+ bool full_paths=false;
+ unsigned max_depth=5;
+
GetOpt getopt;
- getopt.add_option(GetOpt::Option('a', "analyze", GetOpt::REQUIRED));
- getopt.add_option(GetOpt::Option('b', "build", GetOpt::NONE));
- getopt.add_option(GetOpt::Option('c', "clean", GetOpt::NONE));
- getopt.add_option(GetOpt::Option('f', "file", GetOpt::REQUIRED, "Build"));
- getopt.add_option(GetOpt::Option('h', "help", GetOpt::NONE));
- getopt.add_option(GetOpt::Option('j', "jobs", GetOpt::REQUIRED, "1"));
- getopt.add_option(GetOpt::Option('n', "dry-run", GetOpt::NONE));
- getopt.add_option(GetOpt::Option('v', "verbose", GetOpt::NONE));
- getopt.add_option(GetOpt::Option('A', "conf-all", GetOpt::NONE));
- getopt.add_option(GetOpt::Option('B', "build-all", GetOpt::NONE));
- getopt.add_option(GetOpt::Option('C', "chdir", GetOpt::REQUIRED));
- getopt.add_option(GetOpt::Option('W', "what-if", GetOpt::REQUIRED));
- getopt.add_option(GetOpt::Option("chrome", GetOpt::NONE));
- getopt.add_option(GetOpt::Option("full-paths", GetOpt::NONE));
- getopt.add_option(GetOpt::Option("max-depth", GetOpt::REQUIRED));
- int index=getopt(argc, argv);
-
- verbose+=getopt['v'].count();
-
- if(getopt['a'])
+ getopt.add_option('a', "analyze", analyze_mode, GetOpt::REQUIRED_ARG);
+ getopt.add_option('b', "build", do_build, GetOpt::NO_ARG);
+// getopt.add_option('c', "clean", clean, GetOpt::NO_ARG);
+ getopt.add_option('f', "file", build_file, GetOpt::REQUIRED_ARG);
+ getopt.add_option('h', "help", help, GetOpt::NO_ARG);
+ getopt.add_option('j', "jobs", jobs, GetOpt::REQUIRED_ARG);
+ getopt.add_option('n', "dry-run", dry_run, GetOpt::NO_ARG);
+ getopt.add_option('v', "verbose", verbose, GetOpt::NO_ARG);
+ getopt.add_option('A', "conf-all", conf_all, GetOpt::NO_ARG);
+ getopt.add_option('B', "build-all", build_all, GetOpt::NO_ARG);
+ getopt.add_option('C', "chdir", work_dir, GetOpt::REQUIRED_ARG);
+ getopt.add_option('W', "what-if", what_if, GetOpt::REQUIRED_ARG);
+ getopt.add_option( "chrome", chrome, GetOpt::NO_ARG);
+ getopt.add_option( "conf-only", conf_only, GetOpt::NO_ARG);
+ getopt.add_option( "full-paths", full_paths, GetOpt::NO_ARG);
+ getopt.add_option( "max-depth", max_depth, GetOpt::REQUIRED_ARG);
+ getopt(argc, argv);
+
+ if(!analyze_mode.empty())
{
analyzer=new Analyzer(*this);
- string mode=getopt['a'].arg();
- if(mode=="deps")
+ if(analyze_mode=="deps")
analyzer->set_mode(Analyzer::DEPS);
- else if(mode=="alldeps")
+ else if(analyze_mode=="alldeps")
analyzer->set_mode(Analyzer::ALLDEPS);
- else if(mode=="rebuild")
+ else if(analyze_mode=="rebuild")
analyzer->set_mode(Analyzer::REBUILD);
- else if(mode=="rdeps")
+ else if(analyze_mode=="rdeps")
analyzer->set_mode(Analyzer::RDEPS);
else
- throw UsageError("Invalid analysis mode");
-
- if(getopt["max-depth"])
- analyzer->set_max_depth(strtol(getopt["max-depth"].arg()));
- analyzer->set_full_paths(getopt["full-paths"]);
+ throw UsageError("Invalid analyze mode");
- if(!getopt['b'])
- do_build=false;
+ analyzer->set_max_depth(max_depth);
+ analyzer->set_full_paths(full_paths);
}
+ else
+ do_build=true;
- dry_run=getopt['n'];
- jobs=max(strtol(getopt['j'].arg()), 1L);
- chrome=getopt["chrome"];
- conf_all=getopt['A'];
- build_file=getopt['f'].arg();
- build_all=getopt['B'];
- help=getopt['h'];
-
- if(getopt['C'])
- chdir(getopt['C'].arg().c_str());
-
- for(int i=index; i<argc; ++i)
+ const list<string> &args=getopt.get_args();
+ for(list<string>::const_iterator i=args.begin(); i!=args.end(); ++i)
{
- string v(argv[i]);
- unsigned equal=v.find('=');
+ unsigned equal=i->find('=');
if(equal!=string::npos)
- cmdline_options.insert(RawOptionMap::value_type(v.substr(0, equal), v.substr(equal+1)));
+ cmdline_options.insert(RawOptionMap::value_type(i->substr(0, equal), i->substr(equal+1)));
else
- cmdline_targets.push_back(argv[i]);
+ cmdline_targets.push_back(*i);
}
if(cmdline_targets.empty())
cmdline_targets.push_back("default");
- if(getopt['W'])
- what_if.push_back(getopt['W'].arg());
+ if(!work_dir.empty())
+ chdir(work_dir.c_str());
cwd=Path::getcwd();
+
+ archs.insert(StringMap::value_type("native", ""));
+ archs.insert(StringMap::value_type("arm", "arm-linux-gnu-"));
+ archs.insert(StringMap::value_type("win32", "i586-mingw32msvc-"));
}
/**
string fn=include.substr(1);
Target *tgt=0;
- if(include[0]=='"' && (tgt=check_header(Path::Path(from)/fn)))
- return tgt;
- if((tgt=check_header(Path::Path("/usr/include")/fn)))
- return tgt;
+ 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
- if((tgt=check_header(Path::Path("/usr/include/c++/4.1.2")/fn)))
- return tgt;
- for(list<string>::const_iterator j=path.begin(); j!=path.end(); ++j)
- if((tgt=check_header(cwd/ *j/fn)))
- return tgt;
+ else if((tgt=get_header(Path::Path("/usr/include/c++/4.1.2")/fn)))
+ ;
+ else
+ {
+ for(list<string>::const_iterator j=path.begin(); (j!=path.end() && !tgt); ++j)
+ tgt=get_header(cwd/ *j/fn);
+ }
+
+ includes.insert(TargetMap::value_type(id, tgt));
- return 0;
+ return tgt;
}
/**
Tries to locate a library with the given library path. Considers known targets
as well as existing files. If a matching target is not found but a file exists,
a new SystemLibrary target will be created and returned.
+
+@param lib Name of the library to get (without "lib" prefix or extension)
+@param path List of paths to search for the library
+@param mode Shared / static mode
+
+@return Some kind of library target, if a match was found
*/
-Target *Builder::get_library(const string &lib, const list<string> &path)
+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;
TargetMap::iterator i=libraries.find(id);
if(i!=libraries.end())
return i->second;
- string basename="lib"+lib+".so";
- for(list<string>::const_iterator j=path.begin(); j!=path.end(); ++j)
+ Target *tgt=0;
+ if((tgt=get_library(lib, "/lib", mode)))
+ ;
+ else if((tgt=get_library(lib, "/usr/lib", mode)))
+ ;
+ else
{
- string full=(cwd/ *j/basename).str();
- Target *tgt=get_target(full);
- if(tgt) return tgt;
-
- if(Path::exists(full))
- {
- add_target(tgt=new SystemLibrary(*this, full));
- return tgt;
- }
+ for(list<string>::const_iterator j=path.begin(); (j!=path.end() && !tgt); ++j)
+ tgt=get_library(lib, cwd/ *j, mode);
}
- return 0;
+ libraries.insert(TargetMap::value_type(id, tgt));
+
+ return tgt;
+}
+
+const string &Builder::get_arch_prefix(const string &arch) const
+{
+ StringMap::const_iterator i=archs.find(arch);
+ if(i==archs.end())
+ throw InvalidParameterValue("Unknown architecture");
+
+ return i->second;
}
int Builder::main()
while(!new_pkgs.empty())
{
Package *pkg=new_pkgs.front();
- if(pkg==default_pkg || conf_all)
- pkg->process_options(cmdline_options);
new_pkgs.erase(new_pkgs.begin());
pkg->resolve_refs();
}
+ default_pkg->configure(cmdline_options, conf_all?2:1);
+
if(help)
{
- usage("builder", false);
+ usage(0, "builder", false);
cout<<'\n';
package_help();
return 0;
}
- StringList missing;
+ StringMap problems;
for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
+ {
+ string prob;
if(!i->second)
- missing.push_back(i->first);
+ prob="missing";
+ else if(i->second->get_buildable() && i->second->get_arch()!=default_pkg->get_arch())
+ prob="wrong architecture ("+i->second->get_arch()+")";
+ if(!prob.empty())
+ problems.insert(StringMap::value_type(i->first, prob));
+ }
- if(!missing.empty())
+ if(!problems.empty())
{
- missing.sort();
- cerr<<"The following packages were not found on the system:\n";
- for(list<string>::iterator i=missing.begin(); i!=missing.end(); ++i)
- cerr<<" "<<*i<<'\n';
- cerr<<"Please install them and try again.\n";
+ cerr<<"The following problems were detected:\n";
+ for(StringMap::iterator i=problems.begin(); i!=problems.end(); ++i)
+ cerr<<" "<<i->first<<": "<<i->second<<'\n';
+ cerr<<"Please fix them and try again.\n";
return 1;
}
- default_pkg->create_build_info();
+ if(conf_only)
+ return 0;
if(create_targets())
return 1;
delete analyzer;
}
-void Builder::usage(const char *argv0, bool brief)
+void Builder::usage(const char *reason, const char *argv0, bool brief)
{
+ if(reason)
+ 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] [--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> ...]";
else
{
cerr<<
" -C, --chdir DIR Change to DIR before doing anything else.\n"
" -W, --what-if FILE Pretend that FILE has changed.\n"
" --chrome Use extra chrome to print status.\n"
+ " --conf-only Stop after configuring packages.\n"
" --full-paths Output full paths in analysis.\n"
" --max-depth NUM Maximum depth to show in analysis.\n";
}
continue;
Path::Path inst_base;
- if(i->second->get_config().is_option("prefix"))
- inst_base=i->second->get_config().get_option("prefix").value;
+ if(i->second->get_buildable() && i->second->get_install_flags())
+ inst_base=i->second->get_prefix();
const ComponentList &components=i->second->get_components();
for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j)
}
}
}
+
+ if(i->second->get_install_flags()&(Package::LIB|Package::INCLUDE))
+ {
+ PkgConfig *pc=new PkgConfig(*this, *i->second);
+ add_target(pc);
+ Install *inst=new Install(*this, *i->second, *pc, (inst_base/"lib"/"pkgconfig"/Path::basename(pc->get_name())).str());
+ add_target(inst);
+ install->add_depend(inst);
+ }
}
// Find dependencies until no new targets are created
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::check_header(const Msp::Path::Path &fn)
+Target *Builder::get_header(const Msp::Path::Path &fn)
{
Target *tgt=get_target(fn.str());
if(tgt) return tgt;
return 0;
}
+Target *Builder::get_library(const string &lib, const Path::Path &path, LibMode mode)
+{
+ string full;
+ if(mode!=DYNAMIC)
+ {
+ full=(path/("lib"+lib+".a")).str();
+ Target *tgt=get_target(full);
+ // Targets can only be associated with buildable packages (or no package at all)
+ if(tgt && (tgt->get_package() || mode==ALL_STATIC)) return tgt;
+ }
+ if(mode!=ALL_STATIC)
+ {
+ full=(path/("lib"+lib+".so")).str();
+ Target *tgt=get_target(full);
+ if(tgt) return tgt;
+ }
+
+ if(Path::exists(full))
+ {
+ Target *tgt=new SystemLibrary(*this, full);
+ add_target(tgt);
+ return tgt;
+ }
+
+ return 0;
+}
+
/**
Adds a target to both the target map and the new target queue.
*/
}
}
+ if(fail)
+ cout<<"Build failed\n";
+
return fail?-1:0;
}
projects / builder.git / blobdiff