X-Git-Url: http://git.tdb.fi/?p=builder.git;a=blobdiff_plain;f=source%2Fbuilder.cpp;h=5e2588334ca52a735e0b81b314c97674063b6253;hp=723930a315b3c6e16c9d30192e4847762c5b5a26;hb=445edbc3c42bbd7880cc414cf153ddfd196bfc1c;hpb=b6dcf65b5e1b99f6c65454358c7610f3e9c8af2b diff --git a/source/builder.cpp b/source/builder.cpp index 723930a..5e25883 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include @@ -21,6 +21,7 @@ #include "sharedlibrary.h" #include "staticlibrary.h" #include "systemlibrary.h" +#include "unlink.h" #include "virtualtarget.h" using namespace std; @@ -28,7 +29,8 @@ 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), @@ -37,17 +39,18 @@ Builder::Builder(int argc, char **argv): jobs(1), conf_all(false), conf_only(false), - build_all(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); @@ -60,6 +63,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); @@ -81,8 +85,8 @@ 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) @@ -103,8 +107,8 @@ 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")); @@ -125,10 +129,11 @@ Builder::Builder(int argc, char **argv): { 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")); } } @@ -151,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); @@ -199,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); @@ -227,7 +232,7 @@ Target *Builder::get_header(const string &include, const string &from, const lis } includes.insert(TargetMap::value_type(id, tgt)); - + return tgt; } @@ -242,7 +247,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) @@ -254,16 +259,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)); @@ -295,7 +304,7 @@ string Builder::get_tool(const std::string &tool, const std::string &arch) if(j==i->second.end()) throw InvalidParameterValue("Unknown tool"); - return get_arch_prefix(arch)+j->second; + return get_arch_prefix(arch)+"-"+j->second; } void Builder::apply_profile_template(Config &config, const string &pt) const @@ -397,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; } @@ -416,7 +429,7 @@ void Builder::usage(const char *reason, const char *argv0, bool brief) { if(reason) cerr< ...]"; else @@ -440,6 +453,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"; } } @@ -515,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) { @@ -563,7 +577,7 @@ int Builder::create_targets() } else exe=new Executable(*this, *j, objs); - + add_target(exe); if(i->second==default_pkg) { @@ -671,28 +685,49 @@ Target *Builder::get_header(const Msp::Path::Path &fn) 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); + add_target(tgt); + return tgt; + } } return 0; @@ -720,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"); @@ -790,7 +825,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; } /**