Skip to content

Commit d6de097

Browse files
author
José Valim
committed
Ensure Elixir own .app files include all lib modules
1 parent 19301b9 commit d6de097

File tree

2 files changed

+24
-18
lines changed

2 files changed

+24
-18
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ define APP_TEMPLATE
2020
$(1): lib/$(1)/ebin/Elixir.$(2).beam lib/$(1)/ebin/$(1).app
2121

2222
lib/$(1)/ebin/$(1).app: lib/$(1)/mix.exs
23+
$(Q) mkdir -p lib/$(1)/_build/shared/lib/$(1)
24+
$(Q) cp -R lib/$(1)/ebin lib/$(1)/_build/shared/lib/$(1)/
2325
$(Q) cd lib/$(1) && ../../bin/elixir -e "Mix.Sup.start_link()" -r mix.exs -e "Mix.Task.run('compile.app')"
2426
$(Q) cp lib/$(1)/_build/shared/lib/$(1)/ebin/$(1).app lib/$(1)/ebin/$(1).app
2527
$(Q) rm -rf lib/$(1)/_build

lib/iex/mix.exs

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,30 @@ defmodule IEx.Mixfile do
88
def application do
99
[ env: [
1010
after_spawn: [],
11-
colors: [ enabled: true,
11+
colors: colors,
12+
inspect: [limit: 50, raw: false, pretty: true],
13+
history_size: 20 ] ]
14+
end
1215

13-
# Used by default on evaluation cycle
14-
eval_interrupt: "yellow",
15-
eval_result: "yellow",
16-
eval_error: "red",
17-
eval_info: "normal",
16+
defp colors do
17+
[ enabled: true,
1818

19-
# Used by ls
20-
ls_directory: "blue",
21-
ls_device: "green",
19+
# Used by default on evaluation cycle
20+
eval_interrupt: "yellow",
21+
eval_result: "yellow",
22+
eval_error: "red",
23+
eval_info: "normal",
2224

23-
# Used by ansi docs
24-
doc_bold: "bright",
25-
doc_code: "cyan,bright",
26-
doc_headings: "yellow,bright",
27-
doc_inline_code: "cyan",
28-
doc_underline: "underline",
29-
doc_title: "reverse,yellow,bright" ],
30-
inspect: [limit: 50, raw: false, pretty: true],
31-
history_size: 20 ] ]
25+
# Used by ls
26+
ls_directory: "blue",
27+
ls_device: "green",
28+
29+
# Used by ansi docs
30+
doc_bold: "bright",
31+
doc_code: "cyan,bright",
32+
doc_headings: "yellow,bright",
33+
doc_inline_code: "cyan",
34+
doc_underline: "underline",
35+
doc_title: "reverse,yellow,bright" ]
3236
end
3337
end

0 commit comments

Comments
 (0)