summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2012-07-08 16:50:49 +0200
committerJosé Valim <jose.valim@plataformatec.com.br>2012-07-08 16:50:54 +0200
commit7c6f78206e27da3fa0a24ef94d9cce416ff8299e (patch)
tree39b1276eaa06c1e70132ad5e1aa065d79c74660d
parent8e20f6b7014423ceca6aae90a347c14d9c2a0a7d (diff)
downloadelixir-7c6f78206e27da3fa0a24ef94d9cce416ff8299e.tar.gz
Allow elixir to work as a rebar dependency
rebar expects its dependencies to have a file at `src/elixir.app.src`. This is a work around a rebar limitation since it should support a way to have an umbrella application, as OTP.
-rw-r--r--.gitignore1
-rw-r--r--Makefile6
-rw-r--r--src/elixir.app.src (renamed from lib/elixir/src/elixir.app.src)0
3 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index c0a1fc30b..bfd6fa50b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
/.full
/lib/*/ebin/*
/lib/*/test/tmp
+/lib/elixir/src/elixir.app.src
/lib/elixir/src/*_lexer.erl
/lib/elixir/src/*_parser.erl
/lib/elixir/test/ebin
diff --git a/Makefile b/Makefile
index dd17f9324..6594b1372 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,11 @@ endef
#==> Compilation tasks
KERNEL:=lib/elixir/ebin/__MAIN__-Elixir-Builtin.beam
-compile: erlang elixir
+compile: lib/elixir/src/elixir.app.src erlang elixir
+
+lib/elixir/src/elixir.app.src: src/elixir.app.src
+ @ rm -rf lib/elixir/src/elixir.app.src
+ @ cp src/elixir.app.src lib/elixir/src/elixir.app.src
erlang:
@ cd lib/elixir && $(REBAR) compile
diff --git a/lib/elixir/src/elixir.app.src b/src/elixir.app.src
index 3fad94abe..3fad94abe 100644
--- a/lib/elixir/src/elixir.app.src
+++ b/src/elixir.app.src