diff options
author | Rin Kuryloski <kuryloskip@vmware.com> | 2023-01-11 14:42:56 +0100 |
---|---|---|
committer | Rin Kuryloski <kuryloskip@vmware.com> | 2023-01-17 17:08:09 +0100 |
commit | 2cd020a0da84702e23893d0d9a7bdccbc3f37702 (patch) | |
tree | 41994da538cc007d9d3128cbff6668e738e403fd /bazel | |
parent | c6f38702b505f7466c2f8c60aa13a873d975b4d6 (diff) | |
download | rabbitmq-server-git-2cd020a0da84702e23893d0d9a7bdccbc3f37702.tar.gz |
rules_erlang 3.9.0 compatibility
the elixir toolchain uses some private apis, and needed updating to
match internal changes in rules_erlang
Diffstat (limited to 'bazel')
-rw-r--r-- | bazel/elixir/elixir_toolchain.bzl | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/bazel/elixir/elixir_toolchain.bzl b/bazel/elixir/elixir_toolchain.bzl index 1274bfcaaf..e96e56c5f7 100644 --- a/bazel/elixir/elixir_toolchain.bzl +++ b/bazel/elixir/elixir_toolchain.bzl @@ -30,16 +30,16 @@ def _build_info(ctx): def erlang_dirs(ctx): info = _build_info(ctx) - if info.release_dir != None: + if info.release_dir_tar != None: runfiles = ctx.runfiles([ - info.release_dir, + info.release_dir_tar, info.version_file, ]) else: runfiles = ctx.runfiles([ info.version_file, ]) - return (info.erlang_home, info.release_dir, runfiles) + return (info.erlang_home, info.release_dir_tar, runfiles) def elixir_dirs(ctx, short_path = False): info = ctx.toolchains[":toolchain_type"].elixirinfo @@ -51,15 +51,14 @@ def elixir_dirs(ctx, short_path = False): def maybe_install_erlang(ctx, short_path = False): info = _build_info(ctx) - release_dir = info.release_dir - if release_dir == None: + release_dir_tar = info.release_dir_tar + if release_dir_tar == None: return "" else: - return """mkdir -p $(dirname "{erlang_home}") -cp -r {erlang_release_dir} "{erlang_home}" -ERTS_DIRNAME="$(basename "$(echo "{erlang_home}"/erts-*)")" -ln -sf ../$ERTS_DIRNAME/bin/epmd "{erlang_home}"/bin/epmd -""".format( - erlang_release_dir = release_dir.short_path if short_path else release_dir.path, + return """\ +tar --extract \\ + --directory / \\ + --file {release_tar}""".format( + release_tar = release_dir_tar.short_path if short_path else release_dir_tar.path, erlang_home = info.erlang_home, ) |