Merge pull request #1408 from meh/mix-leex-yecc

Delete files in the manifest instead of removing the loadpath

Author: José Valim

lib/mix/lib/mix/tasks/compile.elixir.ex

@@ -103,17 +103,19 @@ defmodule Mix.Tasks.Compile.Elixir do
   end
 
   defp compile_files(false, project, compile_path, to_compile, _stale, opts) do
-    Code.delete_path compile_path
+    Mix.Utils.read_manifest Path.join(compile_path, @manifest), fn file ->
+      Path.join(compile_path, file) <> ".beam" |> File.rm
+    end
+
     set_compiler_opts(project, opts, [])
 
     { _current, to_remove } =
-      Mix.Utils.manifest Path.join(compile_path, @manifest), fn ->
+      Mix.Utils.update_manifest Path.join(compile_path, @manifest), fn ->
         compiled = compile_files to_compile, compile_path
         lc { mod, _ } inlist compiled, do: atom_to_binary(mod)
       end
 
     lc f inlist to_remove, do: File.rm(Path.join(compile_path, f) <> ".beam")
-    Code.prepend_path compile_path
   end
 
   defp set_compiler_opts(project, opts, extra) do

lib/mix/lib/mix/utils.ex

@@ -105,14 +105,25 @@ defmodule Mix.Utils do
     end
   end
 
+  @doc """
+  Read the manifest.
+  """
+  def read_manifest(file, fun) do
+    if File.exists?(file) do
+      Enum.each File.stream!(file), fn file ->
+        fun.(String.rstrip(file, ?\n))
+      end
+    end
+  end
+
   @doc """
   Generates a manifest containing all files generated
   during a given compilation step. It receives the manifest
   file name and a function to execute. The result of the
   function is compared to the manifest in order do detect
   the files removed from the manifest file.
   """
-  def manifest(file, fun) do
+  def update_manifest(file, fun) do
     old =
       case File.read(file) do
         { :ok, contents } -> String.split(contents, "\n")