diff options
author | Ulf Wiger <ulf@wiger.net> | 2016-02-24 23:04:36 +0100 |
---|---|---|
committer | Ulf Wiger <ulf@wiger.net> | 2016-02-24 23:04:36 +0100 |
commit | 2f7d12a5b7843228052e9b9ed3919733652a5f89 (patch) | |
tree | f3ce8b8344ab37106dc104662592cab3057b08f1 /deps/setup/src/setup_gen.erl | |
parent | cb97583d4a105667cc2d2b590f0e6351e94f7d2e (diff) | |
parent | 86618c1bed88a4057daa971cbe8a84afecd8b57a (diff) | |
download | rvi_core-2f7d12a5b7843228052e9b9ed3919733652a5f89.tar.gz |
Merge pull request #87 from uwiger/uw-0_5_0
Uw 0 5 0
Diffstat (limited to 'deps/setup/src/setup_gen.erl')
-rw-r--r-- | deps/setup/src/setup_gen.erl | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/deps/setup/src/setup_gen.erl b/deps/setup/src/setup_gen.erl index 7a74107..9f95030 100644 --- a/deps/setup/src/setup_gen.erl +++ b/deps/setup/src/setup_gen.erl @@ -83,7 +83,10 @@ help() -> %% option. %% * `{remove_apps, Apps}' - Remove `Apps' from the list of applications. %% * `{sort_app, App, Before}' - Change the sort order so that `App' comes -%% before `Before'. +%% before `Before'. `Before' can be either an application +%% name or a list of names. In the latter case, `App' +%% is inserted before either of the applications in +%% the list, whichever comes first. %% * `{include, ConfigFile}' - include options from the given file. The file %% is processed using `file:script/2'. %% * `{include_lib, ConfigFile}' - As above, but ConfigFile is named as with @@ -600,7 +603,8 @@ sort_apps(Options, Apps) -> lists:foldl(fun({sort_app, A, Before}, Acc) -> case is_in_set(A, Acc) of {true, App} -> - insert_before(Acc -- [App], App, Before); + insert_before(Acc -- [App], App, + mk_set(Before)); false -> abort("Cannot re-sort ~p - not found~n", [A]) end; @@ -636,6 +640,12 @@ del_from_set(As, Set) -> end end, Set, As). +%% ensure that this is a 'set' (well, at least a list) +mk_set(Set) when is_list(Set) -> + Set; +mk_set(Entry) -> + [Entry]. + is_in_set(Entry, Set) -> A = if is_tuple(Entry) -> element(1, Entry); is_atom(Entry) -> Entry |