Skip to content

Commit 5d9991b

Browse files
authored
Merge pull request #92 from clojerl/91-make-clojerl-compile-depend-on-default-compile
[#91] Make 'clojerl compile' depend on default 'compile'
2 parents 71508a4 + c79b7e1 commit 5d9991b

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

src/rebar3_clojerl_prv_compile.erl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-define(PROVIDER, compile).
88
-define(NAMESPACE, clojerl).
99
-define(NAMESPACE_PROVIDER, {?NAMESPACE, ?PROVIDER}).
10-
-define(DEPS, [{default, lock}]).
10+
-define(DEPS, [{default, compile}]).
1111

1212
-type config() :: #{ ebin_dir => file:name()
1313
, protocols_dir => file:name()
@@ -58,6 +58,10 @@ do(State) ->
5858
Providers = rebar_state:providers(State),
5959
rebar_hooks:run_all_hooks(Cwd, pre, ?NAMESPACE_PROVIDER, Providers, State),
6060

61+
%% The Erlang modules for clojerl have been compiled at this point.
62+
%% Make sure the clojerl application is available and started.
63+
ok = rebar3_clojerl_utils:ensure_clojerl(),
64+
6165
AllApps1 = compile_clojerl(AllApps0, Config, Providers, State),
6266
[compile(AppInfo, Config, Providers, State) || AppInfo <- AllApps1],
6367

@@ -166,10 +170,6 @@ compile(AppInfo0, Config0, Providers, State) ->
166170
, State
167171
),
168172

169-
%% The Erlang modules for clojerl have been compiled at this point.
170-
%% Make sure the clojerl application is available and started.
171-
ok = rebar3_clojerl_utils:ensure_clojerl(),
172-
173173
Graph = load_graph(AppInfo),
174174
Config1 = Config0#{graph => Graph},
175175
AppName = rebar_app_info:name(AppInfo),

src/rebar3_clojerl_prv_escriptize.erl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
-define(PROVIDER, escriptize).
88
-define(NAMESPACE, clojerl).
9-
-define(NAMESPACE_PROVIDER, {?NAMESPACE, ?PROVIDER}).
109
-define(DEPS, [{?NAMESPACE, compile}]).
1110

1211
%% =============================================================================

src/rebar3_clojerl_prv_release.erl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
-define(PROVIDER, release).
66
-define(NAMESPACE, clojerl).
7-
-define(NAMESPACE_PROVIDER, {?NAMESPACE, ?PROVIDER}).
87
-define(DEPS, [{?NAMESPACE, compile}]).
98

109
%% =============================================================================

0 commit comments

Comments
 (0)