]> git.tdb.fi Git - builder.git/blobdiff - source/builder.cpp
Rework the Target class hierarchy
[builder.git] / source / builder.cpp
index 58288ffbfa096a71e4dfbe82fe360c207824f7b7..bbf6eb1d046dbf8fee32e4d2279de3d2ccaad329 100644 (file)
@@ -1,12 +1,13 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-200 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
 #include <iostream>
 #include <set>
+#include <sys/utsname.h>
 #include <msp/core/except.h>
 #include <msp/core/getopt.h>
 #include <msp/datafile/parser.h>
@@ -40,6 +41,17 @@ Distributed under the LGPL
 using namespace std;
 using namespace Msp;
 
+namespace {
+
+void update_hash(string &hash, const string &value)
+{
+       for(unsigned i=0; i<value.size(); ++i)
+               hash[i%hash.size()]^=value[i];
+}
+
+}
+
+
 Builder::Builder(int argc, char **argv):
        main_pkg(0),
        analyzer(0),
@@ -54,15 +66,15 @@ Builder::Builder(int argc, char **argv):
        conf_all(false),
        conf_only(false),
        build_all(false),
-       create_makefile(false),
-       current_arch("native")
+       create_makefile(false)
 {
-       string   analyze_mode;
-       string   work_dir;
-       bool     full_paths=false;
+       string analyze_mode;
+       string work_dir;
+       bool full_paths=false;
        unsigned max_depth=5;
        StringList cmdline_warn;
-       string   prfx;
+       string prfx;
+       string arch;
 
        GetOpt getopt;
        getopt.add_option('a', "analyze",    analyze_mode, GetOpt::REQUIRED_ARG);
@@ -78,7 +90,7 @@ 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(     "arch",       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);
@@ -122,25 +134,36 @@ Builder::Builder(int argc, char **argv):
                cmdline_targets.push_back("default");
 
        if(!work_dir.empty())
-               chdir(work_dir.c_str());
+               FS::chdir(work_dir);
 
        cwd=FS::getcwd();
 
-       Architecture &native_arch=archs.insert(ArchMap::value_type("native", Architecture(*this, "native"))).first->second;
-       native_arch.set_tool("CC",  "gcc");
-       native_arch.set_tool("CXX", "g++");
-       native_arch.set_tool("LD",  "gcc");
-       native_arch.set_tool("LXX", "g++");
-       native_arch.set_tool("AR",  "ar");
+       utsname un;
+       string sysname="native";
+       if(uname(&un)==0)
+               sysname=tolower(un.sysname);
 
+       native_arch=&archs.insert(ArchMap::value_type(sysname, Architecture(*this, sysname, true))).first->second;
+       native_arch->set_tool("CC",  "gcc");
+       native_arch->set_tool("CXX", "g++");
+       native_arch->set_tool("LD",  "gcc");
+       native_arch->set_tool("LXX", "g++");
+       native_arch->set_tool("AR",  "ar");
+
+       load_build_file((FS::get_sys_data_dir(argv[0], "builder")/"builderrc").str());
        load_build_file((FS::get_home_dir()/".builderrc").str());
 
+       if(arch.empty())
+               current_arch=native_arch;
+       else
+               current_arch=&get_architecture(arch);
+
        if(prfx.empty())
        {
-               if(current_arch=="native")
+               if(current_arch->is_native())
                        prefix=(FS::get_home_dir()/"local").str();
                else
-                       prefix=(FS::get_home_dir()/"local"/current_arch).str();
+                       prefix=(FS::get_home_dir()/"local"/current_arch->get_name()).str();
        }
        else
                prefix=FS::getcwd()/prfx;
@@ -160,16 +183,97 @@ Builder::Builder(int argc, char **argv):
        pkg_path.push_back(cwd/"..");
 }
 
-/**
-Gets a package by name, possibly creating it.
+Builder::~Builder()
+{
+       for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
+               delete i->second;
+       for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
+               delete i->second;
+       delete analyzer;
+}
+
+int Builder::main()
+{
+       if(load_build_file(cwd/build_file))
+       {
+               cerr<<"No build info here.\n";
+               return 1;
+       }
+
+       main_pkg->configure(cmdline_options, conf_all?2:1);
+
+       if(help)
+       {
+               usage(0, "builder", false);
+               cout<<'\n';
+               package_help();
+               return 0;
+       }
 
-@param   name  Package name
+       if(!conf_only && create_targets())
+               return 1;
+
+       PackageList all_reqs=main_pkg->collect_requires();
+
+       if(conf_only)
+               return 0;
+
+       if(verbose>=2)
+               cout<<"Building on "<<native_arch->get_name()<<", for "<<current_arch->get_name()<<'\n';
+       if(verbose>=1)
+               cout<<all_reqs.size()<<" active packages, "<<targets.size()<<" targets\n";
+       if(verbose>=2)
+       {
+               for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+               {
+                       cout<<' '<<(*i)->get_name();
+                       if(dynamic_cast<SourcePackage *>(*i))
+                               cout<<'*';
+                       unsigned count=0;
+                       unsigned ood_count=0;
+                       for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j)
+                               if(j->second->get_package()==*i)
+                               {
+                                       ++count;
+                                       if(j->second->get_rebuild())
+                                               ++ood_count;
+                               }
+                       if(count)
+                       {
+                               cout<<" ("<<count<<" targets";
+                               if(ood_count)
+                                       cout<<", "<<ood_count<<" out-of-date";
+                               cout<<')';
+                       }
+                       cout<<'\n';
+               }
+       }
+
+       if(analyzer)
+               analyzer->analyze();
+
+       if(!problems.empty())
+       {
+               cerr<<"The following problems were detected:\n";
+               for(ProblemList::iterator i=problems.begin(); i!=problems.end(); ++i)
+                       cerr<<"  "<<i->package<<": "<<i->descr<<'\n';
+               cerr<<"Please fix them and try again.\n";
+               return 1;
+       }
+
+       //if(create_makefile
+
+       if(clean)
+               exit_code=do_clean();
+       else if(build)
+               exit_code=do_build();
+
+       return exit_code;
+}
 
-@return  Pointer to the package, or 0 if the package could not be located
-*/
 Package *Builder::get_package(const string &name)
 {
-       PackageMap::iterator i=packages.find(format("%s/%s", name, current_arch));
+       PackageMap::iterator i=packages.find(format("%s/%s", name, current_arch->get_name()));
        if(i==packages.end())
                i=packages.find(name);
        if(i!=packages.end())
@@ -194,27 +298,20 @@ Package *Builder::get_package(const string &name)
        return pkg;
 }
 
-/**
-Returns the target with the given name, or 0 if no such target exists.
-*/
 Target *Builder::get_target(const string &n) const
 {
+       // XXX Used for getting targets by path.  get_target(const FS::Path &)?
        TargetMap::const_iterator i=targets.find(n);
        if(i!=targets.end())
                return i->second;
        return 0;
 }
 
-/**
-Tries to locate a header included from a given location and with a given include
-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<string> &path)
+Target *Builder::get_header(const string &include, const FS::Path &from, const list<string> &path)
 {
        string hash(8, 0);
-       update_hash(hash, from);
+       if(include[0]=='\"')
+               update_hash(hash, from.str());
        for(list<string>::const_iterator i=path.begin(); i!=path.end(); ++i)
                update_hash(hash, *i);
 
@@ -227,7 +324,7 @@ Target *Builder::get_header(const string &include, const string &from, const lis
        if(cxx_ver.empty())
        {
                StringList argv;
-               argv.push_back(get_current_arch().get_tool("CXX"));
+               argv.push_back(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() && !FS::is_dir(FS::Path("/usr/include/c++")/cxx_ver))
@@ -246,11 +343,11 @@ Target *Builder::get_header(const string &include, const string &from, const lis
                cout<<"Looking for include "<<fn<<" with path "<<join(path.begin(), path.end())<<'\n';
 
        StringList syspath;
-       if(current_arch=="native")
+       if(current_arch->is_native())
                syspath.push_back("/usr/include");
        else
-               syspath.push_back("/usr/"+get_architecture(current_arch).get_prefix()+"/include");
-       syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver/fn).str());
+               syspath.push_back("/usr/"+current_arch->get_prefix()+"/include");
+       syspath.push_back((FS::Path("/usr/include/c++/")/cxx_ver).str());
 
        Target *tgt=0;
        if(include[0]=='\"')
@@ -265,17 +362,6 @@ Target *Builder::get_header(const string &include, const string &from, const lis
        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, LibMode mode)
 {
        string hash(8, 0);
@@ -288,13 +374,13 @@ Target *Builder::get_library(const string &lib, const list<string> &path, LibMod
                return i->second;
 
        StringList syspath;
-       if(current_arch=="native")
+       if(current_arch->is_native())
        {
                syspath.push_back("/lib");
                syspath.push_back("/usr/lib");
        }
        else
-               syspath.push_back("/usr/"+get_current_arch().get_prefix()+"/lib");
+               syspath.push_back("/usr/"+current_arch->get_prefix()+"/lib");
 
        if(verbose>=5)
                cout<<"Looking for library "<<lib<<" with path "<<join(path.begin(), path.end())<<'\n';
@@ -319,11 +405,6 @@ const Architecture &Builder::get_architecture(const string &arch) const
        return i->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<string> parts=split(pt, '-');
@@ -343,102 +424,12 @@ void Builder::problem(const string &p, const string &d)
        problems.push_back(Problem(p, d));
 }
 
-/**
-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))
-       {
-               cerr<<"No build info here.\n";
-               return 1;
-       }
-
-       main_pkg->configure(cmdline_options, conf_all?2:1);
-
-       if(help)
-       {
-               usage(0, "builder", false);
-               cout<<'\n';
-               package_help();
-               return 0;
-       }
-
-       if(!conf_only && create_targets())
-               return 1;
-
-       PackageList all_reqs=main_pkg->collect_requires();
-
-       if(conf_only)
-               return 0;
-
-       if(verbose>=1)
-               cout<<all_reqs.size()<<" active packages, "<<targets.size()<<" targets\n";
-       if(verbose>=2)
-       {
-               for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
-               {
-                       cout<<' '<<(*i)->get_name();
-                       if(dynamic_cast<SourcePackage *>(*i))
-                               cout<<'*';
-                       unsigned count=0;
-                       unsigned ood_count=0;
-                       for(TargetMap::iterator j=targets.begin(); j!=targets.end(); ++j)
-                               if(j->second->get_package()==*i)
-                               {
-                                       ++count;
-                                       if(j->second->get_rebuild())
-                                               ++ood_count;
-                               }
-                       if(count)
-                       {
-                               cout<<" ("<<count<<" targets";
-                               if(ood_count)
-                                       cout<<", "<<ood_count<<" out-of-date";
-                               cout<<')';
-                       }
-                       cout<<'\n';
-               }
-       }
-
-       if(analyzer)
-               analyzer->analyze();
-
-       if(!problems.empty())
-       {
-               cerr<<"The following problems were detected:\n";
-               for(ProblemList::iterator i=problems.begin(); i!=problems.end(); ++i)
-                       cerr<<"  "<<i->package<<": "<<i->descr<<'\n';
-               cerr<<"Please fix them and try again.\n";
-               return 1;
-       }
-
-       //if(create_makefile
-
-       if(clean)
-               exit_code=do_clean();
-       else if(build)
-               exit_code=do_build();
-
-       return exit_code;
-}
-
-Builder::~Builder()
-{
-       for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
-               delete i->second;
-       for(TargetMap::iterator i=targets.begin(); i!=targets.end(); ++i)
-               delete i->second;
-       delete analyzer;
-}
-
 void Builder::usage(const char *reason, const char *argv0, bool brief)
 {
        if(reason)
@@ -475,12 +466,11 @@ void Builder::usage(const char *reason, const char *argv0, bool brief)
        }
 }
 
-/**
-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)
 {
+       if(verbose>=3)
+               cout<<"Looking for package "<<name<<'\n';
+
        // Try to get source directory with pkgconfig
        list<string> argv;
        argv.push_back("pkg-config");
@@ -504,6 +494,8 @@ FS::Path Builder::get_package_location(const string &name)
                                        pkg_dirs.push_back(full);
                        }
                }
+               if(verbose>=3)
+                       cout<<pkg_dirs.size()<<" packages found in path\n";
        }
 
        bool msp=!name.compare(0, 3, "msp");
@@ -521,19 +513,11 @@ FS::Path Builder::get_package_location(const string &name)
        return FS::Path();
 }
 
-/**
-Loads the given build file.
-
-@param   fn  Path to the file
-
-@return  0 on success, -1 if the file could not be opened
-*/
 int Builder::load_build_file(const FS::Path &fn)
 {
        try
        {
-               IO::File inf(fn.str());
-               IO::Buffered in(inf);
+               IO::BufferedFile in(fn.str());
 
                if(verbose>=3)
                        cout<<"Reading "<<fn<<'\n';
@@ -550,12 +534,6 @@ int Builder::load_build_file(const FS::Path &fn)
        return 0;
 }
 
-/**
-Creates targets for all packages and prepares them for building.
-
-@return  0 if everything went ok, -1 if something bad happened and a build
-         shouldn't be attempted
-*/
 int Builder::create_targets()
 {
        Target *world=new VirtualTarget(*this, "world");
@@ -630,8 +608,10 @@ int Builder::create_targets()
        }
 
        /* 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. */
+       and prepare world.  I don't really like this, but it keeps the graph
+       acyclic.
+       
+       XXX Could we skip preparing targets we are not interested in? */
        if(build_world)
                cmdline->prepare();
        else
@@ -647,10 +627,6 @@ int Builder::create_targets()
        return 0;
 }
 
-/**
-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::get_header(const Msp::FS::Path &fn)
 {
        Target *tgt=get_target(fn.str());
@@ -671,7 +647,7 @@ Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mo
 
        if(mode!=ALL_STATIC)
        {
-               if(current_arch=="win32")
+               if(current_arch->get_name()=="win32")
                {
                        candidates.push_back("lib"+lib+".dll");
                        candidates.push_back(lib+".dll");
@@ -683,7 +659,7 @@ Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mo
        /* Static libraries are always considered, since sometimes shared versions
        may not be available */
        candidates.push_back("lib"+lib+".a");
-       if(current_arch=="win32")
+       if(current_arch->get_name()=="win32")
                candidates.push_back("lib"+lib+".dll.a");
 
        for(StringList::iterator i=candidates.begin(); i!=candidates.end(); ++i)
@@ -694,8 +670,8 @@ Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mo
                if(tgt)
                {
                        Target *real_tgt=tgt;
-                       if(dynamic_cast<Install *>(tgt))
-                               real_tgt=real_tgt->get_depends().front();
+                       if(Install *inst=dynamic_cast<Install *>(tgt))
+                               real_tgt=&inst->get_source();
 
                        /* Ignore dynamic libraries from local packages unless library mode is
                        DYNAMIC */
@@ -714,19 +690,6 @@ Target *Builder::get_library(const string &lib, const FS::Path &path, LibMode mo
        return 0;
 }
 
-/**
-Updates a hash with a string.  This is used from get_header and get_library.
-*/
-void Builder::update_hash(string &hash, const string &value)
-{
-       for(unsigned i=0; i<value.size(); ++i)
-               hash[i%hash.size()]^=value[i];
-}
-
-/**
-This function supervises the build process, starting new actions when slots
-become available.
-*/
 int Builder::do_build()
 {
        Target *cmdline=get_target("cmdline");
@@ -799,10 +762,6 @@ int Builder::do_build()
        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
@@ -826,18 +785,16 @@ int Builder::do_clean()
        }
 
        for(set<Target *>::iterator i=clean_tgts.begin(); i!=clean_tgts.end(); ++i)
-       {
-               Action *action=new Unlink(*this, **i);
-               while(action->check()<0) ;
-               delete action;
-       }
+               if(FileTarget *ft=dynamic_cast<FileTarget *>(*i))
+               {
+                       Action *action=new Unlink(*this, *ft);
+                       while(action->check()<0) ;
+                       delete action;
+               }
 
        return 0;
 }
 
-/**
-Prints out information about the default package.
-*/
 void Builder::package_help()
 {
        const Config &config=main_pkg->get_config();