summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas O'Dowd <tpodowd@cloudian.com>2016-12-20 17:03:37 +0900
committerFred Hebert <mononcqc@ferd.ca>2017-05-11 06:23:08 -0400
commita1f47427093daa060ab510e099de3947430bdb8d (patch)
treede6e47c080bb3082dd4d5a523ab21e22b60e7b05 /src
parentcc6afb716a072a9cc7d07444ae4b956a35584f28 (diff)
Issue #1416: Merge erl_files_first separately and avoid sorting.
The order of the files listed in "erl_files_first" option is important and should not be sorted. By handling the merge similarly to mib_files_first, the sort order is preserved.
Diffstat (limited to 'src')
-rw-r--r--src/rebar_opts.erl4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/rebar_opts.erl b/src/rebar_opts.erl
index 444b760..589dbb8 100644
--- a/src/rebar_opts.erl
+++ b/src/rebar_opts.erl
@@ -118,6 +118,10 @@ merge_opt({plugins, _}, NewValue, _OldValue) ->
NewValue;
merge_opt(profiles, NewValue, OldValue) ->
dict:to_list(merge_opts(dict:from_list(NewValue), dict:from_list(OldValue)));
+merge_opt(erl_first_files, Value, Value) ->
+ Value;
+merge_opt(erl_first_files, NewValue, OldValue) ->
+ OldValue ++ NewValue;
merge_opt(mib_first_files, Value, Value) ->
Value;
merge_opt(mib_first_files, NewValue, OldValue) ->