From: Mikael Magnusson <[email protected]> Adopt sin_shell:send_path to the change in format of the tuples in project.apps.
Signed-off-by: Mikael Magnusson <[email protected]> --- server/sinan/src/sin_shell.erl | 24 +++++++++--------------- 1 files changed, 9 insertions(+), 15 deletions(-) diff --git a/server/sinan/src/sin_shell.erl b/server/sinan/src/sin_shell.erl index b2b24ab..a2e7153 100644 --- a/server/sinan/src/sin_shell.erl +++ b/server/sinan/src/sin_shell.erl @@ -98,10 +98,8 @@ shell(BuildRef) -> %% @end %%-------------------------------------------------------------------- make_shell(BuildRef, ProjectApps, ProjectRepoApps, Repo) -> - BuildDir = sin_build_config:get_value(BuildRef, "build.dir"), - AppDir = filename:join([BuildDir, "apps"]), - send_paths(BuildRef, AppDir, ProjectApps), - send_paths(BuildRef, Repo, ProjectRepoApps). + send_paths(BuildRef, ProjectApps), + send_paths(BuildRef, ProjectRepoApps). %%-------------------------------------------------------------------- @@ -110,23 +108,20 @@ make_shell(BuildRef, ProjectApps, ProjectRepoApps, Repo) -> %% @spec (BuildRef, AppDir, DirList) -> Paths %% @end %%-------------------------------------------------------------------- -send_paths(BuildRef, RepoDir, [{AppName, Vsn, _} | T]) -> - send_path(BuildRef, RepoDir, AppName, Vsn), - send_paths(BuildRef, RepoDir, T); -send_paths(BuildRef, RepoDir, [{AppName, Vsn} | T]) -> - send_path(BuildRef, RepoDir, AppName, Vsn), - send_paths(BuildRef, RepoDir, T); -send_paths(_, _, []) -> +send_paths(BuildRef, [{AppName, _Vsn, _Deps, AppPath} | T]) -> + send_path(BuildRef, AppName, AppPath), + send_paths(BuildRef, T); +send_paths(_, []) -> ok. %%-------------------------------------------------------------------- %% @doc %% Send out the requisite events for a specific piece of the %% application. -%% @spec (BuildRef, RepoDir, AppName, Vsn) -> ok +%% @spec (BuildRef, AppName, AppPath) -> ok %% @end %%-------------------------------------------------------------------- -send_path(BuildRef, RepoDir, AppName, Vsn) -> +send_path(BuildRef, AppName, AppPath) -> NAppName = case is_atom(AppName) of true -> atom_to_list(AppName); @@ -134,8 +129,7 @@ send_path(BuildRef, RepoDir, AppName, Vsn) -> AppName end, eta_event:task_event(BuildRef, ?TASK, app_name, NAppName), - DirName = lists:flatten([NAppName, "-", Vsn]), - Path = filename:join([RepoDir, DirName, "ebin"]), + Path = filename:join([AppPath, "ebin"]), eta_event:task_event(BuildRef, ?TASK, app_path, Path). %%==================================================================== -- 1.5.6.3 --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "erlware-dev" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/erlware-dev?hl=en -~----------~----~----~----~------~----~------~--~---
