1 files changed, 55 insertions, 7 deletions

diff --git a/mod/mod-ci.hxx b/mod/mod-ci.hxx
index 8a4e51e..1e2ee15 100644
--- a/mod/mod-ci.hxx
+++ b/mod/mod-ci.hxx
@@ -1,23 +1,47 @@
 // file      : mod/mod-ci.hxx -*- C++ -*-
-// copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
 #ifndef MOD_MOD_CI_HXX
 #define MOD_MOD_CI_HXX
 
-#include <web/xhtml-fragment.hxx>
+#include <web/xhtml/fragment.hxx>
 
 #include <libbrep/types.hxx>
 #include <libbrep/utility.hxx>
 
+#include <libbrep/build.hxx>
+#include <libbrep/common.hxx> // tenant_service
+
 #include <mod/module.hxx>
-#include <mod/options.hxx>
+#include <mod/module-options.hxx>
+
+#include <mod/ci-common.hxx>
+
+#ifdef BREP_CI_TENANT_SERVICE
+#  include <mod/tenant-service.hxx>
+#endif
 
 namespace brep
 {
-  class ci: public handler
+  class ci: public handler,
+            private ci_start
+#ifdef BREP_CI_TENANT_SERVICE
+          , public tenant_service_build_queued,
+            public tenant_service_build_building,
+            public tenant_service_build_built
+#endif
   {
   public:
+
+#ifdef BREP_CI_TENANT_SERVICE
+    explicit
+    ci (tenant_service_map&);
+
+    // Create a shallow copy (handling instance) if initialized and a deep
+    // copy (context exemplar) otherwise.
+    //
+    ci (const ci&, tenant_service_map&);
+#else
     ci () = default;
 
     // Create a shallow copy (handling instance) if initialized and a deep
@@ -25,20 +49,44 @@ namespace brep
     //
     explicit
     ci (const ci&);
+#endif
 
     virtual bool
-    handle (request&, response&);
+    handle (request&, response&) override;
 
     virtual const cli::options&
-    cli_options () const {return options::ci::description ();}
+    cli_options () const override {return options::ci::description ();}
+
+#ifdef BREP_CI_TENANT_SERVICE
+    virtual function<optional<string> (const tenant_service&)>
+    build_queued (const tenant_service&,
+                  const vector<build>&,
+                  optional<build_state> initial_state,
+                  const build_queued_hints&,
+                  const diag_epilogue& log_writer) const noexcept override;
+
+    virtual function<optional<string> (const tenant_service&)>
+    build_building (const tenant_service&,
+                    const build&,
+                    const diag_epilogue& log_writer) const noexcept override;
+
+    virtual function<optional<string> (const tenant_service&)>
+    build_built (const tenant_service&,
+                 const build&,
+                 const diag_epilogue& log_writer) const noexcept override;
+#endif
 
   private:
     virtual void
-    init (cli::scanner&);
+    init (cli::scanner&) override;
 
   private:
     shared_ptr<options::ci> options_;
     shared_ptr<web::xhtml::fragment> form_;
+
+#ifdef BREP_CI_TENANT_SERVICE
+    tenant_service_map& tenant_service_map_;
+#endif
   };
 }