Implement help

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index c55e5f47272122951c2e370bc6c6d632e156eb40..d4022f5f3fae7b0f045ddea2087828d5eb987ad9 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -7,6 +7,8 @@
 using namespace std;
 using namespace Msp;
 
+#include <iostream>
+
 Package::Package(Builder &b, const string &n, const Path::Path &s):
        builder(b),
        name(n),
@@ -19,7 +21,7 @@ Package::Package(Builder &b, const string &n, const vector<string> &info):
        builder(b),
        name(n),
        buildable(false),
-       build_info_ready(true)
+       build_info_ready(false)
 {
        for(vector<string>::const_iterator i=info.begin(); i!=info.end(); ++i)
        {
@@ -34,6 +36,11 @@ Package::Package(Builder &b, const string &n, const vector<string> &info):
        }
 }
 
+void Package::set_path(const Msp::Path::Path &p)
+{
+       path=builder.get_cwd()/p;
+}
+
 void Package::resolve_refs()
 {
        for(list<PackageRef>::iterator i=requires.begin(); i!=requires.end(); ++i)
@@ -47,53 +54,69 @@ void Package::create_build_info()
        if(build_info_ready)
                return;
        
-       for(list<PackageRef>::iterator i=requires.begin(); i!=requires.end(); ++i)
+       if(buildable)
        {
-               if(!i->get_package())
-                       continue;
-               i->get_package()->create_build_info();
-               build_info.add(i->get_package()->get_exported_binfo());
-       }
+               for(list<PackageRef>::iterator i=requires.begin(); i!=requires.end(); ++i)
+               {
+                       Package *pkg=i->get_package();
+                       if(!pkg)
+                               continue;
+                       if(pkg->get_need_path())
+                               pkg->set_path(config.get_option(pkg->get_name()+"_path").value);
+                       pkg->create_build_info();
+                       build_info.add(pkg->get_exported_binfo());
+                       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");
+               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);
+               }
 
-       unsigned flags=get_install_flags();
+               if(strtobool(config.get_option("debug").value))
+               {
+                       build_info.cflags.push_back("-ggdb");
+                       build_info.defines.push_back("DEBUG");
+               }
 
-       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());
+               build_info.unique();
 
-       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);
+               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());
+               }
        }
-
-       if(strtobool(config.get_option("debug").value))
+       else if(name=="fmod4")
        {
-               build_info.cflags.push_back("-ggdb");
-               build_info.defines.push_back("DEBUG");
+               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());
+               }
        }
-
-       build_info.unique();
        export_binfo.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());
-       }
-
        build_info_ready=true;
 }
 
@@ -113,6 +136,7 @@ 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())
        {
                if(name=="opengl")
@@ -121,11 +145,14 @@ Package *Package::create(Builder &b, const string &name)
                        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;
 }
 
@@ -152,6 +179,9 @@ void Package::init_buildable()
        if(flags&DATA)
                config.add_option("includedir", "$prefix/share",   "Data installation directory");*/
 
+       for(list<PackageRef>::iterator i=requires.begin(); i!=requires.end(); ++i)
+               config.add_option(i->get_name()+"_path", "", "Path for "+i->get_name());
+
        config.load(source/".options.cache");
 }