Add profile templates

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index 031ceb5f95c3a0bac333ed5c50df60137c71e834..74dcbaa693a09e0e32969659b193bced835a95f2 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -17,6 +17,7 @@ Package::Package(Builder &b, const string &n, const Path::Path &s):
        name(n),
        buildable(true),
        source(s),
+       config(*this),
        conf_done(false),
        use_pkgconfig(true),
        need_path(false)
@@ -102,7 +103,7 @@ void Package::resolve_refs()
 Processes configuration options that were most likely obtained from the command
 line.
 */
-void Package::configure(const RawOptionMap &opts, unsigned flag)
+void Package::configure(const StringMap &opts, unsigned flag)
 {
        if(conf_done)
                return;
@@ -114,8 +115,8 @@ void Package::configure(const RawOptionMap &opts, unsigned flag)
        {
                init_config();
 
-               RawOptionMap::const_iterator prof=opts.find("profile");
-               if(prof!=opts.end())
+               StringMap::const_iterator prof=opts.find("profile");
+               if(prof!=opts.end() && flag)
                        config.select_profile(prof->second);
                else
                        config.select_last_profile();
@@ -128,6 +129,8 @@ void Package::configure(const RawOptionMap &opts, unsigned flag)
                                config.save();
                }
 
+               config.finish();
+
                for(PackageList::iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
                {
                        if((*i)->get_need_path())
@@ -188,7 +191,9 @@ 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),
+       config(*this),
+       conf_done(false)
 {
        for(vector<string>::const_iterator i=info.begin(); i!=info.end(); ++i)
        {
@@ -217,10 +222,9 @@ void Package::init_config()
        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();
        if(flags)
-               config.add_option("prefix",     string(home)+"/local"/*"/usr"*/,            "Installation prefix");
+               config.add_option("prefix",     "$HOME/local",     "Installation prefix");
        /*if(flags&INCLUDE)
                config.add_option("includedir", "$prefix/include", "Header installation directory");
        if(flags&BIN)
@@ -233,8 +237,6 @@ void Package::init_config()
        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.set_source(source);
 }
 
 /**
@@ -273,6 +275,7 @@ void Package::create_build_info()
                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);