Remove entry points for rebar 2

.gitignore

@@ -3,7 +3,6 @@
 /lib/*/_build/
 /lib/*/tmp/
 /lib/elixir/src/*_parser.erl
-/lib/elixir/src/elixir.app.src
 /lib/elixir/test/ebin/
 /man/elixir.1
 /man/iex.1

Makefile

@@ -22,11 +22,11 @@ GIT_TAG = $(strip $(shell head="$(call GIT_REVISION)"; git tag --points-at $$hea
 #==> Functions
 
 define CHECK_ERLANG_RELEASE
-	$(Q) erl -noshell -eval '{V,_} = string:to_integer(erlang:system_info(otp_release)), io:fwrite("~s", [is_integer(V) and (V >= 19)])' -s erlang halt | grep -q '^true'; \
+	erl -noshell -eval '{V,_} = string:to_integer(erlang:system_info(otp_release)), io:fwrite("~s", [is_integer(V) and (V >= 19)])' -s erlang halt | grep -q '^true'; \
 		if [ $$? != 0 ]; then \
 		  echo "At least Erlang 19.0 is required to build Elixir"; \
 		  exit 1; \
-		fi;
+		fi
 endef
 
 define APP_TEMPLATE
@@ -56,14 +56,7 @@ UNICODE:=lib/elixir/ebin/Elixir.String.Unicode.beam
 
 default: compile
 
-compile: lib/elixir/src/elixir.app.src erlang elixir
-
-lib/elixir/src/elixir.app.src: src/elixir.app.src
-	$(Q) $(call CHECK_ERLANG_RELEASE)
-	$(Q) rm -f lib/elixir/src/elixir.app.src
-	$(Q) echo "%% This file is automatically generated from <project_root>/src/elixir.app.src" \
-	          >lib/elixir/src/elixir.app.src
-	$(Q) cat src/elixir.app.src >>lib/elixir/src/elixir.app.src
+compile: erlang elixir
 
 erlang:
 	$(Q) cd lib/elixir && $(REBAR) compile
@@ -76,6 +69,7 @@ elixir: stdlib lib/eex/ebin/Elixir.EEx.beam mix ex_unit logger eex iex
 stdlib: $(KERNEL) VERSION
 $(KERNEL): lib/elixir/lib/*.ex lib/elixir/lib/*/*.ex lib/elixir/lib/*/*/*.ex
 	$(Q) if [ ! -f $(KERNEL) ]; then \
+	  $(call CHECK_ERLANG_RELEASE); \
 		echo "==> bootstrap (compile)"; \
 		$(ERL) -s elixir_compiler bootstrap -s erlang halt; \
 	fi
@@ -118,7 +112,6 @@ clean:
 	cd lib/elixir && $(REBAR) clean
 	rm -rf ebin
 	rm -rf lib/*/ebin
-	rm -f lib/elixir/src/elixir.app.src
 	$(Q) $(MAKE) clean_residual_files
 
 clean_elixir:

RELEASE.md

@@ -32,4 +32,4 @@ This document simply outlines the release process:
 
 * VERSION
 * CHANGELOG.md
-* src/elixir.app.src (not lib/elixir/src/elixir.app.src)
+* lib/elixir/src/elixir.app.src

src/elixir.app.src → lib/elixir/src/elixir.app.src

@@ -1,6 +1,6 @@
 {application, elixir,
 [{description, "elixir"},
- {vsn, "1.6.0-dev"},
+ {vsn, "1.5.2"},
  {modules, [
 	elixir
   ]},