From 03c931e54e618221b69cfcd3dfb462e50ecad780 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 28 Oct 2022 23:21:29 +0300
Subject: Add support for package build configurations

---
 mod/mod-build-log.cxx | 55 +++++++++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 24 deletions(-)

(limited to 'mod/mod-build-log.cxx')

diff --git a/mod/mod-build-log.cxx b/mod/mod-build-log.cxx
index 328d178..3841fad 100644
--- a/mod/mod-build-log.cxx
+++ b/mod/mod-build-log.cxx
@@ -3,8 +3,6 @@
 
 #include <mod/mod-build-log.hxx>
 
-#include <algorithm> // find_if()
-
 #include <odb/database.hxx>
 #include <odb/transaction.hxx>
 
@@ -18,7 +16,6 @@
 #include <mod/module-options.hxx>
 
 using namespace std;
-using namespace bbot;
 using namespace brep::cli;
 using namespace odb::core;
 
@@ -124,14 +121,6 @@ handle (request& rq, response& rs)
     assert (i != lpath.end () && *i == "log");
 
     if (++i == lpath.end ())
-      throw invalid_argument ("no configuration name");
-
-    string config (*i++);
-
-    if (config.empty ())
-      throw invalid_argument ("empty configuration name");
-
-    if (i == lpath.end ())
       throw invalid_argument ("no target");
 
     target_triplet target;
@@ -145,6 +134,22 @@ handle (request& rq, response& rs)
     }
 
     if (i == lpath.end ())
+      throw invalid_argument ("no target configuration name");
+
+    string target_config (*i++);
+
+    if (target_config.empty ())
+      throw invalid_argument ("empty target configuration name");
+
+    if (i == lpath.end ())
+      throw invalid_argument ("no package configuration name");
+
+    string package_config (*i++);
+
+    if (package_config.empty ())
+      throw invalid_argument ("empty package configuration name");
+
+    if (i == lpath.end ())
       throw invalid_argument ("no toolchain name");
 
     string toolchain_name (*i++);
@@ -158,8 +163,9 @@ handle (request& rq, response& rs)
     version toolchain_version (parse_version (*i++, "toolchain version"));
 
     id = build_id (package_id (tenant, move (name), package_version),
-                   move (config),
                    move (target),
+                   move (target_config),
+                   move (package_config),
                    move (toolchain_name),
                    toolchain_version);
 
@@ -204,9 +210,11 @@ handle (request& rq, response& rs)
 
   // Make sure the build configuration still exists.
   //
-  if (build_conf_map_->find (build_config_id {id.configuration, id.target}) ==
-      build_conf_map_->end ())
-    config_expired ("no configuration");
+  if (target_conf_map_->find (
+        build_target_config_id {id.target,
+                                id.target_config_name}) ==
+      target_conf_map_->end ())
+    config_expired ("no target configuration");
 
   // Load the package build configuration (if present).
   //
@@ -242,15 +250,14 @@ handle (request& rq, response& rs)
     if (!b->tenant.empty ())
       os << options_->tenant_name () << ": " << b->tenant << endl << endl;
 
-    os << "package:   " << b->package_name << endl
-       << "version:   " << b->package_version << endl
-       << "toolchain: " << b->toolchain_name << '-' << b->toolchain_version
-       << endl
-       << "config:    " << b->configuration << endl
-       << "target:    " << b->target << endl
-       << "machine:   " << b->machine << " (" << b->machine_summary << ")"
-       << endl
-       << "timestamp: ";
+    os << "package:    " << b->package_name << endl
+       << "version:    " << b->package_version << endl
+       << "toolchain:  " << b->toolchain_name << '-' << b->toolchain_version << endl
+       << "target:     " << b->target << endl
+       << "tgt config: " << b->target_config_name << endl
+       << "pkg config: " << b->package_config_name << endl
+       << "machine:    " << b->machine << " (" << b->machine_summary << ")" << endl
+       << "timestamp:  ";
 
     butl::to_stream (os,
                      b->timestamp,
-- 
cgit v1.1