Automatically enforce build path for in_dependency

Author: José Valim

lib/mix/lib/mix/deps.ex

@@ -185,8 +185,10 @@ defmodule Mix.Deps do
     # This is important because the name of application in the
     # mix.exs file can be different than the actual name and we
     # choose to respect the one in the mix.exs.
-    config  = Keyword.put(config, :app_path, opts[:build])
-    env     = opts[:env] || :prod
+    config = Keyword.merge(Mix.Project.deps_config, config)
+    config = Keyword.put(config, :app_path, opts[:build])
+
+    env = opts[:env] || :prod
     old_env = Mix.env
 
     try do

lib/mix/lib/mix/deps/converger.ex

@@ -40,10 +40,9 @@ defmodule Mix.Deps.Converger do
   an updated depedency in case some processing is done.
   """
   def all(rest, callback) do
-    conf = Mix.Project.deps_config
     main = Mix.Deps.Retriever.children
     apps = Enum.map(main, &(&1.app))
-    all(main, [], [], apps, conf, callback, rest)
+    all(main, [], [], apps, callback, rest)
   end
 
   # We traverse the tree of dependencies in a breadth-
@@ -85,28 +84,28 @@ defmodule Mix.Deps.Converger do
   # Now, since `d` was specified in a parent project, no
   # exception is going to be raised since d is considered
   # to be the authorative source.
-  defp all([dep|t], acc, upper_breadths, current_breadths, config, callback, rest) do
+  defp all([dep|t], acc, upper_breadths, current_breadths, callback, rest) do
     cond do
       new_acc = overriden_deps(acc, upper_breadths, dep) ->
-        all(t, new_acc, upper_breadths, current_breadths, config, callback, rest)
+        all(t, new_acc, upper_breadths, current_breadths, callback, rest)
       new_acc = diverged_deps(acc, dep) ->
-        all(t, new_acc, upper_breadths, current_breadths, config, callback, rest)
+        all(t, new_acc, upper_breadths, current_breadths, callback, rest)
       true ->
         { dep, rest } = callback.(dep, rest)
 
         # After we invoke the callback (which may actually check out the
         # dependency), we load the dependency including its latest info
         # and children information.
-        { dep, children } = Mix.Deps.Retriever.load(dep, config)
+        { dep, children } = Mix.Deps.Retriever.load(dep)
         children = reject_non_fullfilled_optional(children, current_breadths)
         dep      = dep.deps(Enum.map(children, &(&1.app)))
 
-        { acc, rest } = all(t, [dep|acc], upper_breadths, current_breadths, config, callback, rest)
-        all(children, acc, current_breadths, dep.deps ++ current_breadths, config, callback, rest)
+        { acc, rest } = all(t, [dep|acc], upper_breadths, current_breadths, callback, rest)
+        all(children, acc, current_breadths, dep.deps ++ current_breadths, callback, rest)
     end
   end
 
-  defp all([], acc, _upper, _current, _config, _callback, rest) do
+  defp all([], acc, _upper, _current, _callback, rest) do
     { acc, rest }
   end
 

lib/mix/lib/mix/deps/retriever.ex

@@ -20,7 +20,7 @@ defmodule Mix.Deps.Retriever do
   Loads the given dependency information, including its
   latest status and children.
   """
-  def load(dep, config) do
+  def load(dep) do
     Mix.Dep[manager: manager, scm: scm, opts: opts] = dep
     dep  = dep.status(scm_status(scm, opts))
     dest = opts[:dest]
@@ -31,13 +31,13 @@ defmodule Mix.Deps.Retriever do
           { dep, [] }
 
         manager == :rebar ->
-          rebar_dep(dep, config)
+          rebar_dep(dep)
 
         mix?(dest) ->
-          mix_dep(dep.manager(:mix), config)
+          mix_dep(dep.manager(:mix))
 
         rebar?(dest) ->
-          rebar_dep(dep.manager(:rebar), config)
+          rebar_dep(dep.manager(:rebar))
 
         make?(dest) ->
           { dep.manager(:make), [] }
@@ -139,8 +139,8 @@ defmodule Mix.Deps.Retriever do
 
   ## Fetching
 
-  defp mix_dep(Mix.Dep[opts: opts] = dep, config) do
-    Mix.Deps.in_dependency(dep, config, fn _ ->
+  defp mix_dep(Mix.Dep[opts: opts] = dep) do
+    Mix.Deps.in_dependency(dep, fn _ ->
       config    = Mix.project
       umbrella? = Mix.Project.umbrella?
 
@@ -156,8 +156,8 @@ defmodule Mix.Deps.Retriever do
     end)
   end
 
-  defp rebar_dep(Mix.Dep[] = dep, config) do
-    Mix.Deps.in_dependency(dep, config, fn _ ->
+  defp rebar_dep(Mix.Dep[] = dep) do
+    Mix.Deps.in_dependency(dep, fn _ ->
       rebar = Mix.Rebar.load_config(".")
       extra = Dict.take(rebar, [:sub_dirs])
       { dep.manager(:rebar).extra(extra), rebar_children(rebar) }

lib/mix/lib/mix/deps/umbrella.ex

@@ -29,7 +29,7 @@ defmodule Mix.Deps.Umbrella do
     apps = Enum.map(deps, &(&1.app))
 
     Enum.map(deps, fn(umbrella_dep) ->
-      { umbrella_dep, deps } = Mix.Deps.Retriever.load(umbrella_dep, [])
+      { umbrella_dep, deps } = Mix.Deps.Retriever.load(umbrella_dep)
       deps = lc Mix.Dep[] = dep inlist deps,
                 Mix.Deps.available?(dep),
                 dep.app in apps,

lib/mix/lib/mix/tasks/deps.compile.ex

@@ -85,7 +85,7 @@ defmodule Mix.Tasks.Deps.Compile do
   end
 
   defp do_mix(Mix.Dep[app: app] = dep, config) do
-    Mix.Deps.in_dependency dep, config, fn _ ->
+    Mix.Deps.in_dependency dep, fn _ ->
       case dev_compilation(app, config) do
         { source, target } ->
           File.rm_rf!(target)