More improvements

Author: lhoguin

deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/csv.ex

@@ -96,7 +96,7 @@ end
 
 # Elixir 1.15 compiler optimizations require that we explicitly
 # add the csv code path
-true = Code.append_path(Path.join(["_build", Atom.to_string(Mix.env()), "lib", "csv", "ebin"]))
+true = Code.append_path(Path.join(["..", "csv", "ebin"]))
 
 defimpl CSV.Encode, for: PID do
   def encode(pid, env \\ []) do

deps/rabbitmq_cli/lib/rabbitmqctl.ex

@@ -25,15 +25,20 @@ defmodule RabbitMQCtl do
   @type command_result() :: {:error, ExitCodes.exit_code(), term()} | term()
 
   @spec main(list()) :: no_return()
-  def main(["--auto-complete" | []]) do
+  def main(cmd0) do
+    cmd = Enum.map(cmd0, fn val -> :erlang.list_to_binary(val) end)
+    main1(cmd)
+  end
+
+  def main1(["--auto-complete" | []]) do
     # silence Erlang/OTP's standard library warnings, it's acceptable for CLI tools,
     # see rabbitmq/rabbitmq-server#8912
     _ = :logger.set_primary_config(:level, :error)
 
     handle_shutdown(:ok)
   end
 
-  def main(unparsed_command) do
+  def main1(unparsed_command) do
     # silence Erlang/OTP's standard library warnings, it's acceptable for CLI tools,
     # see rabbitmq/rabbitmq-server#8912
     {:ok, _} = :application.ensure_all_started(:rabbitmqctl)

deps/rabbitmq_ct_helpers/src/rabbit_ct_helpers.erl

@@ -341,7 +341,7 @@ maybe_rabbit_srcdir(Config) ->
 ensure_application_srcdir(Config, App, Module) ->
     ensure_application_srcdir(Config, App, erlang, Module).
 
-ensure_application_srcdir(Config, App, Lang, Module) ->
+ensure_application_srcdir(Config, App, _Lang, Module) ->
     AppS = atom_to_list(App),
     Key = list_to_atom(AppS ++ "_srcdir"),
     SecondaryKey = list_to_atom("secondary_" ++ AppS ++ "_srcdir"),
@@ -350,18 +350,10 @@ ensure_application_srcdir(Config, App, Lang, Module) ->
             case code:which(Module) of
                 non_existing ->
                     filename:join(?config(erlang_mk_depsdir, Config), AppS);
-                P when Lang =:= erlang ->
+                P ->
                     %% P is $SRCDIR/ebin/$MODULE.beam.
                     filename:dirname(
-                      filename:dirname(P));
-                P when Lang =:= elixir ->
-                    %% P is $SRCDIR/_build/$MIX_ENV/lib/$APP/ebin/$MODULE.beam.
-                    filename:dirname(
-                      filename:dirname(
-                        filename:dirname(
-                          filename:dirname(
-                            filename:dirname(
-                              filename:dirname(P))))))
+                      filename:dirname(P))
             end;
         P ->
             P
@@ -499,9 +491,8 @@ new_script_location(Config, Script) ->
 
 ensure_rabbitmqctl_app(Config) ->
     SrcDir = ?config(rabbitmq_cli_srcdir, Config),
-    MixEnv = os:getenv("MIX_ENV", "dev"),
     EbinDir = filename:join(
-      [SrcDir, "_build", MixEnv, "lib", "rabbitmqctl", "ebin"]),
+      [SrcDir, "ebin"]),
     case filelib:is_file(filename:join(EbinDir, "rabbitmqctl.app")) of
         true ->
             true = code:add_path(EbinDir),
@@ -512,11 +503,11 @@ ensure_rabbitmqctl_app(Config) ->
                     Config;
                 {error, _} ->
                     {skip, "Access to rabbitmq_cli ebin dir. required, " ++
-                     "please build rabbitmq_cli and set MIX_ENV"}
+                     "please build rabbitmq_cli"}
             end;
         false ->
             {skip, "Access to rabbitmq_cli ebin dir. required, " ++
-             "please build rabbitmq_cli and set MIX_ENV"}
+             "please build rabbitmq_cli"}
     end.
 
 load_rabbitmqctl_app(Config) ->

erlang.mk

@@ -17,7 +17,7 @@
 ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST)))
 export ERLANG_MK_FILENAME
 
-ERLANG_MK_VERSION = 2022.05.31-150-g91e552d-dirty
+ERLANG_MK_VERSION = 2022.05.31-151-gef04797-dirty
 ERLANG_MK_WITHOUT = 
 
 # Make 3.81 and 3.82 are deprecated.
@@ -1504,7 +1504,7 @@ app:: $(if $(wildcard ebin/test),beam-cache-restore-app) deps
 	$(verbose) $(MAKE) --no-print-directory $(PROJECT).d
 	$(verbose) $(MAKE) --no-print-directory app-build
 
-PROJECT_MOD := $(if $(PROJECT_MOD),$(PROJECT_MOD),$(if $(wildcard src/$(PROJECT_MOD)_app.erl),$(PROJECT_MOD)_app))
+PROJECT_MOD := $(if $(PROJECT_MOD),$(PROJECT_MOD),$(if $(wildcard src/$(PROJECT)_app.erl),$(PROJECT)_app))
 
 define app_file
 {application, '$(PROJECT)', [