From 63c3afbfce41bc1f1e806790d96c56172ec0183d Mon Sep 17 00:00:00 2001 From: Simon Unge Date: Mon, 7 Oct 2024 20:23:50 +0000 Subject: [PATCH] Dependency Recon updated from 2.5.3 to 2.5.6 (cherry picked from commit 7702a92865c1f62c4a6174ea40d1661095a372fe) (cherry picked from commit 7c816a416c38f987021b5542470cc3d118bb4a00) --- MODULE.bazel | 4 ++-- bazel/BUILD.recon | 38 ++++++++++++++++---------------------- rabbitmq-components.mk | 2 +- 3 files changed, 19 insertions(+), 25 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 785d7a22b3c0..8cb119489a18 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -284,8 +284,8 @@ erlang_package.hex_package( erlang_package.hex_package( name = "recon", build_file = "@rabbitmq-server//bazel:BUILD.recon", - sha256 = "6c6683f46fd4a1dfd98404b9f78dcabc7fcd8826613a89dcb984727a8c3099d7", - version = "2.5.3", + sha256 = "96c6799792d735cc0f0fd0f86267e9d351e63339cbe03df9d162010cefc26bb0", + version = "2.5.6", ) erlang_package.hex_package( diff --git a/bazel/BUILD.recon b/bazel/BUILD.recon index 9a2eb6cc8baa..35d78a04b4de 100644 --- a/bazel/BUILD.recon +++ b/bazel/BUILD.recon @@ -25,17 +25,9 @@ erlang_bytecode( "src/recon_rec.erl", "src/recon_trace.erl", ], - outs = [ - "ebin/recon.beam", - "ebin/recon_alloc.beam", - "ebin/recon_lib.beam", - "ebin/recon_map.beam", - "ebin/recon_rec.beam", - "ebin/recon_trace.beam", - ], - hdrs = [], + hdrs = [":public_and_private_hdrs"], app_name = "recon", - beam = [], + dest = "ebin", erlc_opts = "//:erlc_opts", ) @@ -57,20 +49,11 @@ filegroup( ], ) -filegroup( - name = "private_hdrs", - srcs = [], -) +filegroup(name = "private_hdrs") -filegroup( - name = "public_hdrs", - srcs = [], -) +filegroup(name = "public_hdrs") -filegroup( - name = "priv", - srcs = [], -) +filegroup(name = "priv") filegroup( name = "licenses", @@ -96,8 +79,12 @@ filegroup( erlang_app( name = "erlang_app", srcs = [":all_srcs"], + hdrs = [":public_hdrs"], app_name = "recon", beam_files = [":beam_files"], + extra_apps = ["syntax_tools"], + license_files = [":license_files"], + priv = [":priv"], ) alias( @@ -105,3 +92,10 @@ alias( actual = ":erlang_app", visibility = ["//visibility:public"], ) + +filegroup( + name = "license_files", + srcs = [ + "LICENSE", + ], +) diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index 4ba74e55668c..68254e4fb8e0 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -125,7 +125,7 @@ dep_looking_glass = git https://github.com/rabbitmq/looking_glass.git main dep_prometheus = hex 4.11.0 dep_ra = hex 2.13.5 dep_ranch = hex 2.1.0 -dep_recon = hex 2.5.3 +dep_recon = hex 2.5.6 dep_redbug = hex 2.0.7 dep_thoas = hex 1.0.0 dep_observer_cli = hex 1.7.5