diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | rebar.config | 5 | ||||
| -rw-r--r-- | src/rebar_app_utils.erl | 2 | ||||
| -rw-r--r-- | src/rebar_prv_deps_tree.erl | 9 | ||||
| -rw-r--r-- | src/rebar_prv_local_install.erl | 2 |
5 files changed, 12 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index a4d4498..f2c3b91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ before_deploy: "rm -rf !(rebar3)" deploy: on: branch: master - condition: $TRAVIS_OTP_RELEASE = R15B03 + condition: $TRAVIS_OTP_RELEASE = R16B03-1 provider: s3 access_key_id: AKIAJAPYAQEFYCYSNL7Q secret_access_key: diff --git a/rebar.config b/rebar.config index 419a5f0..5d41406 100644 --- a/rebar.config +++ b/rebar.config @@ -12,9 +12,8 @@ {escript_emu_args, "%%! +sbtu +A0\n"}. %% escript_incl_extra is for internal rebar-private use only. %% Do not use outside rebar. Config interface is not stable. -{escript_incl_extra, [{"_build/default/lib/relx/priv/templates/*", "."}, - {"priv/templates/*", "."}, - {"rebar/include/*", "."}]}. +{escript_incl_extra, [{"relx/priv/templates/*", "_build/default/lib/"}, + {"rebar/priv/templates/*", "_build/default/lib/"}]}. {erl_opts, [{platform_define, "^[0-9]+", namespaced_types}, no_debug_info, diff --git a/src/rebar_app_utils.erl b/src/rebar_app_utils.erl index de13020..602fd42 100644 --- a/src/rebar_app_utils.erl +++ b/src/rebar_app_utils.erl @@ -149,7 +149,7 @@ dep_to_app(Parent, DepsDir, Name, Vsn, Source, IsLock, State) -> CheckoutsDir = ec_cnv:to_list(rebar_dir:checkouts_dir(State, Name)), AppInfo = case rebar_app_info:discover(CheckoutsDir) of {ok, App} -> - rebar_app_info:is_checkout(App, true); + rebar_app_info:source(rebar_app_info:is_checkout(App, true), checkout); not_found -> Dir = ec_cnv:to_list(filename:join(DepsDir, Name)), {ok, AppInfo0} = diff --git a/src/rebar_prv_deps_tree.erl b/src/rebar_prv_deps_tree.erl index 5986521..04c4837 100644 --- a/src/rebar_prv_deps_tree.erl +++ b/src/rebar_prv_deps_tree.erl @@ -39,15 +39,18 @@ format_error(Reason) -> %% Internal functions print_deps_tree(SrcDeps, Verbose, State) -> + Resources = rebar_state:resources(State), D = lists:foldl(fun(App, Dict) -> Name = rebar_app_info:name(App), Vsn = rebar_app_info:original_vsn(App), + AppDir = rebar_app_info:dir(App), + Vsn1 = rebar_utils:vcs_vsn(Vsn, AppDir, Resources), Source = rebar_app_info:source(App), Parent = rebar_app_info:parent(App), - dict:append_list(Parent, [{Name, Vsn, Source}], Dict) + dict:append_list(Parent, [{Name, Vsn1, Source}], Dict) end, dict:new(), SrcDeps), ProjectAppNames = [{rebar_app_info:name(App) - ,rebar_app_info:original_vsn(App) + ,rebar_utils:vcs_vsn(rebar_app_info:original_vsn(App), rebar_app_info:dir(App), Resources) ,project} || App <- rebar_state:project_apps(State)], io:setopts([{encoding, unicode}]), case dict:find(root, D) of @@ -80,6 +83,8 @@ print_children(Prefix, [{Name, Vsn, Source} | Rest], Dict, Verbose) -> type(project, _) -> "project app"; +type(checkout, _) -> + "checkout app"; type(Source, Verbose) when is_tuple(Source) -> case {element(1, Source), Verbose} of {pkg, _} -> diff --git a/src/rebar_prv_local_install.erl b/src/rebar_prv_local_install.erl index 4422c2d..bf536d0 100644 --- a/src/rebar_prv_local_install.erl +++ b/src/rebar_prv_local_install.erl @@ -61,7 +61,7 @@ bin_contents(OutputDir) -> <<" #!/usr/bin/env sh -erl -pa ", (ec_cnv:to_binary(OutputDir))/binary,"/*/ebin +sbtu +A0 -noinput -boot start_clean -s rebar3 main -extra \"$@\" +erl -pa ", (ec_cnv:to_binary(OutputDir))/binary,"/*/ebin +sbtu +A0 -noshell -boot start_clean -s rebar3 main -extra \"$@\" ">>. extract_escript(State, ScriptPath) -> |