Przeglądaj źródła

Vendor in hex_core to vendored dir

- update bootstrap script to account for hex_core in src/vendored
pull/2421/head
Bryan Paxton 4 lat temu
rodzic
commit
a37036b402
23 zmienionych plików z 22 dodań i 5 usunięć
  1. +21
    -4
      bootstrap
  2. +0
    -0
      src/vendored/r3_hex_api.erl
  3. +0
    -0
      src/vendored/r3_hex_api_key.erl
  4. +0
    -0
      src/vendored/r3_hex_api_package.erl
  5. +0
    -0
      src/vendored/r3_hex_api_package_owner.erl
  6. +0
    -0
      src/vendored/r3_hex_api_release.erl
  7. +0
    -0
      src/vendored/r3_hex_api_user.erl
  8. +0
    -0
      src/vendored/r3_hex_core.erl
  9. +0
    -0
      src/vendored/r3_hex_core.hrl
  10. +0
    -0
      src/vendored/r3_hex_erl_tar.erl
  11. +0
    -0
      src/vendored/r3_hex_erl_tar.hrl
  12. +0
    -0
      src/vendored/r3_hex_filename.erl
  13. +0
    -0
      src/vendored/r3_hex_http.erl
  14. +0
    -0
      src/vendored/r3_hex_http_httpc.erl
  15. +0
    -0
      src/vendored/r3_hex_pb_names.erl
  16. +0
    -0
      src/vendored/r3_hex_pb_package.erl
  17. +0
    -0
      src/vendored/r3_hex_pb_signed.erl
  18. +0
    -0
      src/vendored/r3_hex_pb_versions.erl
  19. +0
    -0
      src/vendored/r3_hex_registry.erl
  20. +0
    -0
      src/vendored/r3_hex_repo.erl
  21. +0
    -0
      src/vendored/r3_hex_tarball.erl
  22. +0
    -0
      src/vendored/r3_safe_erl_term.xrl
  23. +1
    -1
      vendor_hex_core.sh

+ 21
- 4
bootstrap Wyświetl plik

@ -26,10 +26,10 @@ main(_) ->
rm_rf("_build/default/lib/rebar"),
rm_rf("_build/test/lib/rebar"),
%% We fetch a few deps from hex for boostraping,
%% so we must compile r3_safe_erl_term.xrl which
%% is part of hex_core.
compile_xrl_file("src/r3_safe_erl_term.xrl"),
mkdir_p("_build/bootstrap/lib/rebar/ebin"),
os:putenv("REBAR_PROFILE", "bootstrap"),
compile_vendored(),
%% Fetch and build deps required to build rebar3
BaseDeps = [{providers, []}
@ -176,6 +176,15 @@ maybe_set_ipfamily({ok, _}, Family) ->
maybe_set_ipfamily(_, _Family) ->
ok.
compile_vendored() ->
compile_xrl_file("src/vendored/r3_safe_erl_term.xrl"),
Sources = filelib:wildcard(filename:join(["src/vendored", "*.erl"])),
Dir = filename:absname("_build/bootstrap/lib/rebar/ebin"),
code:add_patha(Dir),
Ebin = "_build/bootstrap/lib/rebar/ebin",
Opts = [debug_info,{outdir, filename:absname(Ebin)}, return | additional_defines()],
[compile_erl_file(X, Opts) || X <- Sources].
compile(App, FirstFiles) ->
Dir = filename:join(filename:absname("_build/default/lib/"), App),
filelib:ensure_dir(filename:join([Dir, "ebin", "dummy.beam"])),
@ -278,6 +287,14 @@ rm_rf(Target) ->
ok
end.
mkdir_p(Target) ->
Pred = fun (Dir, Acc) ->
NewAcc = filename:join(filename:absname(Acc), Dir),
file:make_dir(NewAcc),
NewAcc
end,
lists:foldl(Pred, "", filename:split(Target)).
-spec cp_r(list(string()), file:filename()) -> 'ok'.
cp_r([], _Dest) ->
ok;

src/r3_hex_api.erl → src/vendored/r3_hex_api.erl Wyświetl plik


src/r3_hex_api_key.erl → src/vendored/r3_hex_api_key.erl Wyświetl plik


src/r3_hex_api_package.erl → src/vendored/r3_hex_api_package.erl Wyświetl plik


src/r3_hex_api_package_owner.erl → src/vendored/r3_hex_api_package_owner.erl Wyświetl plik


src/r3_hex_api_release.erl → src/vendored/r3_hex_api_release.erl Wyświetl plik


src/r3_hex_api_user.erl → src/vendored/r3_hex_api_user.erl Wyświetl plik


src/r3_hex_core.erl → src/vendored/r3_hex_core.erl Wyświetl plik


src/r3_hex_core.hrl → src/vendored/r3_hex_core.hrl Wyświetl plik


src/r3_hex_erl_tar.erl → src/vendored/r3_hex_erl_tar.erl Wyświetl plik


src/r3_hex_erl_tar.hrl → src/vendored/r3_hex_erl_tar.hrl Wyświetl plik


src/r3_hex_filename.erl → src/vendored/r3_hex_filename.erl Wyświetl plik


src/r3_hex_http.erl → src/vendored/r3_hex_http.erl Wyświetl plik


src/r3_hex_http_httpc.erl → src/vendored/r3_hex_http_httpc.erl Wyświetl plik


src/r3_hex_pb_names.erl → src/vendored/r3_hex_pb_names.erl Wyświetl plik


src/r3_hex_pb_package.erl → src/vendored/r3_hex_pb_package.erl Wyświetl plik


src/r3_hex_pb_signed.erl → src/vendored/r3_hex_pb_signed.erl Wyświetl plik


src/r3_hex_pb_versions.erl → src/vendored/r3_hex_pb_versions.erl Wyświetl plik


src/r3_hex_registry.erl → src/vendored/r3_hex_registry.erl Wyświetl plik


src/r3_hex_repo.erl → src/vendored/r3_hex_repo.erl Wyświetl plik


src/r3_hex_tarball.erl → src/vendored/r3_hex_tarball.erl Wyświetl plik


src/r3_safe_erl_term.xrl → src/vendored/r3_safe_erl_term.xrl Wyświetl plik


+ 1
- 1
vendor_hex_core.sh Wyświetl plik

@ -7,7 +7,7 @@ if [[ -z "$1" ]]; then
fi
source_dir=$1/src
target_dir=src
target_dir=src/vendored
prefix=r3_
hex_core_version=`cat $source_dir/hex_core.hrl | grep HEX_CORE_VERSION | cut -d'"' -f2`

Ładowanie…
Anuluj
Zapisz