summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2011-05-11 16:39:38 +0100
committerSimon MacMullen <simon@rabbitmq.com>2011-05-11 16:39:38 +0100
commit15a75b7720bfe433511e7422546cc6fe4d747a0b (patch)
tree8289924f66ce599d77f0202921cc1733f25c09e2
parent61349821a03d50016b4c73bf14d138970c1547ba (diff)
downloadrabbitmq-server-15a75b7720bfe433511e7422546cc6fe4d747a0b.tar.gz
Use erl files rather than beam files to generate the app module list.
-rw-r--r--Makefile4
-rw-r--r--generate_app6
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index cdb86aad..c07c043e 100644
--- a/Makefile
+++ b/Makefile
@@ -93,8 +93,8 @@ $(DEPS_FILE): $(SOURCES) $(INCLUDES)
rm -f $@
echo $(subst : ,:,$(foreach FILE,$^,$(FILE):)) | escript generate_deps $@ $(EBIN_DIR)
-$(EBIN_DIR)/rabbit.app: $(EBIN_DIR)/rabbit_app.in $(BEAM_TARGETS) generate_app
- escript generate_app $(EBIN_DIR) $@ < $<
+$(EBIN_DIR)/rabbit.app: $(EBIN_DIR)/rabbit_app.in $(SOURCES) generate_app
+ escript generate_app $(SOURCE_DIR) $@ < $<
$(EBIN_DIR)/%.beam: $(SOURCE_DIR)/%.erl | $(DEPS_FILE)
erlc $(ERLC_OPTS) -pa $(EBIN_DIR) $<
diff --git a/generate_app b/generate_app
index 576b485e..10e5bafd 100644
--- a/generate_app
+++ b/generate_app
@@ -1,9 +1,9 @@
#!/usr/bin/env escript
%% -*- erlang -*-
-main([BeamDir, TargetFile]) ->
- Modules = [list_to_atom(filename:basename(F, ".beam")) ||
- F <- filelib:wildcard("*.beam", BeamDir)],
+main([SrcDir, TargetFile]) ->
+ Modules = [list_to_atom(filename:basename(F, ".erl")) ||
+ F <- filelib:wildcard("*.erl", SrcDir)],
{ok, {application, Application, Properties}} = io:read(''),
NewProperties = lists:keyreplace(modules, 1, Properties,
{modules, Modules}),