From 6a41864fdb57c75be3db87b357063b0c828dbc18 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 11 Jul 2018 15:51:59 +0300
Subject: Add support for package project manifest value

---
 libbrep/package.cxx | 4 +++-
 libbrep/package.hxx | 9 ++++++++-
 libbrep/package.xml | 1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'libbrep')

diff --git a/libbrep/package.cxx b/libbrep/package.cxx
index 3e457b2..8c0abfe 100644
--- a/libbrep/package.cxx
+++ b/libbrep/package.cxx
@@ -49,6 +49,7 @@ namespace brep
   package::
   package (package_name nm,
            version_type vr,
+           package_name pn,
            priority_type pr,
            string sm,
            license_alternatives_type la,
@@ -70,6 +71,7 @@ namespace brep
            shared_ptr<repository_type> rp)
       : id (move (nm), vr),
         version (move (vr)),
+        project (move (pn)),
         priority (move (pr)),
         summary (move (sm)),
         license_alternatives (move (la)),
@@ -124,7 +126,7 @@ namespace brep
     //   the available internal repositories.
     //
     string k (id.name.string () + " " + version.string () + " " +
-              version.string (true));
+              version.string (true) + " " + project.string ());
 
     // Add tags to keywords.
     //
diff --git a/libbrep/package.hxx b/libbrep/package.hxx
index 0f3f181..e7a8338 100644
--- a/libbrep/package.hxx
+++ b/libbrep/package.hxx
@@ -298,8 +298,9 @@ namespace brep
     // Create internal package object. Note that for stubs the build
     // constraints are meaningless, and so not saved.
     //
-    package (package_name name,
+    package (package_name,
              version_type,
+             package_name project,
              priority_type,
              string summary,
              license_alternatives_type,
@@ -336,6 +337,12 @@ namespace brep
     //
     package_id id;
     upstream_version version;
+
+    // Matches the package name if the project name is not specified in
+    // the manifest.
+    //
+    package_name project;
+
     priority_type priority;
     string summary;
     license_alternatives_type license_alternatives;
diff --git a/libbrep/package.xml b/libbrep/package.xml
index 08ecc61..47ff071 100644
--- a/libbrep/package.xml
+++ b/libbrep/package.xml
@@ -77,6 +77,7 @@
       <column name="version_revision" type="INTEGER" null="false"/>
       <column name="version_upstream" type="TEXT" null="false"/>
       <column name="version_release" type="TEXT" null="true"/>
+      <column name="project" type="CITEXT" null="false"/>
       <column name="priority" type="INTEGER" null="false"/>
       <column name="priority_comment" type="TEXT" null="false"/>
       <column name="summary" type="TEXT" null="false"/>
-- 
cgit v1.1