Change mspparser -> mspdatafile

[builder.git] / source / builder.cpp

diff --git a/source/builder.cpp b/source/builder.cpp
index 553a3e159afbe01e7487ad35b6cf337ae909974c..98e2a0721c0895308f19c828d9a01eb22c9c3c3f 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -10,7 +10,7 @@ Distributed under the LGPL
 #include <set>
 #include <msp/core/error.h>
 #include <msp/core/getopt.h>
-#include <msp/parser/parser.h>
+#include <msp/datafile/parser.h>
 #include <msp/path/utils.h>
 #include <msp/strings/utils.h>
 #include <msp/time/units.h>
@@ -25,6 +25,7 @@ Distributed under the LGPL
 #include "pkgconfig.h"
 #include "sharedlibrary.h"
 #include "systemlibrary.h"
+#include "tarball.h"
 #include "unlink.h"
 #include "virtualtarget.h"
 
@@ -485,7 +486,7 @@ int Builder::load_build_file(const Path::Path &fn)
        if(!in)
                return -1;
 
-       Parser::Parser parser(in, fn.str());
+       DataFile::Parser parser(in, fn.str());
        Loader loader(*this, fn.subpath(0, fn.size()-1));
        loader.load(parser);
 
@@ -508,6 +509,9 @@ int Builder::create_targets()
        Target *install=new VirtualTarget(*this, "install");
        world->add_depend(install);
 
+       Target *tarballs=new VirtualTarget(*this, "tarballs");
+       world->add_depend(tarballs);
+
        for(PackageMap::iterator i=packages.begin(); i!=packages.end(); ++i)
        {
                if(!i->second)
@@ -524,6 +528,8 @@ int Builder::create_targets()
                        PkgConfig *pc=new PkgConfig(*this, *i->second);
                        install->add_depend(new Install(*this, *i->second, *pc));
                }
+
+               tarballs->add_depend(new TarBall(*this, *i->second));
        }
 
        // Find dependencies until no new targets are created