summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2009-11-04 16:08:35 +0000
committerMatthias Radestock <matthias@lshift.net>2009-11-04 16:08:35 +0000
commitc6105627d649db409b7ee7bb72ccbba7e7821b63 (patch)
tree9037e7b94b443e76a98bfb7825c6479087f2dde8
parent4dadba8857efac0f80d51c7deb0b7765bd54c928 (diff)
parent83fd08618c28eefc74e5cb386e3d9c4e2c1672e2 (diff)
downloadrabbitmq-server-c6105627d649db409b7ee7bb72ccbba7e7821b63.tar.gz
merge bug21782 into default
-rw-r--r--Makefile2
-rw-r--r--generate_app6
2 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index ad0316fc..132a7c19 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ ERL_EBIN=erl -noinput -pa $(EBIN_DIR)
all: $(TARGETS)
$(EBIN_DIR)/rabbit.app: $(EBIN_DIR)/rabbit_app.in $(BEAM_TARGETS) generate_app
- escript generate_app $(EBIN_DIR) < $< > $@
+ escript generate_app $(EBIN_DIR) $@ < $<
$(EBIN_DIR)/gen_server2.beam: $(SOURCE_DIR)/gen_server2.erl
erlc $(ERLC_OPTS) $<
diff --git a/generate_app b/generate_app
index 62301292..576b485e 100644
--- a/generate_app
+++ b/generate_app
@@ -1,10 +1,12 @@
#!/usr/bin/env escript
%% -*- erlang -*-
-main([BeamDir]) ->
+main([BeamDir, TargetFile]) ->
Modules = [list_to_atom(filename:basename(F, ".beam")) ||
F <- filelib:wildcard("*.beam", BeamDir)],
{ok, {application, Application, Properties}} = io:read(''),
NewProperties = lists:keyreplace(modules, 1, Properties,
{modules, Modules}),
- io:format("~p.", [{application, Application, NewProperties}]).
+ file:write_file(
+ TargetFile,
+ io_lib:format("~p.~n", [{application, Application, NewProperties}])).