From 2c3af8d9fe9fe6eab885409502ea1ec10e82f59c Mon Sep 17 00:00:00 2001
From: k32 <10274441+k32@users.noreply.github.com>
Date: Tue, 4 Jan 2022 15:39:09 +0100
Subject: [PATCH] feat(bpapi): Move to emqx

Fix standalone build
---
 apps/{emqx_bpapi => emqx}/include/bpapi.hrl       |  0
 apps/{emqx_bpapi => emqx}/priv/.gitkeep           |  0
 apps/emqx/rebar.config                            |  2 ++
 .../src => emqx/src/bpapi}/emqx_bpapi.erl         |  0
 .../src/bpapi}/emqx_bpapi_static_checks.erl       |  0
 .../src => emqx/src/bpapi}/emqx_bpapi_trans.erl   |  0
 apps/emqx/src/emqx.app.src                        |  1 -
 apps/emqx/src/proto/emqx_broker_proto_v1.erl      |  2 +-
 apps/emqx_bpapi/README.md                         |  5 -----
 apps/emqx_bpapi/src/emqx_bpapi.app.src            | 15 ---------------
 rebar.config                                      |  2 ++
 11 files changed, 5 insertions(+), 22 deletions(-)
 rename apps/{emqx_bpapi => emqx}/include/bpapi.hrl (100%)
 rename apps/{emqx_bpapi => emqx}/priv/.gitkeep (100%)
 rename apps/{emqx_bpapi/src => emqx/src/bpapi}/emqx_bpapi.erl (100%)
 rename apps/{emqx_bpapi/src => emqx/src/bpapi}/emqx_bpapi_static_checks.erl (100%)
 rename apps/{emqx_bpapi/src => emqx/src/bpapi}/emqx_bpapi_trans.erl (100%)
 delete mode 100644 apps/emqx_bpapi/README.md
 delete mode 100644 apps/emqx_bpapi/src/emqx_bpapi.app.src

diff --git a/apps/emqx_bpapi/include/bpapi.hrl b/apps/emqx/include/bpapi.hrl
similarity index 100%
rename from apps/emqx_bpapi/include/bpapi.hrl
rename to apps/emqx/include/bpapi.hrl
diff --git a/apps/emqx_bpapi/priv/.gitkeep b/apps/emqx/priv/.gitkeep
similarity index 100%
rename from apps/emqx_bpapi/priv/.gitkeep
rename to apps/emqx/priv/.gitkeep
diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config
index 4ec68d585..be8989dcd 100644
--- a/apps/emqx/rebar.config
+++ b/apps/emqx/rebar.config
@@ -4,6 +4,8 @@
 {xref_checks,[undefined_function_calls,undefined_functions,locals_not_used,
               deprecated_function_calls,warnings_as_errors,deprecated_functions]}.
 
+{erl_first_files, ["apps/emqx/src/bpapi/emqx_bpapi.erl"]}.
+
 %% Deps here may duplicate with emqx.git root level rebar.config
 %% but there not be any descrpancy.
 %% This rebar.config is necessary because the app may be used as a
diff --git a/apps/emqx_bpapi/src/emqx_bpapi.erl b/apps/emqx/src/bpapi/emqx_bpapi.erl
similarity index 100%
rename from apps/emqx_bpapi/src/emqx_bpapi.erl
rename to apps/emqx/src/bpapi/emqx_bpapi.erl
diff --git a/apps/emqx_bpapi/src/emqx_bpapi_static_checks.erl b/apps/emqx/src/bpapi/emqx_bpapi_static_checks.erl
similarity index 100%
rename from apps/emqx_bpapi/src/emqx_bpapi_static_checks.erl
rename to apps/emqx/src/bpapi/emqx_bpapi_static_checks.erl
diff --git a/apps/emqx_bpapi/src/emqx_bpapi_trans.erl b/apps/emqx/src/bpapi/emqx_bpapi_trans.erl
similarity index 100%
rename from apps/emqx_bpapi/src/emqx_bpapi_trans.erl
rename to apps/emqx/src/bpapi/emqx_bpapi_trans.erl
diff --git a/apps/emqx/src/emqx.app.src b/apps/emqx/src/emqx.app.src
index 597e1596f..0989cd7f1 100644
--- a/apps/emqx/src/emqx.app.src
+++ b/apps/emqx/src/emqx.app.src
@@ -17,7 +17,6 @@
                  , jiffy
                  , lc
                  , hocon
-                 , emqx_bpapi
                  ]},
   {mod, {emqx_app,[]}},
   {env, []},
diff --git a/apps/emqx/src/proto/emqx_broker_proto_v1.erl b/apps/emqx/src/proto/emqx_broker_proto_v1.erl
index a40884c38..178fa2f08 100644
--- a/apps/emqx/src/proto/emqx_broker_proto_v1.erl
+++ b/apps/emqx/src/proto/emqx_broker_proto_v1.erl
@@ -22,7 +22,7 @@
         , forward_async/3
         ]).
 
--include_lib("emqx_bpapi/include/bpapi.hrl").
+-include("bpapi.hrl").
 -include("emqx.hrl").
 
 -spec forward(node(), emqx_types:topic(), emqx_types:delivery()) -> emqx_types:deliver_result().
diff --git a/apps/emqx_bpapi/README.md b/apps/emqx_bpapi/README.md
deleted file mode 100644
index 78f529a4c..000000000
--- a/apps/emqx_bpapi/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-emqx_bpapi
-=====
-
-A library that helps maintaining EMQX's backplane API backward and
-forward compatibility.
diff --git a/apps/emqx_bpapi/src/emqx_bpapi.app.src b/apps/emqx_bpapi/src/emqx_bpapi.app.src
deleted file mode 100644
index 45a3efc10..000000000
--- a/apps/emqx_bpapi/src/emqx_bpapi.app.src
+++ /dev/null
@@ -1,15 +0,0 @@
-{application, emqx_bpapi,
- [{description, "A library for verifying safety of RPC calls"},
-  {vsn, "0.1.0"},
-  {registered, []},
-  {applications,
-   [kernel,
-    stdlib,
-    typerefl %% Just for some metaprogramming utils
-   ]},
-  {env,[]},
-  {modules, []},
-
-  {licenses, ["Apache 2.0"]},
-  {links, []}
- ]}.
diff --git a/rebar.config b/rebar.config
index 49e37e4af..f333d3e51 100644
--- a/rebar.config
+++ b/rebar.config
@@ -13,6 +13,8 @@
             {d, snk_kind, msg}
            ]}.
 
+{erl_first_files, ["apps/emqx/src/bpapi/emqx_bpapi.erl"]}.
+
 {xref_checks,[undefined_function_calls,undefined_functions,locals_not_used,
               deprecated_function_calls,warnings_as_errors,deprecated_functions]}.