diff options
| author | Jerry Kuch <jerryk@vmware.com> | 2010-11-11 09:24:12 +0000 |
|---|---|---|
| committer | Jerry Kuch <jerryk@vmware.com> | 2010-11-11 09:24:12 +0000 |
| commit | 361c7a1911daf29ee2cf4d60e6ab1ab50bd59f9e (patch) | |
| tree | 12da96a84663dee16d2ba697538934d12ee30566 | |
| parent | 7c0a0ca45f6cd077156498e86f287dfee9e1bf7d (diff) | |
| download | rabbitmq-server-git-361c7a1911daf29ee2cf4d60e6ab1ab50bd59f9e.tar.gz | |
generate_deps takes file args from stdin
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | generate_deps | 10 |
2 files changed, 6 insertions, 6 deletions
@@ -93,7 +93,7 @@ all: $(TARGETS) $(DEPS_FILE): $(SOURCES) $(INCLUDES) rm -f $@ - escript generate_deps $@ $(EBIN_DIR) $(SOURCES) $(INCLUDES) + echo $(SOURCES) $(INCLUDES) | escript generate_deps $@ $(EBIN_DIR) $(EBIN_DIR)/rabbit.app: $(EBIN_DIR)/rabbit_app.in $(BEAM_TARGETS) generate_app escript generate_app $(EBIN_DIR) $@ < $< diff --git a/generate_deps b/generate_deps index 92bca9ae66..a6879379dc 100644 --- a/generate_deps +++ b/generate_deps @@ -2,14 +2,14 @@ %% -*- erlang -*- -mode(compile). -main([TargetFile, EbinDir | ErlsAndHrls ]) -> - ErlFiles = lists:filter(fun (Path) -> lists:suffix(".erl", Path) end, - ErlsAndHrls), +%% We expect the list of Erlang source and header files to arrive on stdin +main([TargetFile, EbinDir]) -> + ErlsAndHrls = string:tokens(io:get_line(""), " \n"), + ErlFiles = [F || F <- ErlsAndHrls, lists:suffix(".erl", F)], Modules = sets:from_list( [list_to_atom(filename:basename(FileName, ".erl")) || FileName <- ErlFiles]), - HrlFiles = lists:filter(fun (Path) -> lists:suffix(".hrl", Path) end, - ErlsAndHrls), + HrlFiles = [F || F <- ErlsAndHrls, lists:suffix(".hrl", F)], IncludeDirs = lists:usort([filename:dirname(Path) || Path <- HrlFiles]), Headers = sets:from_list(HrlFiles), Deps = lists:foldl( |