Add a field for a human-readable name for packages

[builder.git] / source / pkgconfiggenerator.cpp

diff --git a/source/pkgconfiggenerator.cpp b/source/pkgconfiggenerator.cpp
index 555d8c56db797bc5fda9e2e72842bcea4726fc51..949a4df589747e7da8b64ec0cc39f53544ba8db0 100644 (file)
--- a/source/pkgconfiggenerator.cpp
+++ b/source/pkgconfiggenerator.cpp
@@ -2,7 +2,7 @@
 #include <msp/io/file.h>
 #include <msp/io/print.h>
 #include "builder.h"
-#include "pkgconfig.h"
+#include "pkgconfigfile.h"
 #include "pkgconfiggenerator.h"
 
 using namespace std;
@@ -13,62 +13,73 @@ PkgConfigGenerator::PkgConfigGenerator(Builder &b):
 {
 }
 
-Target *PkgConfigGenerator::create_target(const list<Target *> &, const string &) const
+Target *PkgConfigGenerator::create_target(const list<Target *> &, const string &)
 {
        throw logic_error("Not implemented");
 }
 
 Task *PkgConfigGenerator::run(const Target &target) const
 {
-       const PkgConfig &pkgc = dynamic_cast<const PkgConfig &>(target);
+       const PkgConfigFile &pkgc = dynamic_cast<const PkgConfigFile &>(target);
        Worker *worker = new Worker(pkgc);
        return new InternalTask(worker);
 }
 
 
-PkgConfigGenerator::Worker::Worker(const PkgConfig &t):
+PkgConfigGenerator::Worker::Worker(const PkgConfigFile &t):
        target(t)
-{
-       launch();
-}
+{ }
 
 void PkgConfigGenerator::Worker::main()
 {
        Builder &builder = target.get_package()->get_builder();
-       const SourcePackage &spkg = dynamic_cast<const SourcePackage &>(*target.get_package());
+       const SourcePackage &spkg = *target.get_package();
 
        IO::BufferedFile out(target.get_path().str(), IO::M_WRITE);
        IO::print(out, "prefix=%s\n", builder.get_prefix().str());
-       IO::print(out, "source=%s\n\n", spkg.get_source());
+       IO::print(out, "source=%s\n\n", spkg.get_source_directory());
 
-       IO::print(out, "Name: %s\n", spkg.get_name());
+       IO::print(out, "Name: %s\n", spkg.get_label());
        IO::print(out, "Description: %s\n", spkg.get_description());
        IO::print(out, "Version: %s\n", spkg.get_version());
 
        IO::print(out, "Requires:");
-       const PackageList &reqs = spkg.get_requires();
-       for(PackageList::const_iterator i=reqs.begin(); i!=reqs.end(); ++i)
-               if((*i)->get_use_pkgconfig())
+       const Package::Requirements &reqs = spkg.get_required_packages();
+       for(Package::Requirements::const_iterator i=reqs.begin(); i!=reqs.end(); ++i)
+               if((*i)->uses_pkgconfig())
                        IO::print(out, " %s", (*i)->get_name());
        out.put('\n');
 
-       const BuildInfo &binfo = spkg.get_exported_binfo();
+       const BuildInfo &binfo = spkg.get_exported_build_info();
        IO::print(out, "Libs:");
-       for(StringList::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
-               IO::print(out, " -L%s", FS::relative(*i, builder.get_prefix()).str());
-       for(StringList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
+       for(BuildInfo::PathList::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
+               IO::print(out, " -L%s", prefixify(*i, builder.get_prefix()));
+       for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
                IO::print(out, " -l%s", *i);
        if(binfo.threads)
                out.write("-pthread");
        out.put('\n');
 
        IO::print(out, "Cflags:");
-       for(StringList::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
-               IO::print(out, " -I%s", FS::relative(*i, builder.get_prefix()).str());
+       for(BuildInfo::PathList::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
+               IO::print(out, " -I%s", prefixify(*i, builder.get_prefix()));
        for(BuildInfo::DefineMap::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
                if(i->second.empty())
                        IO::print(out, " -D%s", i->first);
                else
                        IO::print(out, " -D%s=%s", i->first, i->second);
        out.put('\n');
+
+       status = Task::SUCCESS;
+}
+
+string PkgConfigGenerator::Worker::prefixify(const FS::Path &path, const FS::Path &prefix)
+{
+       if(FS::descendant_depth(path, prefix)>=0)
+       {
+               FS::Path rel_path = FS::relative(path, prefix);
+               return "${prefix}"+rel_path.str().substr(1);
+       }
+       else
+               return path.str();
 }