summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Hebert <mononcqc@ferd.ca>2016-12-06 08:03:29 -0500
committerGitHub <noreply@github.com>2016-12-06 08:03:29 -0500
commit9f7e79d8157db06b3b03e033db87c2e811d938d2 (patch)
treeece1b62703875b2cb99f2311919dbed0323abcf1
parent41d4002b99e6494bdb4cb3471d55700765d40c07 (diff)
parent74d290b9c2be6352813c71ad6036a24ddacfae79 (diff)
Merge pull request #1403 from robertoaloi/fix-regexp-for-matching-files
Restrict regexp to match on files starting with '._'
-rw-r--r--src/rebar_base_compiler.erl2
-rw-r--r--src/rebar_erlc_compiler.erl2
-rw-r--r--src/rebar_prv_eunit.erl2
-rw-r--r--src/rebar_templater.erl2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/rebar_base_compiler.erl b/src/rebar_base_compiler.erl
index 5d54057..bfd79a5 100644
--- a/src/rebar_base_compiler.erl
+++ b/src/rebar_base_compiler.erl
@@ -54,7 +54,7 @@ run(Config, FirstFiles, SourceDir, SourceExt, TargetDir, TargetExt,
run(Config, FirstFiles, SourceDir, SourceExt, TargetDir, TargetExt,
Compile3Fn, Opts) ->
%% Convert simple extension to proper regex
- SourceExtRe = "^[^._].*\\" ++ SourceExt ++ [$$],
+ SourceExtRe = "^(?!._).*\\" ++ SourceExt ++ [$$],
Recursive = proplists:get_value(recursive, Opts, true),
%% Find all possible source files
diff --git a/src/rebar_erlc_compiler.erl b/src/rebar_erlc_compiler.erl
index 325bb4f..d4d257f 100644
--- a/src/rebar_erlc_compiler.erl
+++ b/src/rebar_erlc_compiler.erl
@@ -48,7 +48,7 @@
-type compile_opt() :: {recursive, boolean()}.
-define(DEFAULT_OUTDIR, "ebin").
--define(RE_PREFIX, "^[^._]").
+-define(RE_PREFIX, "^(?!._)").
%% ===================================================================
%% Public API
diff --git a/src/rebar_prv_eunit.erl b/src/rebar_prv_eunit.erl
index 0908ec9..6fdf33e 100644
--- a/src/rebar_prv_eunit.erl
+++ b/src/rebar_prv_eunit.erl
@@ -18,7 +18,7 @@
%% we need to modify app_info state before compile
-define(DEPS, [lock]).
--define(DEFAULT_TEST_REGEX, "^[^._].*\\.erl\$").
+-define(DEFAULT_TEST_REGEX, "^(?!._).*\\.erl\$").
%% ===================================================================
%% Public API
diff --git a/src/rebar_templater.erl b/src/rebar_templater.erl
index 299b957..7e0aae4 100644
--- a/src/rebar_templater.erl
+++ b/src/rebar_templater.erl
@@ -33,7 +33,7 @@
-include("rebar.hrl").
--define(TEMPLATE_RE, "^[^._].*\\.template\$").
+-define(TEMPLATE_RE, "^(?!._).*\\.template\$").
%% ===================================================================
%% Public API