]> git.tdb.fi Git - builder.git/blobdiff - source/package.cpp
Refactor package configuration
[builder.git] / source / package.cpp
index 2d5d97ccd49a4a8585c8ae573b549b0569eefb90..587ce80da4f3b172ca839cb53be9d6673c7c2fb5 100644 (file)
 using namespace std;
 using namespace Msp;
 
+#include <iostream>
+
+/**
+Creates a buildable package.
+*/
 Package::Package(Builder &b, const string &n, const Path::Path &s):
        builder(b),
        name(n),
-       source(s),
        buildable(true),
-       build_info_ready(false)
+       source(s),
+       conf_done(false),
+       need_path(false)
 { }
 
-Package::Package(Builder &b, const string &n, const vector<string> &info):
-       builder(b),
-       name(n),
-       buildable(false),
-       build_info_ready(true)
+/**
+Sets the path where the package files were installed.  This is only useful for
+non-buildable packages that don't use pkg-config.
+*/
+void Package::set_path(const Msp::Path::Path &p)
 {
-       for(vector<string>::const_iterator i=info.begin(); i!=info.end(); ++i)
-       {
-               if(!i->compare(0, 2, "-I"))
-                       export_binfo.incpath.push_back(i->substr(2));
-               else if(!i->compare(0, 2, "-D"))
-                       export_binfo.defines.push_back(i->substr(2));
-               else if(!i->compare(0, 2, "-L"))
-                       export_binfo.libpath.push_back(i->substr(2));
-               else if(!i->compare(0, 2, "-l"))
-                       export_binfo.libs.push_back(i->substr(2));
-       }
+       path=builder.get_cwd()/p;
 }
 
+/**
+Tries to resolve all references to dependency packages.
+*/
 void Package::resolve_refs()
 {
-       for(list<PackageRef>::iterator i=requires.begin(); i!=requires.end(); ++i)
-               i->resolve();
+       for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
+       {
+               Package *pkg=i->resolve();
+               if(pkg) all_reqs.push_back(pkg);
+       }
+       for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
+       {
+               i->resolve_refs();
+               const PkgRefList &creqs=i->get_requires();
+               for(PkgRefList::const_iterator j=creqs.begin(); j!=creqs.end(); ++j)
+                       if(j->get_package())
+                               all_reqs.push_back(j->get_package());
+       }
 }
 
-void Package::create_build_info()
+/**
+Processes configuration options that were most likely obtained from the command
+line.
+*/
+void Package::configure(const RawOptionMap &opts, unsigned flag)
 {
-       if(build_info_ready)
+       if(conf_done || !buildable)
                return;
        
-       for(list<PackageRef>::iterator i=requires.begin(); i!=requires.end(); ++i)
-       {
-               if(!i->get_package())
-                       continue;
-               i->get_package()->create_build_info();
-               build_info.add(i->get_package()->get_exported_binfo());
-       }
+       if(builder.get_verbose()>=3)
+               cout<<"Configuring "<<name<<'\n';
        
-       build_info.cflags.push_back("-Wall");
-       build_info.cflags.push_back("-Wshadow");
-       build_info.cflags.push_back("-Wextra");
-       build_info.cflags.push_back("-Wpointer-arith");
-       build_info.cflags.push_back("-Wconversion");
-       build_info.cflags.push_back("-Werror");
-
-       unsigned flags=get_install_flags();
-
-       if(flags&INCLUDE)
-               export_binfo.incpath.push_back((Path::Path(config.get_option("prefix").value)/"include").str());
-       if(flags&LIB)
-               export_binfo.libpath.push_back((Path::Path(config.get_option("prefix").value)/"lib").str());
+       init_config();
 
-       string optimize=config.get_option("optimize").value;
-       if(strtol(optimize))
+       if(flag && config.process(opts) && !builder.get_dry_run())
        {
-               build_info.cflags.push_back("-O"+optimize);
-               string cpu=config.get_option("cpu").value;
-               if(cpu!="auto")
-                       build_info.cflags.push_back("-march="+cpu);
-       }
-
-       if(strtobool(config.get_option("debug").value))
-       {
-               build_info.cflags.push_back("-ggdb");
-               build_info.defines.push_back("DEBUG");
+               if(builder.get_verbose()>=2)
+                       cout<<"Configuration of "<<name<<" changed.\n";
+               config.save(source/".options.cache");
        }
-
-       build_info.unique();
-       export_binfo.unique();
-
-       for(list<Component>::iterator i=components.begin(); i!=components.end(); ++i)
+       
+       for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
        {
-               i->create_build_info();
-               if(i->get_type()==Component::LIBRARY)
-                       export_binfo.libs.push_back(i->get_name());
+               (*i)->configure(opts, flag&2);
+               if((*i)->get_need_path())
+                       (*i)->set_path(config.get_option((*i)->get_name()+"_path").value);
        }
+       
+       create_build_info();
 
-       build_info_ready=true;
-}
-
-void Package::process_options(const RawOptionMap &opts)
-{
-       if(config.process(opts))
-               config.save(source/".options.cache");
+       conf_done=true;
 }
 
+/**
+Creates a non-buildable package with the given name.  Pkg-config is tried first
+to get build information.  If it fails, a built-in list of known packages is
+consulted.
+*/
 Package *Package::create(Builder &b, const string &name)
 {
        list<string> argv;
@@ -111,31 +98,58 @@ Package *Package::create(Builder &b, const string &name)
        argv.push_back(name);
        vector<string> info=split(run_command(argv));
        
+       bool need_path=false;
        if(info.empty())
        {
+               //XXX Put these in an external file
                if(name=="opengl")
                        info.push_back("-lGL");
                else if(name=="pthread")
                        info.push_back("-lpthread");
                else if(name=="gmpxx")
                        info.push_back("-lgmpxx");
+               else if(name=="fmod4")
+                       need_path=true;
                else
                        return 0;
        }
        
        Package *pkg=new Package(b, name, info);
+       pkg->need_path=need_path;
        return pkg;
 }
 
-void Package::init_buildable()
+/*** private ***/
+
+Package::Package(Builder &b, const string &n, const vector<string> &info):
+       builder(b),
+       name(n),
+       buildable(false)
 {
-       buildable=true;
+       for(vector<string>::const_iterator i=info.begin(); i!=info.end(); ++i)
+       {
+               if(!i->compare(0, 2, "-I"))
+                       export_binfo.incpath.push_back(i->substr(2));
+               else if(!i->compare(0, 2, "-D"))
+                       export_binfo.defines.push_back(i->substr(2));
+               else if(!i->compare(0, 2, "-L"))
+                       export_binfo.libpath.push_back(i->substr(2));
+               else if(!i->compare(0, 2, "-l"))
+                       export_binfo.libs.push_back(i->substr(2));
+       }
+}
 
-       config.add_option("tempdir",  "temp",   "Directory for storing temporary files");
-       config.add_option("optimize", "0",      "Apply compiler optimizations");
-       config.add_option("debug",    "0",      "Produce debugging symbols");
-       config.add_option("cpu",      "auto",   "CPU type to optimize for");
-       config.add_option("arch",     "native", "Architecture for cross-compiling");
+/**
+Initializes configuration options and loads cached values.
+*/
+void Package::init_config()
+{
+       config.add_option("tempdir",    "temp",   "Directory for storing temporary files");
+       config.add_option("optimize",   "0",      "Apply compiler optimizations");
+       config.add_option("debug",      "0",      "Produce debugging symbols");
+       config.add_option("cpu",        "auto",   "CPU type to optimize for");
+       config.add_option("arch",       "native", "Architecture for cross-compiling");
+       config.add_option("staticlibs", "local",  "Use static libraries");
 
        const char *home=getenv("HOME");
        unsigned flags=get_install_flags();
@@ -150,9 +164,86 @@ void Package::init_buildable()
        if(flags&DATA)
                config.add_option("includedir", "$prefix/share",   "Data installation directory");*/
 
+       for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
+               if(i->get_package() && i->get_package()->get_need_path())
+                       config.add_option(i->get_name()+"_path", "", "Path for "+i->get_name());
+
        config.load(source/".options.cache");
 }
 
+/**
+Fills in build info based on configuration.  All required packages must be
+configured when this is called.
+*/
+void Package::create_build_info()
+{
+       if(buildable)
+       {
+               for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
+               {
+                       Package *pkg=i->get_package();
+                       if(!pkg)
+                               continue;
+                       build_info.add(pkg->get_exported_binfo());
+                       //XXX We probably really only want to pass cflags and defines through
+                       export_binfo.add(pkg->get_exported_binfo());
+               }
+       
+               build_info.cflags.push_back("-Wall");
+               build_info.cflags.push_back("-Wshadow");
+               build_info.cflags.push_back("-Wextra");
+               build_info.cflags.push_back("-Wpointer-arith");
+               build_info.cflags.push_back("-Wconversion");
+               build_info.cflags.push_back("-Werror");
+
+               unsigned flags=get_install_flags();
+
+               if(flags&INCLUDE)
+                       export_binfo.incpath.push_back((Path::Path(config.get_option("prefix").value)/"include").str());
+               if(flags&LIB)
+                       export_binfo.libpath.push_back((Path::Path(config.get_option("prefix").value)/"lib").str());
+
+               string optimize=config.get_option("optimize").value;
+               if(strtol(optimize))
+               {
+                       build_info.cflags.push_back("-O"+optimize);
+                       string cpu=config.get_option("cpu").value;
+                       if(cpu!="auto")
+                               build_info.cflags.push_back("-march="+cpu);
+               }
+
+               if(strtobool(config.get_option("debug").value))
+               {
+                       build_info.cflags.push_back("-ggdb");
+                       build_info.defines.push_back("DEBUG");
+               }
+
+               build_info.unique();
+
+               for(list<Component>::iterator i=components.begin(); i!=components.end(); ++i)
+               {
+                       i->create_build_info();
+                       if(i->get_type()==Component::LIBRARY)
+                               export_binfo.libs.push_back(i->get_name());
+               }
+       }
+       else if(name=="fmod4")
+       {
+               export_binfo.libs.push_back("fmodex");
+               if(!path.empty())
+               {
+                       export_binfo.libpath.push_back((path/"api"/"lib").str());
+                       export_binfo.incpath.push_back((path/"api"/"inc").str());
+               }
+       }
+       export_binfo.unique();
+}
+
+/**
+Checks which kinds of things the components of this package install.
+
+@return  A bitmask of installed things
+*/
 unsigned Package::get_install_flags()
 {
        unsigned flags=0;
@@ -184,11 +275,6 @@ Package::Loader::Loader(Package &p):
        add("build_info",  &Loader::build_info);
 }
 
-Package::Loader::~Loader()
-{
-       pkg.init_buildable();
-}
-
 void Package::Loader::require(const string &n)
 {
        pkg.requires.push_back(PackageRef(pkg.builder, n));