X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=ccfb407276ee1a619b1bf85e1869a7acd75eab0a;hb=55b6c1dba6f02a399d98080c23a75098e8a080f7;hp=c271c2bb56cf81b211efd8013e4ade5de0e92b59;hpb=74266a6e650f019063cdcd1c9a7bd26d8f99041b;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index c271c2b..ccfb407 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -1,12 +1,11 @@ #include #include -#include -#include -#include +#include #include -#include +#include #include #include +#include #include #include #include "action.h" @@ -18,9 +17,11 @@ #include "misc.h" #include "objectfile.h" #include "package.h" +#include "pkgconfig.h" #include "sharedlibrary.h" #include "staticlibrary.h" #include "systemlibrary.h" +#include "unlink.h" #include "virtualtarget.h" using namespace std; @@ -28,84 +29,112 @@ using namespace Msp; Builder::Builder(int argc, char **argv): analyzer(0), - do_build(true), + build(false), + clean(0), + dry_run(false), + help(false), verbose(1), chrome(false), build_file("Build"), - jobs(1) + jobs(1), + conf_all(false), + conf_only(false), + build_all(false), + create_makefile(false) { + 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", 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( "makefile", create_makefile, 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 if(!clean && !create_makefile) + 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 &args=getopt.get_args(); + for(list::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(StringMap::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")); + + StringMap &native_tools=tools.insert(ToolMap::value_type("native", StringMap())).first->second; + native_tools.insert(StringMap::value_type("CC", "gcc")); + native_tools.insert(StringMap::value_type("CXX", "g++")); + native_tools.insert(StringMap::value_type("LD", "gcc")); + native_tools.insert(StringMap::value_type("LDXX", "g++")); + native_tools.insert(StringMap::value_type("AR", "ar")); + + StringMap &release_profile=profile_tmpl.insert(ProfileTemplateMap::value_type("release", StringMap())).first->second; + release_profile.insert(StringMap::value_type("optimize", "3")); + release_profile.insert(StringMap::value_type("outdir", "$profile")); + + StringMap &debug_profile=profile_tmpl.insert(ProfileTemplateMap::value_type("debug", StringMap())).first->second; + debug_profile.insert(StringMap::value_type("debug", "1")); + debug_profile.insert(StringMap::value_type("outdir", "$profile")); + + for(StringMap::iterator i=archs.begin(); i!=archs.end(); ++i) + { + if(i->first=="native") + continue; + + StringMap &arch_profile=profile_tmpl.insert(ProfileTemplateMap::value_type(i->first, StringMap())).first->second; + arch_profile.insert(StringMap::value_type("arch", i->first)); + arch_profile.insert(StringMap::value_type("prefix", "$HOME/local/$arch")); + arch_profile.insert(StringMap::value_type("outdir", "$profile")); + } } /** @@ -127,7 +156,7 @@ Package *Builder::get_package(const string &n) argv.push_back("--variable=source"); argv.push_back(n); string srcdir=strip(run_command(argv)); - + PathList dirs; if(!srcdir.empty()) dirs.push_back(srcdir); @@ -175,7 +204,7 @@ path. Considers known targets as well as existing files. If a matching target 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 &from, const list &path) +Target *Builder::get_header(const string &include, const string &, const string &from, const list &path) { string hash(8, 0); update_hash(hash, from); @@ -189,51 +218,107 @@ Target *Builder::get_header(const string &include, const string &from, const lis 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::const_iterator j=path.begin(); j!=path.end(); ++j) - if((tgt=check_header(cwd/ *j/fn))) - return tgt; - - return 0; + else if((tgt=get_header(Path::Path("/usr/include/c++/4.1.2")/fn))) + ; + else + { + for(list::const_iterator j=path.begin(); (j!=path.end() && !tgt); ++j) + tgt=get_header(cwd/ *j/fn); + } + + includes.insert(TargetMap::value_type(id, tgt)); + + 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 &path) +Target *Builder::get_library(const string &lib, const string &arch, const list &path, LibMode mode) { string hash(8, 0); for(list::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::const_iterator j=path.begin(); j!=path.end(); ++j) + StringList syspath; + if(arch=="native") { - 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; - } + syspath.push_back("/lib"); + syspath.push_back("/usr/lib"); } + else + syspath.push_back("/usr/"+get_arch_prefix(arch)+"/lib"); - return 0; + 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); + + 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; +} + +string Builder::get_tool(const std::string &tool, const std::string &arch) +{ + ToolMap::iterator i=tools.find(arch); + if(i!=tools.end()) + { + StringMap::iterator j=i->second.find(tool); + if(j!=i->second.end()) + return j->second; + } + + // Either the arch, or the tool within the arch was not found + i=tools.find("native"); + StringMap::iterator j=i->second.find(tool); + if(j==i->second.end()) + throw InvalidParameterValue("Unknown tool"); + + return get_arch_prefix(arch)+"-"+j->second; +} + +void Builder::apply_profile_template(Config &config, const string &pt) const +{ + vector parts=split(pt, '-'); + + for(vector::iterator i=parts.begin(); i!=parts.end(); ++i) + { + ProfileTemplateMap::const_iterator j=profile_tmpl.find(*i); + if(j==profile_tmpl.end()) + continue; + + config.update(j->second); + } } int Builder::main() @@ -249,36 +334,43 @@ 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::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<<" "<first<<": "<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; @@ -314,8 +406,12 @@ int Builder::main() if(analyzer) analyzer->analyze(); - if(do_build) - build(); + //if(create_makefile + + if(clean) + exit_code=do_clean(); + else if(build) + exit_code=do_build(); return exit_code; } @@ -329,10 +425,13 @@ Builder::~Builder() delete analyzer; } -void Builder::usage(const char *argv0, bool brief) +void Builder::usage(const char *reason, const char *argv0, bool brief) { + if(reason) + cerr< ...]"; + cerr<<"Usage: "< ...]"; else { cerr<< @@ -352,7 +451,9 @@ void Builder::usage(const char *argv0, bool brief) " -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" + //" --makefile Create a makefile for this package.\n" " --max-depth NUM Maximum depth to show in analysis.\n"; } } @@ -404,8 +505,8 @@ int Builder::create_targets() 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) @@ -428,7 +529,7 @@ int Builder::create_targets() } bool build_exe=j->get_type()!=Component::HEADERS; - + list objs; for(PathList::iterator k=files.begin(); k!=files.end(); ++k) { @@ -476,7 +577,7 @@ int Builder::create_targets() } else exe=new Executable(*this, *j, objs); - + add_target(exe); if(i->second==default_pkg) { @@ -512,6 +613,15 @@ int Builder::create_targets() } } } + + 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 @@ -562,7 +672,7 @@ 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::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; @@ -575,6 +685,54 @@ Target *Builder::check_header(const Msp::Path::Path &fn) return 0; } +Target *Builder::get_library(const string &lib, const string &arch, const Path::Path &path, LibMode mode) +{ + // Populate a list of candidate filenames + StringList candidates; + + if(mode!=ALL_STATIC) + { + if(arch=="win32") + candidates.push_back("lib"+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") + candidates.push_back("lib"+lib+".dll.a"); + + for(StringList::iterator i=candidates.begin(); i!=candidates.end(); ++i) + { + string full=(path/ *i).str(); + Target *tgt=get_target(full); + + if(tgt) + { + Target *real_tgt=tgt; + if(dynamic_cast(tgt)) + real_tgt=real_tgt->get_depends().front(); + + /* Ignore dynamic libraries from local packages unless library mode is + DYNAMIC */ + if(dynamic_cast(real_tgt) && mode!=DYNAMIC) + continue; + else if(tgt) + return tgt; + } + else if(Path::exists(full)) + { + 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. */ @@ -597,7 +755,7 @@ void Builder::update_hash(string &hash, const string &value) This function supervises the build process, starting new actions when slots become available. */ -int Builder::build() +int Builder::do_build() { Target *cmdline=get_target("cmdline"); @@ -664,7 +822,46 @@ int Builder::build() } } - return fail?-1:0; + if(fail) + cout<<"Build failed\n"; + + return fail?1:0; +} + +/** +Cleans buildable targets. If clean is 1, cleans only this package. If +clean is 2 or greater, cleans all buildable packages. +*/ +int Builder::do_clean() +{ + // Cleaning doesn't care about ordering, so a simpler method can be used + + set clean_tgts; + TargetList queue; + queue.push_back(get_target("cmdline")); + + while(!queue.empty()) + { + Target *tgt=queue.front(); + queue.erase(queue.begin()); + + if(tgt->get_buildable() && (tgt->get_package()==default_pkg || clean>=2)) + clean_tgts.insert(tgt); + + const TargetList &deps=tgt->get_depends(); + for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i) + if(!clean_tgts.count(*i)) + queue.push_back(*i); + } + + for(set::iterator i=clean_tgts.begin(); i!=clean_tgts.end(); ++i) + { + Action *action=new Unlink(*this, **i); + while(action->check()<0); + delete action; + } + + return 0; } /**