summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Smith <dizzyd@dizzyd.com>2010-04-17 07:35:40 -0600
committerDave Smith <dizzyd@dizzyd.com>2010-04-17 07:35:40 -0600
commit29a3d7267c42abea7458bc0f45f56ac8cb2bd937 (patch)
treea7acca105b15607f6423bb0dcd3d99c40aadfed7
parent266d82f871de7d6fec3aa34909a6c5373f74e009 (diff)
parent1e8916ba8752c5de727425f2211a103217eff1ea (diff)
Merging w/ mainline
-rw-r--r--priv/shell-completion/bash/rebar2
-rw-r--r--src/rebar_core.erl55
2 files changed, 31 insertions, 26 deletions
diff --git a/priv/shell-completion/bash/rebar b/priv/shell-completion/bash/rebar
index f36320a..6e089dc 100644
--- a/priv/shell-completion/bash/rebar
+++ b/priv/shell-completion/bash/rebar
@@ -10,7 +10,7 @@ _rebar()
lopts=" --help --commands --verbose --force --jobs="
cmdsnvars="analyze build_plt check_plt check-deps clean compile \
create create-app create-node delete-deps eunit \
- get-deps generate install int_test perf_test test \
+ get-deps generate install int_test perf_test test xref \
case= force=1 jobs= suite= verbose=1 appid= target= template="
if [[ ${cur} == --* ]] ; then
diff --git a/src/rebar_core.erl b/src/rebar_core.erl
index 0304201..750cea7 100644
--- a/src/rebar_core.erl
+++ b/src/rebar_core.erl
@@ -161,31 +161,36 @@ help() ->
%% print known commands
%%
commands() ->
- io:format(<<
-"analyze Analyze with Dialyzer~n"
-"build_plt Build Dialyzer PLT~n"
-"check_plt Check Dialyzer PLT~n"
-"~n"
-"clean Clean~n"
-"compile Compile sources~n"
-"~n"
-"create template= [var=foo,...] Create skel based on template and vars~n"
-"create-app Create simple app skel~n"
-"create-node Create simple node skel~n"
-"~n"
-"check-deps Display to be fetched dependencies~n"
-"get-deps Fetch dependencies~n"
-"delete-deps Delete fetched dependencies~n"
-"~n"
-"generate [dump_spec=0/1] Build release with reltool~n"
-"install [target=] Install build into target~n"
-"~n"
-"eunit [suite=foo] Run eunit [test/foo_tests.erl] tests~n"
-"~n"
-"int_test [suite=] [case=] Run ct suites in ./int_test~n"
-"perf_test [suite=] [case=] Run ct suites in ./perf_test~n"
-"test [suite=] [case=] Run ct suites in ./test~n"
->>).
+ S = <<"
+analyze Analyze with Dialyzer
+build_plt Build Dialyzer PLT
+check_plt Check Dialyzer PLT
+
+clean Clean
+compile Compile sources
+
+create template= [var=foo,...] Create skel based on template and vars
+create-app Create simple app skel
+create-node Create simple node skel
+
+check-deps Display to be fetched dependencies
+get-deps Fetch dependencies
+delete-deps Delete fetched dependencies
+
+generate [dump_spec=0/1] Build release with reltool
+install [target=] Install build into target
+
+eunit [suite=foo] Run eunit [test/foo_tests.erl] tests
+
+int_test [suite=] [case=] Run ct suites in ./int_test
+perf_test [suite=] [case=] Run ct suites in ./perf_test
+test [suite=] [case=] Run ct suites in ./test
+
+xref Run cross reference analysis
+">>,
+ io:put_chars(S),
+ %% workaround to delay exit until all output is written
+ timer:sleep(300).
%%
%% options accepted via getopt