X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilder.cpp;h=58288ffbfa096a71e4dfbe82fe360c207824f7b7;hb=52586d9f4aa721e924d17c7e9a16cb0b98ddc05d;hp=caf7fe54eb10bf4a618c750f0235fc61936ed425;hpb=0a0a538e8500381a803f5ecd4168df2f4b2252b1;p=builder.git diff --git a/source/builder.cpp b/source/builder.cpp index caf7fe5..58288ff 100644 --- a/source/builder.cpp +++ b/source/builder.cpp @@ -5,13 +5,17 @@ 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 #include @@ -50,12 +54,15 @@ Builder::Builder(int argc, char **argv): conf_all(false), conf_only(false), build_all(false), - create_makefile(false) + create_makefile(false), + current_arch("native") { string analyze_mode; string work_dir; bool full_paths=false; unsigned max_depth=5; + StringList cmdline_warn; + string prfx; GetOpt getopt; getopt.add_option('a', "analyze", analyze_mode, GetOpt::REQUIRED_ARG); @@ -71,10 +78,13 @@ Builder::Builder(int argc, char **argv): 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", prfx, GetOpt::REQUIRED_ARG); + getopt.add_option( "warnings", cmdline_warn, GetOpt::REQUIRED_ARG); getopt(argc, argv); if(!analyze_mode.empty()) @@ -114,7 +124,7 @@ Builder::Builder(int argc, char **argv): if(!work_dir.empty()) chdir(work_dir.c_str()); - cwd=getcwd(); + cwd=FS::getcwd(); Architecture &native_arch=archs.insert(ArchMap::value_type("native", Architecture(*this, "native"))).first->second; native_arch.set_tool("CC", "gcc"); @@ -123,61 +133,63 @@ Builder::Builder(int argc, char **argv): 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((FS::get_home_dir()/".builderrc").str()); + + if(prfx.empty()) + { + if(current_arch=="native") + prefix=(FS::get_home_dir()/"local").str(); + else + prefix=(FS::get_home_dir()/"local"/current_arch).str(); + } + else + prefix=FS::getcwd()/prfx; + + warnings.push_back("all"); + warnings.push_back("extra"); + warnings.push_back("shadow"); + warnings.push_back("pointer-arith"); + warnings.push_back("error"); + for(StringList::iterator i=cmdline_warn.begin(); i!=cmdline_warn.end(); ++i) + { + vector warns=split(*i, ','); + warnings.insert(warnings.end(), warns.begin(), warns.end()); + } + + pkg_path.push_back(cwd/"."); + pkg_path.push_back(cwd/".."); } /** -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; - // Try to get source directory with pkgconfig - list argv; - argv.push_back("pkg-config"); - argv.push_back("--variable=source"); - argv.push_back(n); - if(verbose>=4) - cout<<"Running "<second; - break; - } + FS::Path path=get_package_location(name); + if(!path.empty() && !load_build_file(path/"Build")) + { + i=packages.find(name); + if(i!=packages.end()) + return i->second; + } // 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; } @@ -199,7 +211,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 &arch, const string &from, const list &path) +Target *Builder::get_header(const string &include, const string &from, const list &path) { string hash(8, 0); update_hash(hash, from); @@ -215,10 +227,10 @@ Target *Builder::get_header(const string &include, const string &arch, const str 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)) + while(!cxx_ver.empty() && !FS::is_dir(FS::Path("/usr/include/c++")/cxx_ver)) { unsigned dot=cxx_ver.rfind('.'); if(dot==string::npos) @@ -234,19 +246,19 @@ Target *Builder::get_header(const string &include, const string &arch, const str cout<<"Looking for include "<::const_iterator j=path.begin(); (!tgt && j!=path.end()); ++j) tgt=get_header(cwd/ *j/fn); for(list::const_iterator j=syspath.begin(); (!tgt && j!=syspath.end()); ++j) - tgt=get_header(Path(*j)/fn); + tgt=get_header(FS::Path(*j)/fn); includes.insert(TargetMap::value_type(id, tgt)); @@ -264,35 +276,34 @@ 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 string &arch, const list &path, LibMode mode) +Target *Builder::get_library(const string &lib, 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; + string id=hash+string(1, mode)+lib; TargetMap::iterator i=libraries.find(id); if(i!=libraries.end()) 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 "<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 parts=split(pt, '-'); @@ -360,18 +376,11 @@ int Builder::main() PackageList all_reqs=main_pkg->collect_requires(); - for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) - { - SourcePackage *spkg=dynamic_cast(*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; - cout<=1) + cout<=2) { for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i) @@ -436,7 +445,7 @@ void Builder::usage(const char *reason, const char *argv0, bool brief) cerr< ...]"; + cerr<<"Usage: "< ...]\n"; else { cerr<< @@ -456,13 +465,62 @@ void Builder::usage(const char *reason, const char *argv0, bool brief) " -C, --chdir DIR Change to DIR before doing anything else.\n" " -P, --progress Display progress while building.\n" " -W, --what-if FILE Pretend that FILE has changed.\n" + " --arch ARCH Architecture to build for.\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"; + " --max-depth NUM Maximum depth to show in analysis.\n" + " --prefix DIR Directory to install things to.\n" + " --warnings LIST Compiler warnings to use.\n"; } } +/** +Determines the source directory of a package. pkg-config is consulted first, +and if it fails, the package path is searched for matches. +*/ +FS::Path Builder::get_package_location(const string &name) +{ + // Try to get source directory with pkgconfig + list argv; + argv.push_back("pkg-config"); + argv.push_back("--variable=source"); + argv.push_back(name); + if(verbose>=4) + cout<<"Running "<::const_iterator i=pkg_path.begin(); i!=pkg_path.end(); ++i) + { + list files=list_files(*i); + for(list::const_iterator j=files.begin(); j!=files.end(); ++j) + { + FS::Path full=*i / *j; + if(FS::exists(full/"Build")) + pkg_dirs.push_back(full); + } + } + } + + bool msp=!name.compare(0, 3, "msp"); + for(list::const_iterator i=pkg_dirs.begin(); i!=pkg_dirs.end(); ++i) + { + string base=basename(*i); + unsigned dash=base.rfind('-'); + + if(!base.compare(0, dash, name)) + return *i; + else if(msp && !base.compare(0, dash-3, name, 3, string::npos)) + return *i; + } + + return FS::Path(); +} + /** Loads the given build file. @@ -470,18 +528,24 @@ Loads the given build file. @return 0 on success, -1 if the file could not be opened */ -int Builder::load_build_file(const Path &fn) +int Builder::load_build_file(const FS::Path &fn) { - ifstream in(fn.str().c_str()); - if(!in) - return -1; + try + { + IO::File inf(fn.str()); + IO::Buffered in(inf); - if(verbose>=3) - cout<<"Reading "<=3) + cout<<"Reading "<=1) + cout<<"Will build "< actions; @@ -763,7 +828,7 @@ int Builder::do_clean() for(set::iterator i=clean_tgts.begin(); i!=clean_tgts.end(); ++i) { Action *action=new Unlink(*this, **i); - while(action->check()<0); + while(action->check()<0) ; delete action; } @@ -798,7 +863,7 @@ void Builder::package_help() Application::RegApp Builder::reg; -Builder::Loader::Loader(Builder &b, const Path &s): +Builder::Loader::Loader(Builder &b, const FS::Path &s): bld(b), src(s) { @@ -825,7 +890,8 @@ void Builder::Loader::binpkg(const string &n) void Builder::Loader::profile(const string &n) { StringMap prf; - load_sub(prf); + ProfileLoader ldr(prf); + load_sub_with(ldr); bld.profile_tmpl.insert(ProfileTemplateMap::value_type(n, prf)); }