Permalink
Browse files

Since we now compile to ebin/__MAIN__, remove the need for exbin

  • Loading branch information...
josevalim committed May 7, 2012
1 parent 04b5a35 commit 280b26a81073897a81c765838bf4f8127ce9000e
Showing with 10 additions and 17 deletions.
  1. +5 −7 Makefile
  2. +1 −1 bin/elixir
  3. +1 −1 bin/elixir.bat
  4. +0 −3 rebar.config
  5. +0 −1 src/elixir.erl
  6. +1 −1 src/elixir_compiler.erl
  7. +2 −3 test/elixir/elixir/cli_test.exs
View
@@ -10,15 +10,15 @@ ERL=erl -I include -noshell -pa ebin
# target: dependencies
# [tab] system command
#
-compile: ebin exbin
+compile: ebin ebin/__MAIN__
clean:
@ $(REBAR) clean
docs: compile
@ bin/elixirc "lib/**/*.ex" --ignore-module-conflict --docs -o for_docs
- @ rm -rf exbin
- @ mv for_docs exbin
+ @ rm -rf ebin/__MAIN__
+ @ mv for_docs/__MAIN__ ebin/__MAIN__
test: test_erlang test_elixir
@@ -38,8 +38,6 @@ test_elixir: compile
ebin:
@ $(REBAR) compile
-exbin: lib/*.ex lib/*/*.ex
- @ rm -rf exbin
- @ mkdir -p exbin
- @ touch exbin
+ebin/__MAIN__: lib/*.ex lib/*/*.ex
+ @ rm -rf ebin/__MAIN__
$(ERL) -s elixir_compiler core -s erlang halt
View
@@ -30,4 +30,4 @@ readlink_f () {
SELF=`readlink_f $0`
SCRIPT_PATH=`dirname $SELF`
-erl -pa $SCRIPT_PATH/../ebin $SCRIPT_PATH/../exbin -noshell -noinput $ELIXIR_ERL_OPTS -s elixir start_cli -extra "$@"
+erl -pa $SCRIPT_PATH/../ebin -noinput $ELIXIR_ERL_OPTS -s elixir start_cli -extra "$@"
View
@@ -21,4 +21,4 @@ echo ** Options given after the .exs file or -- are passed down to the executed
echo.
echo ** Options can be passed to the erlang runtime using ELIXIR_ERL_OPTS.
:run
-erl -pa %~dp0\..\ebin %~dp0\..\exbin -noshell -noinput %ELIXIR_ERL_OPTS% -s elixir start_cli -extra %*
+erl -pa %~dp0\..\ebin -noshell -noinput %ELIXIR_ERL_OPTS% -s elixir start_cli -extra %*
View
@@ -21,6 +21,3 @@
{report, true},
{verbose, false}
]}.
-
-{lib_dirs, ["exbin"]}.
-{clean_files, ["exbin/"]}.
View
@@ -11,7 +11,6 @@
-export([start/2, stop/1, config_change/3]).
start(_Type, _Args) ->
- (catch code:add_pathz(code:lib_dir(?MODULE, exbin))),
%% Set the shell to unicode so printing inside files work
io:setopts([{encoding,unicode}]),
elixir_sup:start_link([]).
View
@@ -183,7 +183,7 @@ make_dir(Current, [], Buffer) ->
core_file(File) ->
try
Lists = file(File),
- [binary_to_path(X, "exbin") || X <- Lists],
+ [binary_to_path(X, "ebin") || X <- Lists],
io:format("Compiled ~s~n", [File])
catch
Kind:Reason ->
@@ -17,20 +17,19 @@ defmodule Elixir.CLI.OptionParsingTest do
use ExUnit.Case
test :path do
- list = OS.cmd('bin/elixir -e "IO.inspect Erlang.code.get_path" -pa "*" -pz "exbin/*"')
+ list = OS.cmd('bin/elixir -e "IO.inspect Erlang.code.get_path" -pa "*" -pz "ebin/*"')
{ path, _ } = Code.eval list, []
# pa
assert_member File.expand_path('bin'), path
assert_member File.expand_path('ebin'), path
- assert_member File.expand_path('exbin'), path
assert_member File.expand_path('src'), path
assert_member File.expand_path('lib'), path
assert_member File.expand_path('include'), path
assert_member File.expand_path('test'), path
# pz
- assert_member File.expand_path('exbin/__MAIN__'), path
+ assert_member File.expand_path('ebin/__MAIN__'), path
end
test :require do

0 comments on commit 280b26a

Please sign in to comment.