Bladeren bron

Merge pull request #1692 from ferd/fix-bootstrap-repeat

Fix repeated bootstrap runs
pull/1696/head
Fred Hebert 7 jaren geleden
committed by GitHub
bovenliggende
commit
c67fe9742f
Geen bekende sleutel gevonden voor deze handtekening in de database GPG sleutel-ID: 4AEE18F83AFDEB23
1 gewijzigde bestanden met toevoegingen van 4 en 3 verwijderingen
  1. +4
    -3
      bootstrap

+ 4
- 3
bootstrap Bestand weergeven

@ -168,8 +168,9 @@ compile_file(File, Opts) ->
bootstrap_rebar3() ->
filelib:ensure_dir("_build/default/lib/rebar/ebin/dummy.beam"),
code:add_path("_build/default/lib/rebar/ebin/"),
ok = symlink_or_copy(filename:absname("src"),
filename:absname("_build/default/lib/rebar/src")),
Res = symlink_or_copy(filename:absname("src"),
filename:absname("_build/default/lib/rebar/src")),
true = Res == ok orelse Res == exists,
Sources = ["src/rebar_resource.erl" | filelib:wildcard("src/*.erl")],
[compile_file(X, [{outdir, "_build/default/lib/rebar/ebin/"}
,return | additional_defines()]) || X <- Sources],
@ -648,4 +649,4 @@ join([H|T], Sep) ->
chr(S, C) when is_integer(C) -> chr(S, C, 1).
chr([C|_Cs], C, I) -> I;
chr([_|Cs], C, I) -> chr(Cs, C, I+1);
chr([], _C, _I) -> 0.
chr([], _C, _I) -> 0.

Laden…
Annuleren
Opslaan