summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Hebert <mononcqc@ferd.ca>2015-10-12 17:00:26 +0000
committerFred Hebert <mononcqc@ferd.ca>2015-10-12 17:00:26 +0000
commit4ad998b7187a5910304ffeef867571400b6b4c61 (patch)
tree0a074883cdcfab97737384294bee2dc49c86b2d1
parent2754214bd3e310646101f0de350b02faeb372dbf (diff)
Support proper paths in non-erl first files
This passes the directory to the option to ensure it works with more than configs at the root of the project.
-rw-r--r--src/rebar_erlc_compiler.erl12
-rw-r--r--test/rebar_compile_SUITE.erl53
2 files changed, 57 insertions, 8 deletions
diff --git a/src/rebar_erlc_compiler.erl b/src/rebar_erlc_compiler.erl
index 2976a4f..b9192c3 100644
--- a/src/rebar_erlc_compiler.erl
+++ b/src/rebar_erlc_compiler.erl
@@ -89,18 +89,18 @@ compile(AppInfo) ->
-spec compile(rebar_dict(), file:name(), file:name()) -> 'ok'.
compile(Opts, Dir, OutDir) ->
rebar_base_compiler:run(Opts,
- check_files(rebar_opts:get(
- Opts, xrl_first_files, [])),
+ check_files([filename:join(Dir, File)
+ || File <- rebar_opts:get(Opts, xrl_first_files, [])]),
filename:join(Dir, "src"), ".xrl", filename:join(Dir, "src"), ".erl",
fun compile_xrl/3),
rebar_base_compiler:run(Opts,
- check_files(rebar_opts:get(
- Opts, yrl_first_files, [])),
+ check_files([filename:join(Dir, File)
+ || File <- rebar_opts:get(Opts, yrl_first_files, [])]),
filename:join(Dir, "src"), ".yrl", filename:join(Dir, "src"), ".erl",
fun compile_yrl/3),
rebar_base_compiler:run(Opts,
- check_files(rebar_opts:get(
- Opts, mib_first_files, [])),
+ check_files([filename:join(Dir, File)
+ || File <- rebar_opts:get(Opts, mib_first_files, [])]),
filename:join(Dir, "mibs"), ".mib", filename:join([Dir, "priv", "mibs"]), ".bin",
fun compile_mib/3),
doterl_compile(Opts, Dir, OutDir).
diff --git a/test/rebar_compile_SUITE.erl b/test/rebar_compile_SUITE.erl
index 7750924..561e657 100644
--- a/test/rebar_compile_SUITE.erl
+++ b/test/rebar_compile_SUITE.erl
@@ -22,6 +22,7 @@
parse_transform_test/1,
erl_first_files_test/1,
mib_test/1,
+ umbrella_mib_first_test/1,
only_default_transitive_deps/1,
clean_all/1,
override_deps/1,
@@ -54,7 +55,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,
+ umbrella_mib_first_test, only_default_transitive_deps,
clean_all, override_deps, profile_override_deps, build_more_sources].
build_basic_app(Config) ->
@@ -496,7 +498,7 @@ erl_first_files_test(Config) ->
mib_test(Config) ->
AppDir = ?config(apps, Config),
- RebarConfig = [],
+ RebarConfig = [{mib_first_files, ["mibs/SIMPLE-MIB.mib"]}],
Name = rebar_test_utils:create_random_name("app1_"),
Vsn = rebar_test_utils:create_random_vsn(),
@@ -538,6 +540,53 @@ mib_test(Config) ->
%% check the extra src_dir was linked into the _build dir
true = filelib:is_dir(filename:join([AppDir, "_build", "default", "lib", Name, "mibs"])).
+umbrella_mib_first_test(Config) ->
+ AppsDir = ?config(apps, Config),
+
+ Name = rebar_test_utils:create_random_name("app1_"),
+ Vsn = rebar_test_utils:create_random_vsn(),
+ AppDir = filename:join([AppsDir, "apps", Name]),
+
+ rebar_test_utils:create_app(AppDir, Name, Vsn, [kernel, stdlib]),
+
+ MibsSrc = <<"-- SIMPLE-MIB.\n"
+"-- This is just a simple MIB used for testing!\n"
+"--\n"
+"SIMPLE-MIB DEFINITIONS ::= BEGIN\n"
+"IMPORTS\n"
+" MODULE-IDENTITY, enterprises\n"
+" FROM SNMPv2-SMI;\n"
+"\n"
+"ericsson MODULE-IDENTITY\n"
+" LAST-UPDATED\n"
+" \"201403060000Z\"\n"
+" ORGANIZATION\n"
+" \"rebar\"\n"
+" CONTACT-INFO\n"
+" \"rebar <rebar@example.com>\n"
+" or\n"
+" whoever is currently responsible for the SIMPLE\n"
+" enterprise MIB tree branch (enterprises.999).\"\n"
+" DESCRIPTION\n"
+" \"This very small module is made available\n"
+" for mib-compilation testing.\"\n"
+" ::= { enterprises 999 }\n"
+"END\n">>,
+
+ ok = filelib:ensure_dir(filename:join([AppDir, "mibs", "dummy"])),
+ ok = file:write_file(filename:join([AppDir, "mibs", "SIMPLE-MIB.mib"]), MibsSrc),
+
+ RebarConfig = [{mib_first_files, ["mibs/SIMPLE-MIB.mib"]}],
+
+ rebar_test_utils:run_and_check(Config, RebarConfig, ["compile"], {ok, [{app, Name}]}),
+
+ %% check a beam corresponding to the src in the extra src_dir exists in ebin
+ PrivMibsDir = filename:join([AppsDir, "_build", "default", "lib", Name, "priv", "mibs"]),
+ true = filelib:is_file(filename:join([PrivMibsDir, "SIMPLE-MIB.bin"])),
+
+ %% check the extra src_dir was linked into the _build dir
+ true = filelib:is_dir(filename:join([AppsDir, "_build", "default", "lib", Name, "mibs"])).
+
only_default_transitive_deps(Config) ->
AppDir = ?config(apps, Config),