]> git.tdb.fi Git - builder.git/blobdiff - source/package.cpp
Split class Package into SourcePackage and BinaryPackage
[builder.git] / source / package.cpp
index 8fb2b4dde4ffe8dda0e0b2507aca1174ca7ee968..23a8d9c8e6c73a0b592d0d0de5849419d1df0b0b 100644 (file)
@@ -19,78 +19,12 @@ using namespace Msp;
 /**
 Creates a buildable package.
 */
-Package::Package(Builder &b, const string &n, const Path::Path &s):
+Package::Package(Builder &b, const string &n):
        builder(b),
        name(n),
-       buildable(true),
-       source(s),
-       config(*this),
        conf_done(false),
-       deps_cache(*this),
-       use_pkgconfig(true),
-       need_path(false)
-{
-       tar_files.push_back(source/"Build");
-
-       if(builder.get_verbose()>=4)
-               cout<<"Created buildable package "<<n<<" at "<<s<<'\n';
-}
-
-/**
-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)
-{
-       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");
-}
+       use_pkgconfig(true)
+{ }
 
 /**
 Tries to resolve all references to dependency packages.
@@ -98,28 +32,7 @@ Tries to resolve all references to dependency packages.
 void Package::resolve_refs()
 {
        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());
-       }
-
-       for(ConditionList::iterator i=conditions.begin(); i!=conditions.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());
-       }
+               i->resolve();
 }
 
 /**
@@ -134,302 +47,25 @@ void Package::configure(const StringMap &opts, unsigned flag)
        if(builder.get_verbose()>=3)
                cout<<"Configuring "<<name<<'\n';
 
-       if(buildable)
-       {
-               init_config();
-
-               StringMap::const_iterator prof=opts.find("profile");
-               if(prof!=opts.end() && flag)
-                       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();
-               }
-
-               config.finish();
-
-               for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i)
-                       if(i->eval())
-                       {
-                               const PkgRefList &reqs=i->get_requires();
-                               requires.insert(requires.end(), reqs.begin(), reqs.end());
-                               build_info.add(i->get_build_info());
-                       }
+       do_configure(opts, flag);
 
-               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);
-               }
-
-               deps_cache.load();
-       }
+       for(PkgRefList::iterator i=requires.begin(); i!=requires.end(); ++i)
+               i->get_package()->configure(opts, flag&2);
 
        create_build_info();
 
        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;
-       argv.push_back("pkg-config");
-       argv.push_back("--silence-errors");
-       argv.push_back("--cflags");
-       argv.push_back("--libs");
-       argv.push_back(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");
-               else if(name=="pthread")
-                       info.push_back("-lpthread");
-               else if(name=="gmpxx")
-                       info.push_back("-lgmpxx");
-               else if(name=="fmod4")
-                       need_path=true;
-               else if(name=="devil")
-                       info.push_back("-lIL");
-               else if(name=="Xlib")
-                       info.push_back("-lX11");
-               else
-                       return 0;
-       }
-
-       Package *pkg=new Package(b, name, info);
-       pkg->need_path=need_path;
-       pkg->use_pkgconfig=use_pkgconfig;
-       return pkg;
-}
-
 /*** private ***/
 
-Package::Package(Builder &b, const string &n, const vector<string> &info):
-       builder(b),
-       name(n),
-       buildable(false),
-       config(*this),
-       conf_done(false),
-       deps_cache(*this)
-{
-       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));
-       }
-
-       if(builder.get_verbose()>=4)
-       {
-               cout<<"Created non-buildable package "<<name<<" with";
-               for(vector<string>::const_iterator i=info.begin(); i!=info.end(); ++i)
-                       cout<<' '<<*i;
-               cout<<'\n';
-       }
-}
-
-/**
-Initializes configuration options and loads cached values.
-*/
-void Package::init_config()
-{
-       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");
-
-       unsigned flags=get_install_flags();
-       if(flags)
-               config.add_option("prefix",     "$HOME/local",     "Installation prefix");
-       /*if(flags&INCLUDE)
-               config.add_option("includedir", "$prefix/include", "Header installation directory");
-       if(flags&BIN)
-               config.add_option("includedir", "$prefix/bin",     "Binary installation directory");
-       if(flags&LIB)
-               config.add_option("includedir", "$prefix/lib",     "Library installation directory");
-       if(flags&DATA)
-               config.add_option("includedir", "$prefix/share",   "Data installation directory");*/
-
-       for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
-               config.add_option("with_"+i->name, "0", i->descr);
-
-       for(PackageList::const_iterator i=all_reqs.begin(); i!=all_reqs.end(); ++i)
-               if((*i)->get_need_path())
-                       config.add_option((*i)->get_name()+"_path", "", "Path for "+(*i)->get_name());
-}
-
-/**
-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;
-                       const BuildInfo &ebi=pkg->get_exported_binfo();
-                       build_info.add(ebi);
-
-                       export_binfo.cflags.insert(export_binfo.cflags.end(), ebi.cflags.begin(), ebi.cflags.end());
-                       export_binfo.incpath.insert(export_binfo.incpath.end(), ebi.incpath.begin(), ebi.incpath.end());
-                       export_binfo.defines.insert(export_binfo.defines.end(), ebi.defines.begin(), ebi.defines.end());
-               }
-
-               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(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(lexical_cast<bool>(config.get_option("debug").value))
-               {
-                       build_info.cflags.push_back("-ggdb");
-                       build_info.defines.push_back("DEBUG");
-               }
-
-               for(FeatureList::iterator i=features.begin(); i!=features.end(); ++i)
-                       if(lexical_cast<bool>(config.get_option("with_"+i->name).value))
-                               build_info.cflags.push_back("-DWITH_"+toupper(i->name));
-
-               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();
-}
-
-
 Package::Loader::Loader(Package &p):
        pkg(p)
 {
-       add("version",     &Package::version);
-       add("description", &Package::description);
-       add("require",     &Loader::require);
-       add("feature",     &Loader::feature);
-       add("if",          &Loader::condition);
-       add("program",     &Loader::program);
-       add("library",     &Loader::library);
-       add("module",      &Loader::module);
-       add("headers",     &Loader::headers);
-       add("build_info",  &Loader::build_info);
-       add("tar_file",    &Loader::tar_file);
+       add("require", &Loader::require);
 }
 
 void Package::Loader::require(const string &n)
 {
        pkg.requires.push_back(PackageRef(pkg.builder, n));
 }
-
-void Package::Loader::feature(const string &n, const string &d)
-{
-       pkg.features.push_back(Feature(n, d));
-}
-
-void Package::Loader::condition(const string &c)
-{
-       Condition cond(pkg, c);
-       load_sub(cond);
-       pkg.conditions.push_back(cond);
-}
-
-void Package::Loader::program(const string &n)
-{
-       Component prog(pkg, Component::PROGRAM, n);
-       load_sub(prog);
-       pkg.components.push_back(prog);
-}
-
-void Package::Loader::library(const string &n)
-{
-       Component prog(pkg, Component::LIBRARY, n);
-       load_sub(prog);
-       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);
-       load_sub(prog);
-       pkg.components.push_back(prog);
-}
-
-void Package::Loader::build_info()
-{
-       load_sub(pkg.build_info);
-}
-
-void Package::Loader::tar_file(const string &f)
-{
-       pkg.tar_files.push_back(pkg.source/f);
-}