summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/rebar.erl9
-rw-r--r--src/rebar_core.erl31
-rw-r--r--src/rebar_ct.erl10
-rw-r--r--src/rebar_erlc_compiler.erl6
-rw-r--r--src/rebar_neotoma_compiler.erl2
-rw-r--r--src/rebar_require_vsn.erl10
6 files changed, 33 insertions, 35 deletions
diff --git a/src/rebar.erl b/src/rebar.erl
index c7c9d29..c872ade 100644
--- a/src/rebar.erl
+++ b/src/rebar.erl
@@ -283,6 +283,8 @@ commands() ->
clean Clean
compile Compile sources
+escriptize Generate escript archive
+
create template= [var=foo,...] Create skel based on template and vars
create-app [appid=myapp] Create simple app skel
create-node [nodeid=mynode] Create simple node skel
@@ -379,9 +381,10 @@ filter_flags(Config, [Item | Rest], Commands) ->
command_names() ->
["check-deps", "clean", "compile", "create", "create-app", "create-node",
- "ct", "delete-deps", "doc", "eunit", "generate", "generate-appups",
- "generate-upgrade", "get-deps", "help", "list-deps", "list-templates",
- "qc", "update-deps", "overlay", "shell", "version", "xref"].
+ "ct", "delete-deps", "doc", "eunit", "escriptize", "generate",
+ "generate-appups", "generate-upgrade", "get-deps", "help", "list-deps",
+ "list-templates", "qc", "update-deps", "overlay", "shell", "version",
+ "xref"].
unabbreviate_command_names([]) ->
[];
diff --git a/src/rebar_core.erl b/src/rebar_core.erl
index 9e3f9f0..5396dd5 100644
--- a/src/rebar_core.erl
+++ b/src/rebar_core.erl
@@ -53,9 +53,10 @@ process_commands([Command | Rest], ParentConfig) ->
ParentConfig4 =
try
- %% Convert the code path so that all the entries are absolute paths.
- %% If not, code:set_path() may choke on invalid relative paths when trying
- %% to restore the code path from inside a subdirectory.
+ %% Convert the code path so that all the entries are
+ %% absolute paths. If not, code:set_path() may choke on
+ %% invalid relative paths when trying to restore the code
+ %% path from inside a subdirectory.
true = rebar_utils:expand_code_path(),
{ParentConfig2, _DirSet} = process_dir(rebar_utils:get_cwd(),
ParentConfig1, Command,
@@ -68,8 +69,9 @@ process_commands([Command | Rest], ParentConfig) ->
_ ->
ok
end,
- %% TODO: reconsider after config inheritance removal/redesign
- ParentConfig3 = rebar_config:clean_config(ParentConfig1, ParentConfig2),
+ %% TODO: reconsider after config inheritance removal/re-design
+ ParentConfig3 = rebar_config:clean_config(ParentConfig1,
+ ParentConfig2),
%% Wipe out vsn cache to avoid invalid hits when
%% dependencies are updated
rebar_config:set_xconf(ParentConfig3, vsn_cache, dict:new())
@@ -107,29 +109,29 @@ process_dir(Dir, ParentConfig, Command, DirSet) ->
%% to process this dir.
{ok, AvailModuleSets} = application:get_env(rebar, modules),
ModuleSet = choose_module_set(AvailModuleSets, Dir),
- maybe_process_dir(ModuleSet, Config, CurrentCodePath,
+ skip_or_process_dir(ModuleSet, Config, CurrentCodePath,
Dir, Command, DirSet)
end.
-maybe_process_dir({[], undefined}=ModuleSet, Config, CurrentCodePath,
+skip_or_process_dir({[], undefined}=ModuleSet, Config, CurrentCodePath,
Dir, Command, DirSet) ->
- process_dir0(Dir, Command, DirSet, Config, CurrentCodePath, ModuleSet);
-maybe_process_dir({_, ModuleSetFile}=ModuleSet, Config, CurrentCodePath,
+ process_dir1(Dir, Command, DirSet, Config, CurrentCodePath, ModuleSet);
+skip_or_process_dir({_, ModuleSetFile}=ModuleSet, Config, CurrentCodePath,
Dir, Command, DirSet) ->
case lists:suffix(".app.src", ModuleSetFile)
orelse lists:suffix(".app", ModuleSetFile) of
true ->
%% .app or .app.src file, check if is_skipped_app
- maybe_process_dir0(ModuleSetFile, ModuleSet,
+ skip_or_process_dir1(ModuleSetFile, ModuleSet,
Config, CurrentCodePath, Dir,
Command, DirSet);
false ->
%% not an app dir, no need to consider apps=/skip_apps=
- process_dir0(Dir, Command, DirSet, Config,
+ process_dir1(Dir, Command, DirSet, Config,
CurrentCodePath, ModuleSet)
end.
-maybe_process_dir0(AppFile, ModuleSet, Config, CurrentCodePath,
+skip_or_process_dir1(AppFile, ModuleSet, Config, CurrentCodePath,
Dir, Command, DirSet) ->
case rebar_app_utils:is_skipped_app(Config, AppFile) of
{Config1, {true, SkippedApp}} ->
@@ -137,11 +139,11 @@ maybe_process_dir0(AppFile, ModuleSet, Config, CurrentCodePath,
Config2 = increment_operations(Config1),
{Config2, DirSet};
{Config1, false} ->
- process_dir0(Dir, Command, DirSet, Config1,
+ process_dir1(Dir, Command, DirSet, Config1,
CurrentCodePath, ModuleSet)
end.
-process_dir0(Dir, Command, DirSet, Config0, CurrentCodePath,
+process_dir1(Dir, Command, DirSet, Config0, CurrentCodePath,
{DirModules, ModuleSetFile}) ->
%% Get the list of modules for "any dir". This is a catch-all list
%% of modules that are processed in addition to modules associated
@@ -270,7 +272,6 @@ process_each([Dir | Rest], Command, Config, ModuleSetFile, DirSet) ->
process_each(Rest, Command, Config3, ModuleSetFile, DirSet2)
end.
-
%%
%% Given a list of module sets from rebar.app and a directory, find
%% the appropriate subset of modules for this directory
diff --git a/src/rebar_ct.erl b/src/rebar_ct.erl
index e33c6c9..749d025 100644
--- a/src/rebar_ct.erl
+++ b/src/rebar_ct.erl
@@ -26,14 +26,14 @@
%% -------------------------------------------------------------------
%%
%% Targets:
-%% test - runs common test suites in ./test
-%% int_test - runs suites in ./int_test
-%% perf_test - runs suites inm ./perf_test
+%% test - run common test suites in ./test
+%% int_test - run suites in ./int_test
+%% perf_test - run suites inm ./perf_test
%%
%% Global options:
%% verbose=1 - show output from the common_test run as it goes
-%% suites="foo,bar" - runs <test>/foo_SUITE and <test>/bar_SUITE
-%% case="mycase" - runs individual test case foo_SUITE:mycase
+%% suites="foo,bar" - run <test>/foo_SUITE and <test>/bar_SUITE
+%% case="mycase" - run individual test case foo_SUITE:mycase
%% -------------------------------------------------------------------
-module(rebar_ct).
diff --git a/src/rebar_erlc_compiler.erl b/src/rebar_erlc_compiler.erl
index a63f9f4..91f8354 100644
--- a/src/rebar_erlc_compiler.erl
+++ b/src/rebar_erlc_compiler.erl
@@ -265,11 +265,6 @@ doterl_compile(Config, OutDir, MoreSources) ->
true = code:set_path(CurrPath),
ok.
-
-%% ===================================================================
-%% Internal functions
-%% ===================================================================
-
-spec include_path(file:filename(),
rebar_config:config()) -> [file:filename(), ...].
include_path(Source, Config) ->
@@ -414,7 +409,6 @@ gather_src([], Srcs) ->
gather_src([Dir|Rest], Srcs) ->
gather_src(Rest, Srcs ++ rebar_utils:find_files(Dir, ".*\\.erl\$")).
-
-spec dirs(file:filename()) -> [file:filename()].
dirs(Dir) ->
[F || F <- filelib:wildcard(filename:join([Dir, "*"])), filelib:is_dir(F)].
diff --git a/src/rebar_neotoma_compiler.erl b/src/rebar_neotoma_compiler.erl
index 9bff892..33f32e3 100644
--- a/src/rebar_neotoma_compiler.erl
+++ b/src/rebar_neotoma_compiler.erl
@@ -57,7 +57,7 @@ compile(Config, _AppFile) ->
fun compile_neo/3, [{check_last_mod,false}]).
%% ============================================================================
-%% Public API
+%% Internal functions
%% ============================================================================
neotoma_opts(Config) ->
diff --git a/src/rebar_require_vsn.erl b/src/rebar_require_vsn.erl
index 83cb79d..9a0a005 100644
--- a/src/rebar_require_vsn.erl
+++ b/src/rebar_require_vsn.erl
@@ -77,18 +77,18 @@ check_versions(Config) ->
"OTP Release"),
case {OtpMaj, OtpMin} >= {MinMaj, MinMin} of
true ->
- ?DEBUG("~s satisfies the requirement for vsn ~s~n",
- [erlang:system_info(otp_release),
+ ?DEBUG("~s satisfies the requirement for vsn ~s~n",
+ [erlang:system_info(otp_release),
MinOtpVsn]);
- false ->
+ false ->
?ABORT("OTP release ~s or later is required, you have: ~s~n",
[MinOtpVsn,
erlang:system_info(otp_release)])
- end
+ end
end.
version_tuple(OtpRelease, Type) ->
- case re:run(OtpRelease, "R(\\d+)B?-?(\\d+)?", [{capture, all, list}]) of
+ case re:run(OtpRelease, "R(\\d+)B?-?(\\d+)?", [{capture, all, list}]) of
{match, [_Full, Maj, Min]} ->
{list_to_integer(Maj), list_to_integer(Min)};
{match, [_Full, Maj]} ->
generated by cgit v1.1 at 2024-10-30 07:32:48 +0000