X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=336cc8453c118e519b266c8a2ebc8c757385e9dc;hb=555190f7eafcf3a67750fc63872b23e17371aa98;hp=7825a20c85dbd091a845e232ac3a1a7764e6c08f;hpb=57bdb055acb0453c75b22cb64f35cc0e817a2827;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index 7825a20..336cc84 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -1,27 +1,32 @@ +/* $Id$ + +This file is part of builder +Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions +Distributed under the LGPL +*/ + #include #include -#include -#include -#include +#include #include -#include +#include #include #include +#include #include #include #include "action.h" #include "analyzer.h" #include "builder.h" -#include "executable.h" #include "header.h" #include "install.h" #include "misc.h" -#include "objectfile.h" #include "package.h" #include "pkgconfig.h" #include "sharedlibrary.h" -#include "staticlibrary.h" #include "systemlibrary.h" +#include "tarball.h" +#include "unlink.h" #include "virtualtarget.h" using namespace std; @@ -29,21 +34,28 @@ using namespace Msp; Builder::Builder(int argc, char **argv): analyzer(0), - do_build(false), + 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('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('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); @@ -56,6 +68,7 @@ Builder::Builder(int argc, char **argv): 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); @@ -77,15 +90,15 @@ Builder::Builder(int argc, char **argv): analyzer->set_max_depth(max_depth); analyzer->set_full_paths(full_paths); } - else - do_build=true; + else if(!clean && !create_makefile) + build=true; const list &args=getopt.get_args(); for(list::const_iterator i=args.begin(); i!=args.end(); ++i) { unsigned equal=i->find('='); if(equal!=string::npos) - cmdline_options.insert(RawOptionMap::value_type(i->substr(0, equal), i->substr(equal+1))); + cmdline_options.insert(StringMap::value_type(i->substr(0, equal), i->substr(equal+1))); else cmdline_targets.push_back(*i); } @@ -99,8 +112,34 @@ Builder::Builder(int argc, char **argv): 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-")); + 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")); + } } /** @@ -122,7 +161,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); @@ -156,9 +195,9 @@ Package *Builder::get_package(const string &n) /** Returns the target with the given name, or 0 if no such target exists. */ -Target *Builder::get_target(const string &n) +Target *Builder::get_target(const string &n) const { - TargetMap::iterator i=targets.find(n); + TargetMap::const_iterator i=targets.find(n); if(i!=targets.end()) return i->second; return 0; @@ -170,7 +209,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); @@ -198,7 +237,7 @@ Target *Builder::get_header(const string &include, const string &from, const lis } includes.insert(TargetMap::value_type(id, tgt)); - + return tgt; } @@ -213,7 +252,7 @@ a new SystemLibrary target will be created and returned. @return Some kind of library target, if a match was found */ -Target *Builder::get_library(const string &lib, const list &path, LibMode mode) +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) @@ -225,16 +264,20 @@ Target *Builder::get_library(const string &lib, const list &path, LibMod if(i!=libraries.end()) return i->second; - Target *tgt=0; - if((tgt=get_library(lib, "/lib", mode))) - ; - else if((tgt=get_library(lib, "/usr/lib", mode))) - ; - else + StringList syspath; + if(arch=="native") { - for(list::const_iterator j=path.begin(); (j!=path.end() && !tgt); ++j) - tgt=get_library(lib, cwd/ *j, mode); + syspath.push_back("/lib"); + syspath.push_back("/usr/lib"); } + else + syspath.push_back("/usr/"+get_arch_prefix(arch)+"/lib"); + + 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)); @@ -250,6 +293,49 @@ const string &Builder::get_arch_prefix(const string &arch) const 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); + } +} + +/** +Adds a target to both the target map and the new target queue. Called from +Target constructor. +*/ +void Builder::add_target(Target *t) +{ + targets.insert(TargetMap::value_type(t->get_name(), t)); + new_tgts.push_back(t); +} + int Builder::main() { if(load_build_file(cwd/build_file)) @@ -335,8 +421,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; } @@ -354,7 +444,7 @@ void Builder::usage(const char *reason, const char *argv0, bool brief) { if(reason) cerr< ...]"; else @@ -378,6 +468,7 @@ void Builder::usage(const char *reason, const char *argv0, bool brief) " --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"; } } @@ -411,16 +502,16 @@ Creates targets for all packages and prepares them for building. int Builder::create_targets() { Target *world=new VirtualTarget(*this, "world"); - add_target(world); Target *def_tgt=new VirtualTarget(*this, "default"); - add_target(def_tgt); world->add_depend(def_tgt); Target *install=new VirtualTarget(*this, "install"); - add_target(install); world->add_depend(install); + Target *tarballs=new VirtualTarget(*this, "tarballs"); + world->add_depend(tarballs); + for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i) { if(!i->second) @@ -428,124 +519,17 @@ int Builder::create_targets() if(!i->second->get_buildable()) continue; - Path::Path inst_base; - if(i->second->get_buildable()) - inst_base=i->second->get_prefix(); - const ComponentList &components=i->second->get_components(); for(ComponentList::const_iterator j=components.begin(); j!=components.end(); ++j) - { - // Collect all files belonging to the component - PathList files; - const PathList &sources=j->get_sources(); - for(PathList::const_iterator k=sources.begin(); k!=sources.end(); ++k) - { - struct stat st; - stat(*k, st); - if(S_ISDIR(st.st_mode)) - { - list sfiles=list_files(*k); - for(list::iterator l=sfiles.begin(); l!=sfiles.end(); ++l) - files.push_back(*k / *l); - } - else - files.push_back(*k); - } - - bool build_exe=j->get_type()!=Component::HEADERS; - - list objs; - for(PathList::iterator k=files.begin(); k!=files.end(); ++k) - { - string basename=(*k)[-1]; - string ext=Path::splitext(basename).ext; - if((ext==".cpp" || ext==".c") && build_exe) - { - SourceFile *src=new SourceFile(*this, &*j, k->str()); - add_target(src); - - // Compile sources - ObjectFile *obj=new ObjectFile(*this, *j, *src); - add_target(obj); - objs.push_back(obj); - } - else if(ext==".h") - { - Target *hdr=get_target(k->str()); - if(!hdr) - { - hdr=new Header(*this, &*j, k->str()); - add_target(hdr); - } - - // Install headers if requested - if(!j->get_install_headers().empty()) - { - Path::Path inst_path=inst_base/"include"/j->get_install_headers()/basename; - Install *inst=new Install(*this, *i->second, *hdr, inst_path.str()); - add_target(inst); - install->add_depend(inst); - } - } - } - - if(build_exe) - { - Executable *exe=0; - StaticLibrary *slib=0; - if(j->get_type()==Component::LIBRARY) - { - exe=new SharedLibrary(*this, *j, objs); - slib=new StaticLibrary(*this, *j, objs); - add_target(slib); - } - else - exe=new Executable(*this, *j, objs); - - add_target(exe); - if(i->second==default_pkg) - { - def_tgt->add_depend(exe); - if(slib) def_tgt->add_depend(slib); - } - else - { - world->add_depend(exe); - if(slib) world->add_depend(slib); - } - - if(j->get_install()) - { - string inst_dir; - if(j->get_type()==Component::PROGRAM) - inst_dir="bin"; - else if(j->get_type()==Component::LIBRARY) - inst_dir="lib"; - if(!inst_dir.empty()) - { - Install *inst=new Install(*this, *i->second, *exe, (inst_base/inst_dir/Path::basename(exe->get_name())).str()); - add_target(inst); - install->add_depend(inst); - - if(slib) - { - inst=new Install(*this, *i->second, *slib, (inst_base/inst_dir/Path::basename(slib->get_name())).str()); - add_target(inst); - install->add_depend(inst); - } - } - } - } - } + j->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); + install->add_depend(new Install(*this, *i->second, *pc)); } + + tarballs->add_depend(new TarBall(*this, *i->second)); } // Find dependencies until no new targets are created @@ -572,8 +556,7 @@ int Builder::create_targets() // Make the cmdline target depend on all targets mentioned on the command line Target *cmdline=new VirtualTarget(*this, "cmdline"); - add_target(cmdline); - world->add_depend(cmdline); + bool build_world=false; for(list::iterator i=cmdline_targets.begin(); i!=cmdline_targets.end(); ++i) { Target *tgt=get_target(*i); @@ -584,10 +567,21 @@ int Builder::create_targets() cerr<<"I don't know anything about "<<*i<<'\n'; return -1; } + if(tgt==world) + build_world=true; cmdline->add_depend(tgt); } - world->prepare(); + /* If world is to be built, prepare cmdline. If not, add cmdline to world + and prepare world. I don't really like this, but it keeps the graph + acyclic. */ + if(build_world) + cmdline->prepare(); + else + { + world->add_depend(cmdline); + world->prepare(); + } return 0; } @@ -603,48 +597,59 @@ Target *Builder::get_header(const Msp::Path::Path &fn) if(Path::exists(fn)) { - add_target(tgt=new SystemHeader(*this, fn.str())); + tgt=new SystemHeader(*this, fn.str()); return tgt; } return 0; } -Target *Builder::get_library(const string &lib, const Path::Path &path, LibMode mode) +Target *Builder::get_library(const string &lib, const string &arch, 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; - } + // Populate a list of candidate filenames + StringList candidates; + if(mode!=ALL_STATIC) { - full=(path/("lib"+lib+".so")).str(); - Target *tgt=get_target(full); - if(tgt) return tgt; + if(arch=="win32") + candidates.push_back("lib"+lib+".dll"); + else + candidates.push_back("lib"+lib+".so"); } - if(Path::exists(full)) + /* 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) { - Target *tgt=new SystemLibrary(*this, full); - add_target(tgt); - return tgt; + 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); + return tgt; + } } return 0; } -/** -Adds a target to both the target map and the new target queue. -*/ -void Builder::add_target(Target *t) -{ - targets.insert(TargetMap::value_type(t->get_name(), t)); - new_tgts.push_back(t); -} - /** Updates a hash with a string. This is used from get_header and get_library. */ @@ -658,7 +663,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"); @@ -728,7 +733,43 @@ int Builder::build() if(fail) cout<<"Build failed\n"; - return fail?-1:0; + 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; } /**