From 7c6f78206e27da3fa0a24ef94d9cce416ff8299e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Sun, 8 Jul 2012 16:50:49 +0200 Subject: [PATCH] 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. --- .gitignore | 1 + Makefile | 6 +++++- {lib/elixir/src => src}/elixir.app.src | 0 3 files changed, 6 insertions(+), 1 deletion(-) rename {lib/elixir/src => src}/elixir.app.src (100%) diff --git a/.gitignore b/.gitignore index c0a1fc30b6..bfd6fa50b8 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 dd17f9324a..6594b13724 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 similarity index 100% rename from lib/elixir/src/elixir.app.src rename to src/elixir.app.src