Rename _build to _build/shared

José Valim · José Valim · commit 7614b6c1d0e0 · 2013-11-12T09:57:01.000+01:00
diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ $(1): lib/$(1)/ebin/Elixir.$(2).beam lib/$(1)/ebin/$(1).app
 
 lib/$(1)/ebin/$(1).app: lib/$(1)/mix.exs
 	$(Q) cd lib/$(1) && ../../bin/elixir -e "Mix.Sup.start_link()" -r mix.exs -e "Mix.Task.run('compile.app')"
-	$(Q) cp lib/$(1)/_build/lib/$(1)/ebin/$(1).app lib/$(1)/ebin/$(1).app
+	$(Q) cp lib/$(1)/_build/shared/lib/$(1)/ebin/$(1).app lib/$(1)/ebin/$(1).app
 	$(Q) rm -rf lib/$(1)/_build
 
 lib/$(1)/ebin/Elixir.$(2).beam: $(wildcard lib/$(1)/lib/*.ex) $(wildcard lib/$(1)/lib/*/*.ex) $(wildcard lib/$(1)/lib/*/*/*.ex)
diff --git a/lib/mix/lib/mix/project.ex b/lib/mix/lib/mix/project.ex
@@ -184,11 +184,11 @@ defmodule Mix.Project do
   ## Examples
 
       Mix.Project.build_path
-      #=> "/path/to/project/_build"
+      #=> "/path/to/project/_build/shared"
 
   """
   def build_path(config // config()) do
-    config[:build_path] || Path.expand("_build")
+    config[:build_path] || Path.expand("_build/shared")
   end
 
   @doc """
@@ -201,7 +201,7 @@ defmodule Mix.Project do
   ## Examples
 
       Mix.Project.manifest_path
-      #=> "/path/to/project/_build/lib/app"
+      #=> "/path/to/project/_build/shared/lib/app"
 
   """
   def manifest_path(config // config()) do
@@ -215,7 +215,7 @@ defmodule Mix.Project do
   ## Examples
 
       Mix.Project.app_path
-      #=> "/path/to/project/_build/lib/app"
+      #=> "/path/to/project/_build/shared/lib/app"
 
   """
   def app_path(config // config()) do
@@ -235,7 +235,7 @@ defmodule Mix.Project do
   ## Examples
 
       Mix.Project.compile_path
-      #=> "/path/to/project/_build/lib/app/priv"
+      #=> "/path/to/project/_build/shared/lib/app/priv"
 
   """
   def compile_path(config // config()) do
diff --git a/lib/mix/test/fixtures/deps_status/_build/shared/lib/invalidapp/ebin/invalidapp.app b/lib/mix/test/fixtures/deps_status/_build/shared/lib/invalidapp/ebin/invalidapp.app
diff --git a/lib/mix/test/fixtures/deps_status/_build/shared/lib/invalidvsn/ebin/invalidvsn.app b/lib/mix/test/fixtures/deps_status/_build/shared/lib/invalidvsn/ebin/invalidvsn.app
diff --git a/lib/mix/test/fixtures/deps_status/_build/shared/lib/ok/ebin/ok.app b/lib/mix/test/fixtures/deps_status/_build/shared/lib/ok/ebin/ok.app
diff --git a/lib/mix/test/fixtures/rebar_dep/apps/rebar_dep/ebin/rebar_dep.app b/lib/mix/test/fixtures/rebar_dep/apps/rebar_dep/ebin/rebar_dep.app
@@ -0,0 +1 @@
+{application,rebar_dep,[{registered,[]},{vsn,"0.1.0"},{modules,[rebar_dep]}]}.
diff --git a/lib/mix/test/fixtures/rebar_dep/apps/rebar_dep/ebin/rebar_dep.beam b/lib/mix/test/fixtures/rebar_dep/apps/rebar_dep/ebin/rebar_dep.beam
diff --git a/lib/mix/test/fixtures/rebar_dep/apps/rebar_dep/rebar.config b/lib/mix/test/fixtures/rebar_dep/apps/rebar_dep/rebar.config
@@ -0,0 +1 @@
+{ sub_dirs, ["from_apps_another"] }.
diff --git a/lib/mix/test/fixtures/rebar_dep/apps/rebar_dep/src/rebar_dep.app.src b/lib/mix/test/fixtures/rebar_dep/apps/rebar_dep/src/rebar_dep.app.src
@@ -0,0 +1,4 @@
+{application, rebar_dep,
+  [
+    {vsn, "0.1.0"}
+  ]}.
diff --git a/lib/mix/test/fixtures/rebar_dep/apps/rebar_dep/src/rebar_dep.erl b/lib/mix/test/fixtures/rebar_dep/apps/rebar_dep/src/rebar_dep.erl
@@ -0,0 +1,6 @@
+-module(rebar_dep).
+
+-export ([any_function/0]).
+
+any_function() ->
+    ok.
diff --git a/lib/mix/test/mix/cli_test.exs b/lib/mix/test/mix/cli_test.exs
@@ -25,7 +25,7 @@ defmodule Mix.CLITest do
       end
       """
       output = mix ""
-      assert File.regular?("_build/lib/p/ebin/Elixir.A.beam")
+      assert File.regular?("_build/shared/lib/p/ebin/Elixir.A.beam")
       assert output =~ "Compiled lib/a.ex"
     end
   end
@@ -58,7 +58,7 @@ defmodule Mix.CLITest do
       assert output =~ "* creating lib/new_with_tests/supervisor.ex"
 
       output = mix "test test/new_with_tests_test.exs --cover"
-      assert File.regular?("_build/lib/new_with_tests/ebin/Elixir.NewWithTests.beam")
+      assert File.regular?("_build/shared/lib/new_with_tests/ebin/Elixir.NewWithTests.beam")
       assert output =~ "1 tests, 0 failures"
       assert output =~ "Generating cover results ..."
       assert File.regular?("cover/Elixir.NewWithTests.html")
@@ -71,7 +71,7 @@ defmodule Mix.CLITest do
       assert output =~ "* creating lib/new_with_tests.ex"
 
       output = mix "test"
-      assert File.regular?("_build/lib/new_with_tests/ebin/Elixir.NewWithTests.beam")
+      assert File.regular?("_build/shared/lib/new_with_tests/ebin/Elixir.NewWithTests.beam")
       assert output =~ "1 tests, 0 failures"
     end
   end
diff --git a/lib/mix/test/mix/deps/lock_test.exs b/lib/mix/test/mix/deps/lock_test.exs
@@ -17,17 +17,17 @@ defmodule Mix.Deps.LockTest do
     in_fixture "no_mixfile", fn ->
       Mix.Deps.Lock.write [foo: :bar]
       assert File.regular? "mix.lock"
-      assert File.regular? "_build/lib/sample/.compile.lock"
+      assert File.regular? "_build/shared/lib/sample/.compile.lock"
     end
   end
 
   test "does not touch manifest file there is no change" do
     in_fixture "no_mixfile", fn ->
       Mix.Deps.Lock.write [foo: :bar, bar: :bat]
-      File.rm! "_build/lib/sample/.compile.lock"
+      File.rm! "_build/shared/lib/sample/.compile.lock"
 
       Mix.Deps.Lock.write [bar: :bat, foo: :bar]
-      refute File.regular? "_build/lib/sample/.compile.lock"
+      refute File.regular? "_build/shared/lib/sample/.compile.lock"
     end
   end
 end
diff --git a/lib/mix/test/mix/rebar_test.exs b/lib/mix/test/mix/rebar_test.exs
@@ -82,8 +82,8 @@ defmodule Mix.RebarTest do
         |> Enum.map(&Mix.Deps.load_paths(&1))
         |> Enum.concat
 
-      assert File.exists?("_build/lib/rebar_dep/ebin/rebar_dep.beam")
-      assert File.exists?("_build/lib/git_rebar/ebin/git_rebar.beam")
+      assert File.exists?("_build/shared/lib/rebar_dep/ebin/rebar_dep.beam")
+      assert File.exists?("_build/shared/lib/git_rebar/ebin/git_rebar.beam")
       assert Enum.any?(load_paths, &String.ends_with?(&1, "git_rebar/ebin"))
       assert Enum.any?(load_paths, &String.ends_with?(&1, "rebar_dep/ebin"))
     end
diff --git a/lib/mix/test/mix/tasks/app.start_test.exs b/lib/mix/test/mix/tasks/app.start_test.exs
@@ -26,12 +26,12 @@ defmodule Mix.Tasks.App.StartTest do
       assert System.version == Mix.Deps.Lock.elixir_vsn
 
       Mix.Task.clear
-      File.write!("_build/lib/sample/.compile.lock", "the_past")
-      File.touch!("_build/lib/sample/.compile.lock", { { 2010, 1, 1 }, { 0, 0, 0 } })
+      File.write!("_build/shared/lib/sample/.compile.lock", "the_past")
+      File.touch!("_build/shared/lib/sample/.compile.lock", { { 2010, 1, 1 }, { 0, 0, 0 } })
 
       Mix.Tasks.App.Start.run ["--no-start", "--no-compile"]
       assert System.version == Mix.Deps.Lock.elixir_vsn
-      assert File.stat!("_build/lib/sample/.compile.lock").mtime > { { 2010, 1, 1 }, { 0, 0, 0 } }
+      assert File.stat!("_build/shared/lib/sample/.compile.lock").mtime > { { 2010, 1, 1 }, { 0, 0, 0 } }
     end
   after
     Mix.Project.pop
@@ -46,8 +46,8 @@ defmodule Mix.Tasks.App.StartTest do
       end
 
       Mix.Tasks.App.Start.run ["--no-start"]
-      assert File.regular?("_build/lib/app_start_sample/ebin/Elixir.A.beam")
-      assert File.regular?("_build/lib/app_start_sample/ebin/app_start_sample.app")
+      assert File.regular?("_build/shared/lib/app_start_sample/ebin/Elixir.A.beam")
+      assert File.regular?("_build/shared/lib/app_start_sample/ebin/app_start_sample.app")
       refute List.keyfind(:application.loaded_applications, :app_start_sample, 0)
 
       Mix.Tasks.App.Start.run []
diff --git a/lib/mix/test/mix/tasks/clean_test.exs b/lib/mix/test/mix/tasks/clean_test.exs
@@ -29,19 +29,19 @@ defmodule Mix.Tasks.CleanTest do
   test "removes the build configuration" do
     in_fixture "deps_status", fn ->
       Mix.Tasks.Compile.run ["--no-deps"]
-      assert File.exists?("_build/lib/sample")
+      assert File.exists?("_build/shared/lib/sample")
 
       Mix.Tasks.Clean.run []
-      refute File.exists?("_build/lib/sample")
+      refute File.exists?("_build/shared/lib/sample")
     end
   end
 
   test "cleans all repos" do
     in_fixture "deps_status", fn ->
-      assert File.exists?("_build/lib/ok")
+      assert File.exists?("_build/shared/lib/ok")
       Mix.Tasks.Clean.run ["--all"]
 
-      refute File.exists?("_build/lib/ok")
+      refute File.exists?("_build/shared/lib/ok")
       # Assert we don't choke on unfetched deps
       assert_received { :mix_shell, :info, ["* Cleaning unknown (deps/unknown)"] }
     end
diff --git a/lib/mix/test/mix/tasks/compile.app_test.exs b/lib/mix/test/mix/tasks/compile.app_test.exs
@@ -39,7 +39,7 @@ defmodule Mix.Tasks.Compile.AppTest do
       Mix.Tasks.Compile.Elixir.run([])
       assert Mix.Tasks.Compile.App.run([]) == :ok
 
-      contents = File.read!("_build/lib/sample/ebin/sample.app")
+      contents = File.read!("_build/shared/lib/sample/ebin/sample.app")
       assert contents =~ "{application,sample"
       assert contents =~ "0.1.0"
       assert contents =~ "'Elixir.A'"
@@ -57,7 +57,7 @@ defmodule Mix.Tasks.Compile.AppTest do
     in_fixture "no_mixfile", fn ->
       Mix.Tasks.Compile.Elixir.run([])
       Mix.Tasks.Compile.App.run([])
-      contents = File.read!("_build/lib/custom_project/ebin/custom_project.app")
+      contents = File.read!("_build/shared/lib/custom_project/ebin/custom_project.app")
       assert contents =~ "0.2.0"
       assert contents =~ "{maxT,infinity}"
     end
@@ -98,7 +98,7 @@ defmodule Mix.Tasks.Compile.AppTest do
       Mix.Tasks.Compile.Elixir.run([])
       assert Mix.Tasks.Compile.App.run([]) == :ok
 
-      {:ok, [{_app, _, properties}]} = :file.consult("_build/lib/sample/ebin/sample.app")
+      {:ok, [{_app, _, properties}]} = :file.consult("_build/shared/lib/sample/ebin/sample.app")
       properties = Keyword.from_enum(properties)
       assert properties[:registered] == []
       assert properties[:description] == 'sample'
diff --git a/lib/mix/test/mix/tasks/compile.elixir_test.exs b/lib/mix/test/mix/tasks/compile.elixir_test.exs
@@ -17,9 +17,9 @@ defmodule Mix.Tasks.Compile.ElixirTest do
     in_fixture "no_mixfile", fn ->
       Mix.Tasks.Compile.Elixir.run []
 
-      assert File.regular?("_build/lib/sample/ebin/Elixir.A.beam")
-      assert File.regular?("_build/lib/sample/ebin/Elixir.B.beam")
-      assert File.regular?("_build/lib/sample/ebin/Elixir.C.beam")
+      assert File.regular?("_build/shared/lib/sample/ebin/Elixir.A.beam")
+      assert File.regular?("_build/shared/lib/sample/ebin/Elixir.B.beam")
+      assert File.regular?("_build/shared/lib/sample/ebin/Elixir.C.beam")
 
       assert_received { :mix_shell, :info, ["Compiled lib/a.ex"] }
       assert_received { :mix_shell, :info, ["Compiled lib/b.ex"] }
@@ -40,18 +40,18 @@ defmodule Mix.Tasks.Compile.ElixirTest do
         end
       end
 
-      refute File.regular?("_build/lib/sample/ebin/Elixir.A.beam")
+      refute File.regular?("_build/shared/lib/sample/ebin/Elixir.A.beam")
     end
   end
 
   test "removes old artifact files" do
     in_fixture "no_mixfile", fn ->
       assert Mix.Tasks.Compile.Elixir.run([]) == :ok
-      assert File.regular?("_build/lib/sample/ebin/Elixir.A.beam")
+      assert File.regular?("_build/shared/lib/sample/ebin/Elixir.A.beam")
 
       File.rm!("lib/a.ex")
       assert Mix.Tasks.Compile.Elixir.run([]) == :ok
-      refute File.regular?("_build/lib/sample/ebin/Elixir.A.beam")
+      refute File.regular?("_build/shared/lib/sample/ebin/Elixir.A.beam")
     end
   end
 
@@ -71,7 +71,7 @@ defmodule Mix.Tasks.Compile.ElixirTest do
       assert_received { :mix_shell, :info, ["Compiled lib/a.ex"] }
       refute_received { :mix_shell, :info, ["Compiled lib/b.ex"] }
 
-      File.touch!("_build/lib/sample/.compile.elixir", future)
+      File.touch!("_build/shared/lib/sample/.compile.elixir", future)
       assert Mix.Tasks.Compile.Elixir.run([]) == :noop
     end
   end
diff --git a/lib/mix/test/mix/tasks/compile.erlang_test.exs b/lib/mix/test/mix/tasks/compile.erlang_test.exs
@@ -27,8 +27,8 @@ defmodule Mix.Tasks.Compile.ErlangTest do
         end
       end
 
-      assert File.regular?("_build/lib/sample/ebin/b.beam")
-      assert File.regular?("_build/lib/sample/ebin/c.beam")
+      assert File.regular?("_build/shared/lib/sample/ebin/b.beam")
+      assert File.regular?("_build/shared/lib/sample/ebin/c.beam")
     end
   end
 
@@ -38,8 +38,8 @@ defmodule Mix.Tasks.Compile.ErlangTest do
       assert_received { :mix_shell, :info, ["Compiled src/b.erl"] }
       assert_received { :mix_shell, :info, ["Compiled src/c.erl"] }
 
-      assert File.regular?("_build/lib/sample/ebin/b.beam")
-      assert File.regular?("_build/lib/sample/ebin/c.beam")
+      assert File.regular?("_build/shared/lib/sample/ebin/b.beam")
+      assert File.regular?("_build/shared/lib/sample/ebin/c.beam")
 
       assert Mix.Tasks.Compile.Erlang.run([]) == :noop
       refute_received { :mix_shell, :info, ["Compiled src/b.erl"] }
@@ -53,11 +53,11 @@ defmodule Mix.Tasks.Compile.ErlangTest do
   test "removes old artifact files" do
     in_fixture "compile_erlang", fn ->
       assert Mix.Tasks.Compile.Erlang.run([]) == :ok
-      assert File.regular?("_build/lib/sample/ebin/b.beam")
+      assert File.regular?("_build/shared/lib/sample/ebin/b.beam")
 
       File.rm!("src/b.erl")
       assert Mix.Tasks.Compile.Erlang.run([]) == :ok
-      refute File.regular?("_build/lib/sample/ebin/b.beam")
+      refute File.regular?("_build/shared/lib/sample/ebin/b.beam")
     end
   end
 end
diff --git a/lib/mix/test/mix/tasks/compile_test.exs b/lib/mix/test/mix/tasks/compile_test.exs
@@ -36,8 +36,8 @@ defmodule Mix.Tasks.CompileTest do
   test "compile a project with mixfile" do
     in_fixture "no_mixfile", fn ->
       Mix.Tasks.Compile.run []
-      assert File.regular?("_build/lib/sample/ebin/Elixir.A.beam")
-      assert File.regular?("_build/lib/sample/ebin/sample.app")
+      assert File.regular?("_build/shared/lib/sample/ebin/Elixir.A.beam")
+      assert File.regular?("_build/shared/lib/sample/ebin/sample.app")
       assert_received { :mix_shell, :info, ["Compiled lib/a.ex"] }
       assert_received { :mix_shell, :info, ["Generated sample.app"] }
     end
diff --git a/lib/mix/test/mix/tasks/deps.git_test.exs b/lib/mix/test/mix/tasks/deps.git_test.exs
@@ -51,11 +51,11 @@ defmodule Mix.Tasks.DepsGitTest do
       assert_received { :mix_shell, :info, ["* Compiling git_repo"] }
       assert_received { :mix_shell, :info, ["Compiled lib/git_repo.ex"] }
       assert_received { :mix_shell, :info, ["Generated git_repo.app"] }
-      assert File.exists?("_build/lib/git_repo/ebin/Elixir.GitRepo.beam")
+      assert File.exists?("_build/shared/lib/git_repo/ebin/Elixir.GitRepo.beam")
       assert File.read!("mix.lock") =~ %r/"git_repo": {:git, #{inspect fixture_path("git_repo")}, "[a-f0-9]+", \[\]}/
 
       purge [GitRepo]
-      File.touch!("_build/lib/git_repo/.compile.elixir", { { 2010, 4, 17 }, { 14, 0, 0 } })
+      File.touch!("_build/shared/lib/git_repo/.compile.elixir", { { 2010, 4, 17 }, { 14, 0, 0 } })
       Mix.Task.clear
 
       Mix.Tasks.Deps.Update.run ["--all"]
@@ -67,7 +67,7 @@ defmodule Mix.Tasks.DepsGitTest do
       Mix.Tasks.Deps.Clean.run ["--all"]
       message = "* Cleaning git_repo 0.1.0 (#{fixture_path("git_repo")})"
       assert_received { :mix_shell, :info, [^message] }
-      refute File.exists?("_build/lib/git_repo/ebin/Elixir.Git.Repo.beam")
+      refute File.exists?("_build/shared/lib/git_repo/ebin/Elixir.Git.Repo.beam")
     end
   after
     Mix.Project.pop
@@ -129,7 +129,7 @@ defmodule Mix.Tasks.DepsGitTest do
     in_fixture "no_mixfile", fn ->
       Mix.Tasks.Deps.Get.run []
       message = "* Getting git_repo (#{fixture_path("git_repo")})"
-      assert File.exists?("_build/lib/git_app/.compile.lock")
+      assert File.exists?("_build/shared/lib/git_app/.compile.lock")
       assert_received { :mix_shell, :info, [^message] }
 
       # We can compile just fine
@@ -138,7 +138,7 @@ defmodule Mix.Tasks.DepsGitTest do
 
       # Notify a deps changed
       Mix.shell.flush
-      File.touch!("_build/lib/git_app/.compile.lock", { { 2020, 4, 17 }, { 14, 0, 0 } })
+      File.touch!("_build/shared/lib/git_app/.compile.lock", { { 2020, 4, 17 }, { 14, 0, 0 } })
 
       # We are forced to recompile
       purge [A, B, C]
@@ -157,12 +157,12 @@ defmodule Mix.Tasks.DepsGitTest do
     in_fixture "no_mixfile", fn ->
       Mix.Tasks.Deps.Get.run []
       message = "* Getting git_repo (#{fixture_path("git_repo")})"
-      assert File.rm("_build/lib/git_app/.compile.lock") == :ok
+      assert File.rm("_build/shared/lib/git_app/.compile.lock") == :ok
       assert_received { :mix_shell, :info, [^message] }
 
       Mix.Tasks.Deps.Compile.run ["git_repo"]
       refute_received { :mix_shell, :info, ["Compiled lib/a.ex"] }
-      refute File.exists?("_build/lib/git_app/.compile.lock")
+      refute File.exists?("_build/shared/lib/git_app/.compile.lock")
     end
   after
     purge [GitRepo, GitRepo.Mix]
diff --git a/lib/mix/test/mix/tasks/deps.path_test.exs b/lib/mix/test/mix/tasks/deps.path_test.exs
@@ -23,7 +23,7 @@ defmodule Mix.Tasks.DepsPathTest do
       assert_received { :mix_shell, :info, ["* Updating raw_repo (custom/raw_repo)"] }
       assert_received { :mix_shell, :info, ["Compiled lib/raw_repo.ex"] }
       assert_received { :mix_shell, :info, ["Generated raw_repo.app"] }
-      assert File.exists?("_build/lib/raw_repo/ebin/Elixir.RawRepo.beam")
+      assert File.exists?("_build/shared/lib/raw_repo/ebin/Elixir.RawRepo.beam")
 
       Mix.Tasks.Deps.Clean.run ["--all"]
       assert_received { :mix_shell, :info, ["* Cleaning raw_repo 0.1.0 (custom/raw_repo)"] }
diff --git a/lib/mix/test/mix/tasks/deps_test.exs b/lib/mix/test/mix/tasks/deps_test.exs
diff --git a/lib/mix/test/mix/umbrella_test.exs b/lib/mix/test/mix/umbrella_test.exs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{application,rebar_dep,[{registered,[]},{vsn,"0.1.0"},{modules,[rebar_dep]}]}.`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{application, rebar_dep,
 +  [
 +    {vsn, "0.1.0"}
 +  ]}.