Add basic support for tools (not configurable yet)

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index 31b36bb4710365af4313f0cec4e0ec7360a9b4a0..2e7932c1c57a93dbed709797eb14a05b5a9572ea 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -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"
@@ -31,6 +31,16 @@ 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.
 
@@ -55,6 +65,19 @@ unsigned Package::get_install_flags()
        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.
 */
@@ -91,11 +114,18 @@ void Package::configure(const RawOptionMap &opts, unsigned flag)
        {
                init_config();
 
-               if(flag && config.process(opts) && !builder.get_dry_run())
+               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";
-                       config.save(source/".options.cache");
+                       if(!builder.get_dry_run())
+                               config.save();
                }
 
                for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
@@ -141,6 +171,8 @@ 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;
        }
@@ -156,7 +188,8 @@ Package *Package::create(Builder &b, const string &name)
 Package::Package(Builder &b, const string &n, const vector<string> &info):
        builder(b),
        name(n),
-       buildable(false)
+       buildable(false),
+       conf_done(false)
 {
        for(vector<string>::const_iterator i=info.begin(); i!=info.end(); ++i)
        {
@@ -176,12 +209,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();
@@ -200,7 +235,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);
 }
 
 /**
@@ -236,15 +271,16 @@ 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);
+                       build_info.ldflags.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))
+               if(lexical_cast<bool>(config.get_option("debug").value))
                {
                        build_info.cflags.push_back("-ggdb");
                        build_info.defines.push_back("DEBUG");
@@ -261,7 +297,6 @@ void Package::create_build_info()
        }
        else if(name=="fmod4")
        {
-               cout<<path<<'\n';
                export_binfo.libs.push_back("fmodex");
                if(!path.empty())
                {
@@ -280,6 +315,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);
 }
@@ -303,6 +339,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);