Default build_per_environment to true

José Valim · José Valim · commit 294885be1a51 · 2014-02-01T12:55:30.000+01:00
diff --git a/lib/eex/mix.exs b/lib/eex/mix.exs
@@ -2,6 +2,6 @@ defmodule EEx.Mixfile do
   use Mix.Project
 
   def project do
-    [app: :eex, version: System.version]
+    [app: :eex, version: System.version, build_per_environment: false]
   end
-end
+end
diff --git a/lib/elixir/mix.exs b/lib/elixir/mix.exs
@@ -4,6 +4,7 @@ defmodule Elixir.Mixfile do
   def project do
     [ app: :elixir,
       version: System.version,
+      build_per_environment: false,
       escript_embed_elixir: false,
       escript_main_module: :elixir,
       escript_emu_args: "%%! -noshell\n" ]
diff --git a/lib/ex_unit/mix.exs b/lib/ex_unit/mix.exs
@@ -2,7 +2,7 @@ defmodule ExUnit.Mixfile do
   use Mix.Project
 
   def project do
-    [app: :ex_unit, version: System.version]
+    [app: :ex_unit, version: System.version, build_per_environment: false]
   end
 
   def application do
diff --git a/lib/iex/mix.exs b/lib/iex/mix.exs
@@ -2,7 +2,7 @@ defmodule IEx.Mixfile do
   use Mix.Project
 
   def project do
-    [app: :iex, version: System.version]
+    [app: :iex, version: System.version, build_per_environment: false]
   end
 
   def application do
diff --git a/lib/mix/lib/mix/project.ex b/lib/mix/lib/mix/project.ex
@@ -329,7 +329,7 @@ defmodule Mix.Project do
   end
 
   defp default_config do
-    [ build_per_environment: false,
+    [ build_per_environment: true,
       default_task: "run",
       deps: [],
       deps_path: "deps",
diff --git a/lib/mix/mix.exs b/lib/mix/mix.exs
@@ -3,6 +3,7 @@ defmodule Mix.Mixfile do
 
   def project do
     [ app: :mix,
+      build_per_environment: false,
       version: System.version,
       escript_main_module: Mix.CLI ]
   end
diff --git a/lib/mix/test/fixtures/deps_status/_build/dev/lib/invalidapp/ebin/invalidapp.app b/lib/mix/test/fixtures/deps_status/_build/dev/lib/invalidapp/ebin/invalidapp.app
diff --git a/lib/mix/test/fixtures/deps_status/_build/dev/lib/invalidvsn/ebin/invalidvsn.app b/lib/mix/test/fixtures/deps_status/_build/dev/lib/invalidvsn/ebin/invalidvsn.app
diff --git a/lib/mix/test/fixtures/deps_status/_build/dev/lib/ok/ebin/ok.app b/lib/mix/test/fixtures/deps_status/_build/dev/lib/ok/ebin/ok.app
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/shared/lib/p/ebin/Elixir.A.beam")
+      assert File.regular?("_build/dev/lib/p/ebin/Elixir.A.beam")
       assert output =~ "Compiled lib/a.ex"
     end
   end
@@ -51,27 +51,27 @@ defmodule Mix.CLITest do
     end
   end
 
-  test "new with tests smoke test" do
+  test "new with tests" do
     in_tmp "new_with_tests", fn ->
       output = mix "new ."
       assert output =~ "* creating lib/new_with_tests.ex"
       assert output =~ "* creating lib/new_with_tests/supervisor.ex"
 
       output = mix "test test/new_with_tests_test.exs --cover"
-      assert File.regular?("_build/shared/lib/new_with_tests/ebin/Elixir.NewWithTests.beam")
+      assert File.regular?("_build/test/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")
     end
   end
 
-  test "new --bare with tests smoke test" do
+  test "new --bare with tests" do
     in_tmp "new_with_tests", fn ->
       output = mix "new --bare ."
       assert output =~ "* creating lib/new_with_tests.ex"
 
       output = mix "test"
-      assert File.regular?("_build/shared/lib/new_with_tests/ebin/Elixir.NewWithTests.beam")
+      assert File.regular?("_build/test/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
@@ -12,17 +12,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/shared/lib/sample/.compile.lock"
+      assert File.regular? "_build/dev/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/shared/lib/sample/.compile.lock"
+      File.rm! "_build/dev/lib/sample/.compile.lock"
 
       Mix.Deps.Lock.write [bar: :bat, foo: :bar]
-      refute File.regular? "_build/shared/lib/sample/.compile.lock"
+      refute File.regular? "_build/dev/lib/sample/.compile.lock"
     end
   end
 
diff --git a/lib/mix/test/mix/rebar_test.exs b/lib/mix/test/mix/rebar_test.exs
@@ -104,8 +104,8 @@ defmodule Mix.RebarTest do
         |> Enum.map(&Mix.Deps.load_paths(&1))
         |> Enum.concat
 
-      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 File.exists?("_build/dev/lib/rebar_dep/ebin/rebar_dep.beam")
+      assert File.exists?("_build/dev/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/shared/lib/sample/.compile.lock", "the_past")
-      File.touch!("_build/shared/lib/sample/.compile.lock", { { 2010, 1, 1 }, { 0, 0, 0 } })
+      File.write!("_build/dev/lib/sample/.compile.lock", "the_past")
+      File.touch!("_build/dev/lib/sample/.compile.lock", { { 2010, 1, 1 }, { 0, 0, 0 } })
 
       Mix.Tasks.App.Start.run ["--no-start"]
       assert System.version == Mix.Deps.Lock.elixir_vsn
-      assert File.stat!("_build/shared/lib/sample/.compile.lock").mtime > { { 2010, 1, 1 }, { 0, 0, 0 } }
+      assert File.stat!("_build/dev/lib/sample/.compile.lock").mtime > { { 2010, 1, 1 }, { 0, 0, 0 } }
     end
   end
 
@@ -44,8 +44,8 @@ defmodule Mix.Tasks.App.StartTest do
       end
 
       Mix.Tasks.App.Start.run ["--no-start"]
-      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")
+      assert File.regular?("_build/dev/lib/app_start_sample/ebin/Elixir.A.beam")
+      assert File.regular?("_build/dev/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
@@ -24,20 +24,20 @@ defmodule Mix.Tasks.CleanTest do
   test "removes the build application" do
     in_fixture "deps_status", fn ->
       Mix.Tasks.Compile.run ["--no-deps"]
-      assert File.exists?("_build/shared/lib/sample")
+      assert File.exists?("_build/dev/lib/sample")
 
       Mix.Tasks.Clean.run []
-      refute File.exists?("_build/shared/lib/sample")
+      refute File.exists?("_build/dev/lib/sample")
     end
   end
 
   test "cleans deps" do
     in_fixture "deps_status", fn ->
-      assert File.exists?("_build/shared/lib/ok")
+      assert File.exists?("_build/dev/lib/ok")
       Mix.Tasks.Deps.Clean.run ["--all"]
 
-      assert File.exists?("_build/shared")
-      refute File.exists?("_build/shared/lib/ok")
+      assert File.exists?("_build/dev")
+      refute File.exists?("_build/dev/lib/ok")
       assert_received { :mix_shell, :info, ["* Cleaning ok"] }
 
       # Assert we don't choke on unfetched deps
@@ -47,11 +47,11 @@ defmodule Mix.Tasks.CleanTest do
 
   test "cleans all deps and builds" do
     in_fixture "deps_status", fn ->
-      assert File.exists?("_build/shared/lib/ok")
+      assert File.exists?("_build/dev/lib/ok")
       Mix.Tasks.Clean.run ["--all"]
 
-      assert File.exists?("_build/shared")
-      refute File.exists?("_build/shared/lib")
+      assert File.exists?("_build/dev")
+      refute File.exists?("_build/dev/lib")
       assert_received { :mix_shell, :info, ["* Cleaning ok"] }
       assert_received { :mix_shell, :info, ["* Cleaning 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/shared/lib/sample/ebin/sample.app")
+      contents = File.read!("_build/dev/lib/sample/ebin/sample.app")
       assert contents =~ "{application,sample"
       assert contents =~ "0.1.0"
       assert contents =~ "'Elixir.A'"
@@ -55,7 +55,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/shared/lib/custom_project/ebin/custom_project.app")
+      contents = File.read!("_build/dev/lib/custom_project/ebin/custom_project.app")
       assert contents =~ "0.2.0"
       assert contents =~ "{maxT,infinity}"
     end
@@ -92,7 +92,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/shared/lib/sample/ebin/sample.app")
+      {:ok, [{_app, _, properties}]} = :file.consult("_build/dev/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
@@ -9,6 +9,10 @@ defmodule Mix.Tasks.Compile.ElixirTest do
   end
 
   test "compiles a project" do
+    Mix.Project.pop
+    Mix.ProjectStack.post_config [build_per_environment: false]
+    Mix.Project.push MixTest.Case.Sample
+
     in_fixture "no_mixfile", fn ->
       Mix.Tasks.Compile.Elixir.run []
 
@@ -23,10 +27,6 @@ defmodule Mix.Tasks.Compile.ElixirTest do
   end
 
   test "compiles a project with per environment build" do
-    Mix.Project.pop
-    Mix.ProjectStack.post_config [build_per_environment: true]
-    Mix.Project.push MixTest.Case.Sample
-
     in_fixture "no_mixfile", fn ->
       Mix.Tasks.Compile.Elixir.run []
 
@@ -53,18 +53,18 @@ defmodule Mix.Tasks.Compile.ElixirTest do
         end
       end
 
-      refute File.regular?("_build/shared/lib/sample/ebin/Elixir.A.beam")
+      refute File.regular?("_build/dev/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/shared/lib/sample/ebin/Elixir.A.beam")
+      assert File.regular?("_build/dev/lib/sample/ebin/Elixir.A.beam")
 
       File.rm!("lib/a.ex")
       assert Mix.Tasks.Compile.Elixir.run([]) == :ok
-      refute File.regular?("_build/shared/lib/sample/ebin/Elixir.A.beam")
+      refute File.regular?("_build/dev/lib/sample/ebin/Elixir.A.beam")
     end
   end
 
@@ -84,7 +84,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/shared/lib/sample/.compile.elixir", future)
+      File.touch!("_build/dev/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
@@ -22,8 +22,8 @@ defmodule Mix.Tasks.Compile.ErlangTest do
         end
       end
 
-      assert File.regular?("_build/shared/lib/sample/ebin/b.beam")
-      assert File.regular?("_build/shared/lib/sample/ebin/c.beam")
+      assert File.regular?("_build/dev/lib/sample/ebin/b.beam")
+      assert File.regular?("_build/dev/lib/sample/ebin/c.beam")
     end
   end
 
@@ -33,8 +33,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/shared/lib/sample/ebin/b.beam")
-      assert File.regular?("_build/shared/lib/sample/ebin/c.beam")
+      assert File.regular?("_build/dev/lib/sample/ebin/b.beam")
+      assert File.regular?("_build/dev/lib/sample/ebin/c.beam")
 
       assert Mix.Tasks.Compile.Erlang.run([]) == :noop
       refute_received { :mix_shell, :info, ["Compiled src/b.erl"] }
@@ -48,11 +48,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/shared/lib/sample/ebin/b.beam")
+      assert File.regular?("_build/dev/lib/sample/ebin/b.beam")
 
       File.rm!("src/b.erl")
       assert Mix.Tasks.Compile.Erlang.run([]) == :ok
-      refute File.regular?("_build/shared/lib/sample/ebin/b.beam")
+      refute File.regular?("_build/dev/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
@@ -29,8 +29,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/shared/lib/sample/ebin/Elixir.A.beam")
-      assert File.regular?("_build/shared/lib/sample/ebin/sample.app")
+      assert File.regular?("_build/dev/lib/sample/ebin/Elixir.A.beam")
+      assert File.regular?("_build/dev/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/shared/lib/git_repo/ebin/Elixir.GitRepo.beam")
+      assert File.exists?("_build/dev/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/shared/lib/git_repo/.compile.elixir", { { 2010, 4, 17 }, { 14, 0, 0 } })
+      File.touch!("_build/dev/lib/git_repo/.compile.elixir", { { 2010, 4, 17 }, { 14, 0, 0 } })
       Mix.Task.clear
 
       Mix.Tasks.Deps.Update.run ["--all"]
@@ -120,7 +120,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/shared/lib/git_app/.compile.lock")
+      assert File.exists?("_build/dev/lib/git_app/.compile.lock")
       assert_received { :mix_shell, :info, [^message] }
 
       # We can compile just fine
@@ -129,7 +129,7 @@ defmodule Mix.Tasks.DepsGitTest do
 
       # Notify a deps changed
       Mix.shell.flush
-      File.touch!("_build/shared/lib/git_app/.compile.lock", { { 2020, 4, 17 }, { 14, 0, 0 } })
+      File.touch!("_build/dev/lib/git_app/.compile.lock", { { 2020, 4, 17 }, { 14, 0, 0 } })
 
       # We are forced to recompile
       purge [A, B, C]
@@ -147,12 +147,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/shared/lib/git_app/.compile.lock") == :ok
+      assert File.rm("_build/dev/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/shared/lib/git_app/.compile.lock")
+      refute File.exists?("_build/dev/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
@@ -22,7 +22,7 @@ defmodule Mix.Tasks.DepsPathTest do
       Mix.Tasks.Deps.Update.run ["--all"]
       assert_received { :mix_shell, :info, ["Compiled lib/raw_repo.ex"] }
       assert_received { :mix_shell, :info, ["Generated raw_repo.app"] }
-      assert File.exists?("_build/shared/lib/raw_repo/ebin/Elixir.RawRepo.beam")
+      assert File.exists?("_build/dev/lib/raw_repo/ebin/Elixir.RawRepo.beam")
     end
   end
 
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
