Skip to content

Commit b6b99ea

Browse files
author
José Valim
committed
Mark escript.build and archive.build as recursive, closes #8393
1 parent bb5a666 commit b6b99ea

File tree

3 files changed

+2
-17
lines changed

3 files changed

+2
-17
lines changed

lib/mix/lib/mix/tasks/archive.build.ex

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ defmodule Mix.Tasks.Archive.Build do
22
use Mix.Task
33

44
@shortdoc "Archives this project into a .ez file"
5+
@recursive true
56

67
@moduledoc """
78
Builds an archive according to the specification of the

lib/mix/lib/mix/tasks/escript.build.ex

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ defmodule Mix.Tasks.Escript.Build do
33
use Bitwise, only_operators: true
44

55
@shortdoc "Builds an escript for the project"
6+
@recursive true
67

78
@moduledoc ~S"""
89
Builds an escript for the project.
@@ -133,11 +134,6 @@ defmodule Mix.Tasks.Escript.Build do
133134

134135
defp escriptize(project, language) do
135136
escript_opts = project[:escript] || []
136-
137-
if Mix.Project.umbrella?() do
138-
Mix.raise("Building escripts for umbrella projects is unsupported")
139-
end
140-
141137
script_name = Mix.Local.name_for(:escript, project)
142138
filename = escript_opts[:path] || script_name
143139
main = escript_opts[:main_module]

lib/mix/test/mix/tasks/escript_test.exs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -212,18 +212,6 @@ defmodule Mix.Tasks.EscriptTest do
212212
purge([Ok.MixProject])
213213
end
214214

215-
test "generating escript for umbrella projects fails with a nice error" do
216-
message = "Building escripts for umbrella projects is unsupported"
217-
218-
in_fixture("umbrella_dep/deps/umbrella", fn ->
219-
Mix.Project.in_project(:umbrella, ".", fn _ ->
220-
assert_raise Mix.Error, message, fn ->
221-
Mix.Tasks.Escript.Build.run([])
222-
end
223-
end)
224-
end)
225-
end
226-
227215
test "generate escript with consolidated protocols" do
228216
Mix.Project.push(EscriptConsolidated)
229217

0 commit comments

Comments
 (0)