#1858: Add code paths of plugins at the beginning of plugin compile

erlang · Aug 17, 2018 · e617e87 · e617e87
1 parent c96222e
commit e617e87
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/rebar_prv_compile.erl b/src/rebar_prv_compile.erl
@@ -127,6 +127,12 @@ compile(State, AppInfo) ->
     compile(State, rebar_state:providers(State), AppInfo).
 
 compile(State, Providers, AppInfo) ->
+    %% Load plugins back for make_vsn calls in custom resources.
+    %% The rebar_otp_app compilation step is safe regarding the
+    %% overall path management, so we can just load all plugins back
+    %% in memory.
+    PluginDepsPaths = rebar_state:code_paths(State, all_plugin_deps),
+    code:add_pathsa(PluginDepsPaths),
     ?INFO("Compiling ~ts", [rebar_app_info:name(AppInfo)]),
     AppDir = rebar_app_info:dir(AppInfo),
     AppInfo1 = rebar_hooks:run_all_hooks(AppDir, pre, ?PROVIDER,  Providers, AppInfo, State),
@@ -137,12 +143,6 @@ compile(State, Providers, AppInfo) ->
 
     AppInfo4 = rebar_hooks:run_all_hooks(AppDir, pre, ?APP_HOOK, Providers, AppInfo3, State),
 
-    %% Load plugins back for make_vsn calls in custom resources.
-    %% The rebar_otp_app compilation step is safe regarding the
-    %% overall path management, so we can just load all plugins back
-    %% in memory.
-    PluginDepsPaths = rebar_state:code_paths(State, all_plugin_deps),
-    code:add_pathsa(PluginDepsPaths),
     AppFileCompileResult = rebar_otp_app:compile(State, AppInfo4),
     %% Clean up after ourselves, leave things as they were.
     rebar_utils:remove_from_code_path(PluginDepsPaths),