Build .beam location from scratch on mix compile.elixir

Signed-off-by: José Valim <[email protected]>

Author: José Valim

lib/mix/lib/mix/compilers/elixir.ex

@@ -15,7 +15,7 @@ defmodule Mix.Compilers.Elixir do
   """
   def compile(manifest, srcs, skip, exts, dest, force, on_start) do
     all = Mix.Utils.extract_files(srcs -- skip, exts)
-    {all_entries, skip_entries} = read_manifest(manifest, skip)
+    {all_entries, skip_entries} = read_manifest(manifest, dest, skip)
 
     removed =
       for {_b, _m, source, _d, _f, _bin} <- all_entries, not(source in all), do: source
@@ -181,28 +181,32 @@ defmodule Mix.Compilers.Elixir do
 
   # Reads the manifest returning the results as tuples.
   # The beam files are read, removed and stored in memory.
-  defp read_manifest(manifest, skip_paths) do
+  defp read_manifest(manifest, dest, skip_paths) do
     initial = {[], []}
 
     case File.read(manifest) do
       {:ok, contents} ->
         skip_paths = Enum.map(skip_paths, &(&1 <> "/"))
         Enum.reduce String.split(contents, "\n"), initial, fn x, acc ->
-          read_manifest_entry(String.split(x, "\t"), acc, skip_paths)
+          read_manifest_entry(String.split(x, "\t"), acc, dest, skip_paths)
         end
       {:error, _} ->
         initial
     end
   end
 
-  defp read_manifest_entry([beam, module, source|deps], {keep, skip}, skip_paths) do
+  defp read_manifest_entry([_beam, module, source|deps], {keep, skip}, dest, skip_paths) do
     {deps, files} =
       case Enum.split_while(deps, &(&1 != "Elixir")) do
         {deps, ["Elixir"|files]} -> {deps, files}
         {deps, _} -> {deps, []}
       end
 
-    entry = {beam, module, source, deps, files, nil}
+    # TODO: Notice we do not use beam from the file.
+    # Once Elixir v1.1 is out, we can start writing "1"
+    # instead of the beam file in write_manifest/2.
+    entry = {Path.join(dest, module <> ".beam"), module, source,
+             deps, files, nil}
 
     if String.starts_with?(source, skip_paths) do
       {keep, [entry|skip]}
@@ -211,7 +215,7 @@ defmodule Mix.Compilers.Elixir do
     end
   end
 
-  defp read_manifest_entry(_, acc, _skip_paths) do
+  defp read_manifest_entry(_, acc, _dest, _skip_paths) do
     acc
   end
 

lib/mix/test/mix/tasks/compile.elixir_test.exs

@@ -65,8 +65,7 @@ defmodule Mix.Tasks.Compile.ElixirTest do
       assert Mix.Tasks.Compile.Elixir.run([]) == :ok
       refute File.regular?("_build/dev/lib/sample/ebin/Elixir.A.beam")
       refute Code.ensure_loaded?(A)
-      refute String.contains?(File.read!("_build/dev/lib/sample/.compile.elixir"),
-                              "Elixir.A.beam")
+      refute String.contains?(File.read!("_build/dev/lib/sample/.compile.elixir"), "Elixir.A")
     end
   end