]> git.tdb.fi Git - builder.git/blobdiff - source/package.cpp
Support building modular programs
[builder.git] / source / package.cpp
index 587ce80da4f3b172ca839cb53be9d6673c7c2fb5..031ceb5f95c3a0bac333ed5c50df60137c71e834 100644 (file)
@@ -1,5 +1,5 @@
-#include <msp/strconv.h>
-#include <msp/strutils.h>
+#include <msp/strings/lexicalcast.h>
+#include <msp/strings/utils.h>
 #include "builder.h"
 #include "misc.h"
 #include "package.h"
@@ -18,6 +18,7 @@ Package::Package(Builder &b, const string &n, const Path::Path &s):
        buildable(true),
        source(s),
        conf_done(false),
+       use_pkgconfig(true),
        need_path(false)
 { }
 
@@ -30,6 +31,53 @@ void Package::set_path(const Msp::Path::Path &p)
        path=builder.get_cwd()/p;
 }
 
+Msp::Path::Path Package::get_temp_dir() const
+{
+       return source/config.get_option("tempdir").value/config.get_option("profile").value;
+}
+
+Msp::Path::Path Package::get_out_dir() const
+{
+       return source/config.get_option("outdir").value;
+}
+
+/**
+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;
+       for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
+       {
+               if(i->get_install())
+               {
+                       if(i->get_type()==Component::PROGRAM)
+                               flags|=BIN;
+                       else if(i->get_type()==Component::LIBRARY || i->get_type()==Component::MODULE)
+                               flags|=LIB;
+               }
+               if(!i->get_install_headers().empty())
+                       flags|=INCLUDE;
+       }
+
+       return flags;
+}
+
+LibMode Package::get_library_mode() const
+{
+       const string &mode=config.get_option("staticlibs").value;
+       if(mode=="all")
+               return ALL_STATIC;
+       else if(mode=="local")
+               return LOCAL_STATIC;
+       else if(mode=="none")
+               return DYNAMIC;
+       else
+               throw Exception("Unknown library mode");
+}
+
 /**
 Tries to resolve all references to dependency packages.
 */
@@ -56,28 +104,38 @@ line.
 */
 void Package::configure(const RawOptionMap &opts, unsigned flag)
 {
-       if(conf_done || !buildable)
+       if(conf_done)
                return;
-       
+
        if(builder.get_verbose()>=3)
                cout<<"Configuring "<<name<<'\n';
-       
-       init_config();
 
-       if(flag && config.process(opts) && !builder.get_dry_run())
-       {
-               if(builder.get_verbose()>=2)
-                       cout<<"Configuration of "<<name<<" changed.\n";
-               config.save(source/".options.cache");
-       }
-       
-       for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+       if(buildable)
        {
-               (*i)->configure(opts, flag&2);
-               if((*i)->get_need_path())
-                       (*i)->set_path(config.get_option((*i)->get_name()+"_path").value);
+               init_config();
+
+               RawOptionMap::const_iterator prof=opts.find("profile");
+               if(prof!=opts.end())
+                       config.select_profile(prof->second);
+               else
+                       config.select_last_profile();
+                       
+               if(flag && config.update(opts))
+               {
+                       if(builder.get_verbose()>=2)
+                               cout<<"Configuration of "<<name<<" changed\n";
+                       if(!builder.get_dry_run())
+                               config.save();
+               }
+
+               for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
+               {
+                       if((*i)->get_need_path())
+                               (*i)->set_path(config.get_option((*i)->get_name()+"_path").value);
+                       (*i)->configure(opts, flag&2);
+               }
        }
-       
+
        create_build_info();
 
        conf_done=true;
@@ -99,8 +157,11 @@ Package *Package::create(Builder &b, const string &name)
        vector<string> info=split(run_command(argv));
        
        bool need_path=false;
+       bool use_pkgconfig=true;
        if(info.empty())
        {
+               use_pkgconfig=false;
+               
                //XXX Put these in an external file
                if(name=="opengl")
                        info.push_back("-lGL");
@@ -110,12 +171,15 @@ Package *Package::create(Builder &b, const string &name)
                        info.push_back("-lgmpxx");
                else if(name=="fmod4")
                        need_path=true;
+               else if(name=="devil")
+                       info.push_back("-lIL");
                else
                        return 0;
        }
        
        Package *pkg=new Package(b, name, info);
        pkg->need_path=need_path;
+       pkg->use_pkgconfig=use_pkgconfig;
        return pkg;
 }
 
@@ -144,12 +208,14 @@ 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");
+       config.add_option("profile",    "default", "Configuration profile");
+       config.add_option("tempdir",    "temp",    "Directory for storing temporary files");
+       config.add_option("outdir",     ".",       "Directory to put build results in");
+       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();
@@ -168,7 +234,7 @@ void Package::init_config()
                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");
+       config.set_source(source);
 }
 
 /**
@@ -204,7 +270,7 @@ void Package::create_build_info()
                        export_binfo.libpath.push_back((Path::Path(config.get_option("prefix").value)/"lib").str());
 
                string optimize=config.get_option("optimize").value;
-               if(strtol(optimize))
+               if(lexical_cast<unsigned>(optimize))
                {
                        build_info.cflags.push_back("-O"+optimize);
                        string cpu=config.get_option("cpu").value;
@@ -212,7 +278,7 @@ void Package::create_build_info()
                                build_info.cflags.push_back("-march="+cpu);
                }
 
-               if(strtobool(config.get_option("debug").value))
+               if(lexical_cast<bool>(config.get_option("debug").value))
                {
                        build_info.cflags.push_back("-ggdb");
                        build_info.defines.push_back("DEBUG");
@@ -239,30 +305,6 @@ void Package::create_build_info()
        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;
-       for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
-       {
-               if(i->get_install())
-               {
-                       if(i->get_type()==Component::PROGRAM)
-                               flags|=BIN;
-                       else if(i->get_type()==Component::LIBRARY || i->get_type()==Component::MODULE)
-                               flags|=LIB;
-               }
-               if(!i->get_install_headers().empty())
-                       flags|=INCLUDE;
-       }
-
-       return flags;
-}
-
 Package::Loader::Loader(Package &p):
        pkg(p)
 {
@@ -271,6 +313,7 @@ Package::Loader::Loader(Package &p):
        add("require",     &Loader::require);
        add("program",     &Loader::program);
        add("library",     &Loader::library);
+       add("module",      &Loader::module);
        add("headers",     &Loader::headers);
        add("build_info",  &Loader::build_info);
 }
@@ -294,6 +337,13 @@ void Package::Loader::library(const string &n)
        pkg.components.push_back(prog);
 }
 
+void Package::Loader::module(const string &n)
+{
+       Component prog(pkg, Component::MODULE, n);
+       load_sub(prog);
+       pkg.components.push_back(prog);
+}
+
 void Package::Loader::headers(const string &n)
 {
        Component prog(pkg, Component::HEADERS, n);