1 files changed, 64 insertions, 24 deletions

diff --git a/libbrep/package.cxx b/libbrep/package.cxx
index 152d1d8..4eb6fe8 100644
--- a/libbrep/package.cxx
+++ b/libbrep/package.cxx
@@ -40,11 +40,15 @@ namespace brep
   // tenant
   //
   tenant::
-  tenant (string i, bool p, optional<string> r)
+  tenant (string i,
+          bool p,
+          optional<string> r,
+          optional<tenant_service> s)
       : id (move (i)),
         private_ (p),
         interactive (move (r)),
-        creation_timestamp (timestamp::clock::now ())
+        creation_timestamp (timestamp::clock::now ()),
+        service (move (s))
   {
   }
 
@@ -60,9 +64,9 @@ namespace brep
            license_alternatives_type la,
            small_vector<string, 5> tp,
            small_vector<string, 5> kw,
-           optional<string> ds,
-           optional<text_type> dt,
-           string ch,
+           optional<typed_text> ds,
+           optional<typed_text> pds,
+           optional<typed_text> ch,
            optional<manifest_url> ur,
            optional<manifest_url> du,
            optional<manifest_url> su,
@@ -77,7 +81,9 @@ namespace brep
            small_vector<test_dependency, 1> ts,
            build_class_exprs bs,
            build_constraints_type bc,
-           build_package_configs bcs,
+           build_auxiliaries_type ac,
+           package_build_bot_keys bk,
+           package_build_configs bcs,
            optional<path> lc,
            optional<string> fr,
            optional<string> sh,
@@ -94,7 +100,7 @@ namespace brep
         topics (move (tp)),
         keywords (move (kw)),
         description (move (ds)),
-        description_type (move (dt)),
+        package_description (move (pds)),
         changes (move (ch)),
         url (move (ur)),
         doc_url (move (du)),
@@ -110,28 +116,18 @@ namespace brep
         tests (move (ts)),
         builds (move (bs)),
         build_constraints (move (bc)),
+        build_auxiliaries (move (ac)),
+        build_bot_keys (move (bk)),
+        build_configs (move (bcs)),
         internal_repository (move (rp)),
         location (move (lc)),
         fragment (move (fr)),
         sha256sum (move (sh))
   {
-    // Add the default build configuration at the beginning, unless it is
-    // specified explicitly.
+    // The default configuration is always added by the package manifest
+    // parser (see libbpkg/manifest.cxx for details).
     //
-    if (find_if (bcs.begin (), bcs.end (),
-                 [] (const build_package_config& c)
-                 {return c.name == "default";}) != bcs.end ())
-    {
-      build_configs = move (bcs);
-    }
-    else
-    {
-      build_configs.reserve (bcs.size () + 1);
-      build_configs.emplace_back ("default");
-      build_configs.insert (build_configs.end (),
-                            make_move_iterator (bcs.begin ()),
-                            make_move_iterator (bcs.end ()));
-    }
+    assert (find ("default", build_configs) != nullptr);
 
     if (stub ())
       unbuildable_reason = brep::unbuildable_reason::stub;
@@ -140,6 +136,31 @@ namespace brep
 
     buildable = !unbuildable_reason;
 
+    // If the package is buildable deduce the custom_bot flag.
+    //
+    if (buildable)
+    {
+      for (const package_build_config& bc: build_configs)
+      {
+        bool custom (!bc.effective_bot_keys (build_bot_keys).empty ());
+
+        if (!custom_bot)
+        {
+          custom_bot = custom;
+        }
+        //
+        // If both the custom and default bots are used by the package, then
+        // reset the custom_bot flag to nullopt and bail out from the build
+        // package configurations loop.
+        //
+        else if (*custom_bot != custom)
+        {
+          custom_bot = nullopt;
+          break;
+        }
+      }
+    }
+
     assert (internal_repository->internal);
   }
 
@@ -148,6 +169,8 @@ namespace brep
            version_type vr,
            build_class_exprs bs,
            build_constraints_type bc,
+           build_auxiliaries_type ac,
+           package_build_configs bcs,
            shared_ptr<repository_type> rp)
       : id (rp->tenant, move (nm), vr),
         tenant (id.tenant),
@@ -155,11 +178,18 @@ namespace brep
         version (move (vr)),
         builds (move (bs)),
         build_constraints (move (bc)),
+        build_auxiliaries (move (ac)),
+        build_configs (move (bcs)),
         buildable (false),
         unbuildable_reason (stub ()
                             ? brep::unbuildable_reason::stub
                             : brep::unbuildable_reason::external)
   {
+    // The default configuration is always added by the package manifest
+    // parser (see libbpkg/manifest.cxx for details).
+    //
+    assert (find ("default", build_configs) != nullptr);
+
     assert (!rp->internal);
     other_repositories.emplace_back (move (rp));
   }
@@ -216,7 +246,17 @@ namespace brep
     for (const auto& k: keywords)
       k2 += ' ' + k;
 
-    return {move (k), move (k2), description ? *description : "", changes};
+    string d (description ? description->text : "");
+
+    if (package_description)
+    {
+      if (description)
+        d += ' ';
+
+      d += package_description->text;
+    }
+
+    return {move (k), move (k2), move (d), changes ? changes->text : ""};
   }
 
   // repository