summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--priv/templates/plugin.template2
-rw-r--r--src/rebar_app_discover.erl24
-rw-r--r--src/rebar_app_info.erl19
-rw-r--r--src/rebar_app_utils.erl9
-rw-r--r--src/rebar_config.erl3
-rw-r--r--src/rebar_otp_app.erl17
-rw-r--r--src/rebar_plugins.erl3
-rw-r--r--src/rebar_prv_clean.erl2
-rw-r--r--src/rebar_prv_install_deps.erl3
-rw-r--r--src/rebar_prv_plugins_upgrade.erl17
-rw-r--r--src/rebar_prv_upgrade.erl13
-rw-r--r--src/rebar_utils.erl15
-rw-r--r--test/rebar_compile_SUITE.erl38
13 files changed, 119 insertions, 46 deletions
diff --git a/priv/templates/plugin.template b/priv/templates/plugin.template
index c0e36de..1230941 100644
--- a/priv/templates/plugin.template
+++ b/priv/templates/plugin.template
@@ -4,7 +4,7 @@
{desc, "A rebar plugin", "Short description of the plugin's purpose"}
]}.
{template, "plugin.erl", "{{name}}/src/{{name}}.erl"}.
-{template, "provider.erl", "{{name}}/src/prv_{{name}}_prv.erl"}.
+{template, "provider.erl", "{{name}}/src/{{name}}_prv.erl"}.
{template, "otp_lib.app.src", "{{name}}/src/{{name}}.app.src"}.
{template, "rebar.config", "{{name}}/rebar.config"}.
{template, "gitignore", "{{name}}/.gitignore"}.
diff --git a/src/rebar_app_discover.erl b/src/rebar_app_discover.erl
index 95b3273..a350235 100644
--- a/src/rebar_app_discover.erl
+++ b/src/rebar_app_discover.erl
@@ -102,13 +102,17 @@ app_dirs(LibDir) ->
"*.app.src"]),
Path2 = filename:join([LibDir,
+ "src",
+ "*.app.src.script"]),
+
+ Path3 = filename:join([LibDir,
"ebin",
"*.app"]),
lists:usort(lists:foldl(fun(Path, Acc) ->
Files = filelib:wildcard(ec_cnv:to_list(Path)),
[app_dir(File) || File <- Files] ++ Acc
- end, [], [Path1, Path2])).
+ end, [], [Path1, Path2, Path3])).
find_unbuilt_apps(LibDirs) ->
find_apps(LibDirs, invalid).
@@ -127,7 +131,8 @@ find_apps(LibDirs, Validate) ->
find_app(AppDir, Validate) ->
AppFile = filelib:wildcard(filename:join([AppDir, "ebin", "*.app"])),
AppSrcFile = filelib:wildcard(filename:join([AppDir, "src", "*.app.src"])),
- AppInfo = try_handle_app_file(AppFile, AppDir, AppSrcFile, Validate),
+ AppSrcScriptFile = filelib:wildcard(filename:join([AppDir, "src", "*.app.src.script"])),
+ AppInfo = try_handle_app_file(AppFile, AppDir, AppSrcFile, AppSrcScriptFile, Validate),
AppInfo.
app_dir(AppFile) ->
@@ -158,9 +163,11 @@ dedup([H|T]) -> [H|dedup(T)].
%% Read in and parse the .app file if it is availabe. Do the same for
%% the .app.src file if it exists.
-try_handle_app_file([], AppDir, AppSrcFile, Validate) ->
+try_handle_app_file([], AppDir, [], AppSrcScriptFile, Validate) ->
+ try_handle_app_src_file([], AppDir, AppSrcScriptFile, Validate);
+try_handle_app_file([], AppDir, AppSrcFile, _, Validate) ->
try_handle_app_src_file([], AppDir, AppSrcFile, Validate);
-try_handle_app_file([File], AppDir, AppSrcFile, Validate) ->
+try_handle_app_file([File], AppDir, AppSrcFile, _, Validate) ->
try create_app_info(AppDir, File) of
AppInfo ->
AppInfo1 = rebar_app_info:app_file(AppInfo, File),
@@ -195,7 +202,7 @@ try_handle_app_file([File], AppDir, AppSrcFile, Validate) ->
?DEBUG("Falling back to app.src file because .app failed: ~s", [Module:format_error(Reason)]),
try_handle_app_src_file(File, AppDir, AppSrcFile, Validate)
end;
-try_handle_app_file(Other, _AppDir, _AppSrcFile, _Validate) ->
+try_handle_app_file(Other, _AppDir, _AppSrcFile, _, _Validate) ->
throw({error, {multiple_app_files, Other}}).
%% Read in the .app.src file if we aren't looking for a valid (already built) app
@@ -210,7 +217,12 @@ try_handle_app_src_file(_, AppDir, [File], Validate) when Validate =:= invalid
{error, Reason} ->
throw({error, {invalid_app_file, File, Reason}});
_ ->
- {true, rebar_app_info:app_file_src(AppInfo, File)}
+ case filename:extension(File) of
+ ".script" ->
+ {true, rebar_app_info:app_file_src_script(AppInfo, File)};
+ _ ->
+ {true, rebar_app_info:app_file_src(AppInfo, File)}
+ end
end;
try_handle_app_src_file(_, _AppDir, Other, _Validate) ->
throw({error, {multiple_app_files, Other}}).
diff --git a/src/rebar_app_info.erl b/src/rebar_app_info.erl
index 6e35b8f..6962c5a 100644
--- a/src/rebar_app_info.erl
+++ b/src/rebar_app_info.erl
@@ -11,6 +11,8 @@
config/2,
app_file_src/1,
app_file_src/2,
+ app_file_src_script/1,
+ app_file_src_script/2,
app_file/1,
app_file/2,
app_details/1,
@@ -48,6 +50,7 @@
-record(app_info_t, {name :: binary(),
app_file_src :: file:filename_all() | undefined,
+ app_file_src_script:: file:filename_all() | undefined,
app_file :: file:filename_all() | undefined,
config :: rebar_state:t() | undefined,
original_vsn :: binary() | string() | undefined,
@@ -146,6 +149,22 @@ app_file_src(#app_info_t{app_file_src=AppFileSrc}) ->
app_file_src(AppInfo=#app_info_t{}, AppFileSrc) ->
AppInfo#app_info_t{app_file_src=ec_cnv:to_list(AppFileSrc)}.
+-spec app_file_src_script(t()) -> file:filename_all() | undefined.
+app_file_src_script(#app_info_t{app_file_src_script=undefined, dir=Dir, name=Name}) ->
+ AppFileSrcScript = filename:join([ec_cnv:to_list(Dir), "src", ec_cnv:to_list(Name)++".app.src.script"]),
+ case filelib:is_file(AppFileSrcScript) of
+ true ->
+ AppFileSrcScript;
+ false ->
+ undefined
+ end;
+app_file_src_script(#app_info_t{app_file_src_script=AppFileSrcScript}) ->
+ ec_cnv:to_list(AppFileSrcScript).
+
+-spec app_file_src_script(t(), file:filename_all()) -> t().
+app_file_src_script(AppInfo=#app_info_t{}, AppFileSrcScript) ->
+ AppInfo#app_info_t{app_file_src_script=ec_cnv:to_list(AppFileSrcScript)}.
+
-spec app_file(t()) -> file:filename_all() | undefined.
app_file(#app_info_t{app_file=undefined, out_dir=Dir, name=Name}) ->
AppFile = filename:join([ec_cnv:to_list(Dir), "ebin", ec_cnv:to_list(Name)++".app"]),
diff --git a/src/rebar_app_utils.erl b/src/rebar_app_utils.erl
index 3da00be..92c3ff8 100644
--- a/src/rebar_app_utils.erl
+++ b/src/rebar_app_utils.erl
@@ -58,7 +58,14 @@ is_app_src(Filename) ->
Filename =/= filename:rootname(Filename, ".app.src").
app_src_to_app(OutDir, Filename) ->
- AppFile = filename:join([OutDir, "ebin", filename:basename(Filename, ".app.src") ++ ".app"]),
+ AppFile =
+ case lists:suffix(".app.src", Filename) of
+ true ->
+ filename:join([OutDir, "ebin", filename:basename(Filename, ".app.src") ++ ".app"]);
+ false ->
+ filename:join([OutDir, "ebin", filename:basename(Filename,
+ ".app.src.script") ++ ".app"])
+ end,
filelib:ensure_dir(AppFile),
AppFile.
diff --git a/src/rebar_config.erl b/src/rebar_config.erl
index 3e06c38..d2b4a12 100644
--- a/src/rebar_config.erl
+++ b/src/rebar_config.erl
@@ -63,7 +63,8 @@ consult_file_(File) when is_binary(File) ->
consult_file_(File) ->
case filename:extension(File) of
".script" ->
- consult_and_eval(remove_script_ext(File), File);
+ {ok, Terms} = consult_and_eval(remove_script_ext(File), File),
+ [Terms];
_ ->
Script = File ++ ".script",
case filelib:is_regular(Script) of
diff --git a/src/rebar_otp_app.erl b/src/rebar_otp_app.erl
index 9f61e71..507da70 100644
--- a/src/rebar_otp_app.erl
+++ b/src/rebar_otp_app.erl
@@ -40,11 +40,17 @@ compile(State, App) ->
%% If we get an .app.src file, it needs to be pre-processed and
%% written out as a ebin/*.app file. That resulting file will then
%% be validated as usual.
- App1 = case rebar_app_info:app_file_src(App) of
+ App1 = case rebar_app_info:app_file_src_script(App) of
undefined ->
- App;
- AppFileSrc ->
- File = preprocess(State, App, AppFileSrc),
+ case rebar_app_info:app_file_src(App) of
+ undefined ->
+ App;
+ AppFileSrc ->
+ File = preprocess(State, App, AppFileSrc),
+ rebar_app_info:app_file(App, File)
+ end;
+ AppFileSrcScript ->
+ File = preprocess(State, App, AppFileSrcScript),
rebar_app_info:app_file(App, File)
end,
@@ -199,7 +205,8 @@ consult_app_file(Filename) ->
false ->
{error, enoent};
true ->
- case lists:suffix(".app.src", Filename) of
+ case lists:suffix(".app.src", Filename)
+ orelse lists:suffix(".app.src.script", Filename) of
false ->
file:consult(Filename);
true ->
diff --git a/src/rebar_plugins.erl b/src/rebar_plugins.erl
index 3e855de..bda3fb7 100644
--- a/src/rebar_plugins.erl
+++ b/src/rebar_plugins.erl
@@ -94,7 +94,8 @@ build_plugin(AppInfo, Apps, State) ->
Providers = rebar_state:providers(State),
Providers1 = rebar_state:providers(rebar_app_info:state(AppInfo)),
S = rebar_state:all_deps(rebar_app_info:state_or_new(State, AppInfo), Apps),
- rebar_prv_compile:compile(S, Providers++Providers1, AppInfo).
+ S1 = rebar_state:set(S, deps_dir, ?DEFAULT_PLUGINS_DIR),
+ rebar_prv_compile:compile(S1, Providers++Providers1, AppInfo).
plugin_providers({Plugin, _, _, _}) when is_atom(Plugin) ->
validate_plugin(Plugin);
diff --git a/src/rebar_prv_clean.erl b/src/rebar_prv_clean.erl
index e3cb84e..f10d12b 100644
--- a/src/rebar_prv_clean.erl
+++ b/src/rebar_prv_clean.erl
@@ -39,7 +39,7 @@ do(State) ->
case All of
true ->
DepsDir = rebar_dir:deps_dir(State),
- DepApps = rebar_app_discover:find_apps([DepsDir], all);
+ DepApps = rebar_app_discover:find_apps([filename:join(DepsDir, "*")], all);
false ->
DepApps = []
end,
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index 69956f0..c4fd985 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -524,9 +524,6 @@ parse_dep(Name, {SrcDepsAcc, PkgDepsAcc}, DepsDir, IsLock, State) when is_atom(N
parse_dep({Name, Source}, {SrcDepsAcc, PkgDepsAcc}, DepsDir, IsLock, State) when is_tuple(Source) ->
Dep = new_dep(DepsDir, Name, [], Source, IsLock, State),
{[Dep | SrcDepsAcc], PkgDepsAcc};
-parse_dep({Name, Source}, {SrcDepsAcc, PkgDepsAcc}, DepsDir, IsLock, State) when is_tuple(Source) ->
- Dep = new_dep(DepsDir, Name, [], Source, IsLock, State),
- {[Dep | SrcDepsAcc], PkgDepsAcc};
parse_dep({Name, _Vsn, Source}, {SrcDepsAcc, PkgDepsAcc}, DepsDir, IsLock, State) when is_tuple(Source) ->
Dep = new_dep(DepsDir, Name, [], Source, IsLock, State),
{[Dep | SrcDepsAcc], PkgDepsAcc};
diff --git a/src/rebar_prv_plugins_upgrade.erl b/src/rebar_prv_plugins_upgrade.erl
index f67b7dc..dfc9990 100644
--- a/src/rebar_prv_plugins_upgrade.erl
+++ b/src/rebar_prv_plugins_upgrade.erl
@@ -79,7 +79,7 @@ upgrade(Plugin, State) ->
find_plugin(Plugin, Profiles, State) ->
ec_lists:search(fun(Profile) ->
Plugins = rebar_state:get(State, {plugins, Profile}, []),
- case find(list_to_atom(Plugin), Plugins) of
+ case rebar_utils:tup_find(list_to_atom(Plugin), Plugins) of
false ->
not_found;
P ->
@@ -87,21 +87,6 @@ find_plugin(Plugin, Profiles, State) ->
end
end, Profiles).
-find(_Plugin, []) ->
- false;
-find(Plugin, [Plugin | _Plugins]) ->
- Plugin;
-find(Plugin, [Plugin1 | Plugins]) when is_tuple(Plugin1) ->
- case element(1, Plugin1) =:= Plugin of
- true ->
- Plugin1;
- false ->
- find(Plugin, Plugins)
- end;
-find(Plugin, [_Plugin | Plugins]) ->
- find(Plugin, Plugins).
-
-
build_plugin(AppInfo, Apps, State) ->
Providers = rebar_state:providers(State),
AppDir = rebar_app_info:dir(AppInfo),
diff --git a/src/rebar_prv_upgrade.erl b/src/rebar_prv_upgrade.erl
index 49d5674..46aed9e 100644
--- a/src/rebar_prv_upgrade.erl
+++ b/src/rebar_prv_upgrade.erl
@@ -94,21 +94,16 @@ prepare_locks([Name|Names], Deps, Locks, Unlocks) ->
AtomName = binary_to_atom(Name, utf8),
case lists:keyfind(Name, 1, Locks) of
{_, _, 0} = Lock ->
- case {lists:keyfind(AtomName, 1, Deps), lists:member(AtomName, Deps)} of
- {false, false} ->
+ case rebar_utils:tup_find(AtomName, Deps) of
+ false ->
?PRV_ERROR({unknown_dependency, Name});
- {Dep, false} ->
- {Source, NewLocks, NewUnlocks} = prepare_lock(Dep, Lock, Locks),
- prepare_locks(Names, Deps, NewLocks,
- [{Name, Source, 0} | NewUnlocks ++ Unlocks]);
- {false, true} -> % package as a single atom
- Dep = AtomName,
+ Dep ->
{Source, NewLocks, NewUnlocks} = prepare_lock(Dep, Lock, Locks),
prepare_locks(Names, Deps, NewLocks,
[{Name, Source, 0} | NewUnlocks ++ Unlocks])
end;
{_, _, Level} = Lock when Level > 0 ->
- case lists:keyfind(AtomName, 1, Deps) of
+ case rebar_utils:tup_find(AtomName, Deps) of
false ->
?PRV_ERROR({transitive_dependency, Name});
Dep -> % Dep has been promoted
diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl
index 6855773..7ae3d9c 100644
--- a/src/rebar_utils.erl
+++ b/src/rebar_utils.erl
@@ -56,6 +56,7 @@
wordsize/0,
tup_umerge/2,
tup_sort/1,
+ tup_find/2,
line_count/1,
set_httpc_options/0,
escape_chars/1,
@@ -266,6 +267,20 @@ tup_umerge([], Olds) ->
tup_umerge([New|News], Olds) ->
lists:reverse(umerge(News, Olds, [], New)).
+tup_find(_Elem, []) ->
+ false;
+tup_find(Elem, [Elem | _Elems]) ->
+ Elem;
+tup_find(Elem, [Elem1 | Elems]) when is_tuple(Elem1) ->
+ case element(1, Elem1) =:= Elem of
+ true ->
+ Elem1;
+ false ->
+ tup_find(Elem, Elems)
+ end;
+tup_find(Elem, [_Elem | Elems]) ->
+ tup_find(Elem, Elems).
+
%% This is equivalent to umerge2_2 in the stdlib, except we use the expanded
%% value/key only to compare
umerge(News, [Old|Olds], Merged, Cmp) when element(1, Cmp) == element(1, Old);
diff --git a/test/rebar_compile_SUITE.erl b/test/rebar_compile_SUITE.erl
index 6884a22..0aaa899 100644
--- a/test/rebar_compile_SUITE.erl
+++ b/test/rebar_compile_SUITE.erl
@@ -22,7 +22,8 @@
parse_transform_test/1,
erl_first_files_test/1,
mib_test/1,
- only_default_transitive_deps/1]).
+ only_default_transitive_deps/1,
+ clean_all/1]).
-include_lib("common_test/include/ct.hrl").
-include_lib("eunit/include/eunit.hrl").
@@ -50,7 +51,8 @@ all() ->
recompile_when_opts_change, dont_recompile_when_opts_dont_change,
dont_recompile_yrl_or_xrl, delete_beam_if_source_deleted,
deps_in_path, checkout_priority, highest_version_of_pkg_dep,
- parse_transform_test, erl_first_files_test, mib_test, only_default_transitive_deps].
+ parse_transform_test, erl_first_files_test, mib_test, only_default_transitive_deps,
+ clean_all].
build_basic_app(Config) ->
AppDir = ?config(apps, Config),
@@ -556,3 +558,35 @@ only_default_transitive_deps(Config) ->
Config, RConf, ["as", "test", "compile"],
{ok, [{app, Name}, {dep, "a", <<"1.0.0">>}, {dep_not_exist, PkgName}]}
).
+
+clean_all(Config) ->
+ AppDir = ?config(apps, Config),
+
+ Name = rebar_test_utils:create_random_name("app1_"),
+ Vsn = rebar_test_utils:create_random_vsn(),
+ rebar_test_utils:create_app(AppDir, Name, Vsn, [kernel, stdlib]),
+
+ DepName = rebar_test_utils:create_random_name("dep1_"),
+ PkgName = rebar_test_utils:create_random_name("pkg1_"),
+ mock_git_resource:mock([]),
+ mock_pkg_resource:mock([
+ {pkgdeps, [{{iolist_to_binary(PkgName), iolist_to_binary(Vsn)}, []}]}
+ ]),
+
+ RConfFile = rebar_test_utils:create_config(AppDir, [{deps, [
+ {list_to_atom(DepName), {git, "http://site.com/user/"++DepName++".git", {tag, Vsn}}},
+ {list_to_atom(PkgName), Vsn}
+ ]}]),
+ {ok, RConf} = file:consult(RConfFile),
+
+ %% Build things
+ rebar_test_utils:run_and_check(
+ Config, RConf, ["compile"],
+ {ok, [{app, Name}, {app, DepName}, {app, PkgName}]}
+ ),
+
+ %% Clean all
+ rebar_test_utils:run_and_check(
+ Config, RConf, ["clean", "--all"],
+ {ok, [{app, Name, invalid}, {app, DepName, invalid}, {app, PkgName, invalid}]}
+ ).
generated by cgit v1.1 at 2025-04-04 15:41:31 +0000