You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2019/02/28 19:58:44 UTC
[couchdb] branch master updated: Make PropEr an optional (test)
dependency
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git
The following commit(s) were added to refs/heads/master by this push:
new 8d65907 Make PropEr an optional (test) dependency
new 5765a54 Merge pull request #1955 from apache/optional-proper
8d65907 is described below
commit 8d659073e5409d040423b6a7a04ac5bb3de7d741
Author: Robert Newson <rn...@apache.org>
AuthorDate: Thu Feb 28 14:01:53 2019 +0000
Make PropEr an optional (test) dependency
---
configure | 8 ++++++++
rebar.config.script | 22 +++++++++++++++++++---
2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index b9a021d..bcd7619 100755
--- a/configure
+++ b/configure
@@ -23,6 +23,7 @@ PACKAGE_AUTHOR_NAME="The Apache Software Foundation"
# TEST=0
WITH_CURL="false"
+WITH_PROPER="true"
WITH_FAUXTON=1
WITH_DOCS=1
ERLANG_MD5="false"
@@ -68,6 +69,12 @@ parse_opts() {
continue
;;
+ --without-proper)
+ WITH_PROPER="false"
+ shift
+ continue
+ ;;
+
--disable-fauxton)
WITH_FAUXTON=0
shift
@@ -203,6 +210,7 @@ EOF
cat > $rootdir/config.erl << EOF
{with_curl, $WITH_CURL}.
+{with_proper, $WITH_PROPER}.
{erlang_md5, $ERLANG_MD5}.
EOF
diff --git a/rebar.config.script b/rebar.config.script
index 5de05e0..7072d4d 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -56,6 +56,14 @@ os:putenv("COUCHDB_ROOT", COUCHDB_ROOT).
ConfigureEnv = filename:join(COUCHDB_ROOT, "config.erl").
os:putenv("COUCHDB_CONFIG", ConfigureEnv).
+CouchConfig = case filelib:is_file(ConfigureEnv) of
+ true ->
+ {ok, Result} = file:consult(ConfigureEnv),
+ Result;
+ false ->
+ []
+end.
+
os:putenv("COUCHDB_APPS_CONFIG_DIR", filename:join([COUCHDB_ROOT, "rel/apps"])).
SubDirs = [
@@ -90,8 +98,8 @@ DepDescs = [
{ets_lru, "ets-lru", {tag, "1.0.0"}},
{khash, "khash", {tag, "1.0.1"}},
{snappy, "snappy", {tag, "CouchDB-1.0.2"}},
-{ioq, "ioq", {tag, "2.0.0"}},
-{hqueue, "hqueue", {tag, "1.0.0"}},
+{ioq, "ioq", {tag, "2.1.0"}},
+{hqueue, "hqueue", {tag, "1.0.1"}},
{smoosh, "smoosh", {tag, "1.0.1"}},
{ken, "ken", {tag, "1.0.3"}},
@@ -109,6 +117,14 @@ DepDescs = [
{meck, "meck", {tag, "0.8.8"}}
],
+WithProper = lists:keyfind(with_proper, 1, CouchConfig) == {with_proper, true},
+
+OptionalDeps = case WithProper of
+ true ->
+ [{proper, {url, "https://github.com/proper-testing/proper"}, {tag, "v1.3"}}];
+ false ->
+ []
+end,
BaseUrl = "https://github.com/apache/",
@@ -133,7 +149,7 @@ end,
AddConfig = [
{require_otp_vsn, "19|20|21"},
{deps_dir, "src"},
- {deps, lists:map(MakeDep, DepDescs)},
+ {deps, lists:map(MakeDep, DepDescs ++ OptionalDeps)},
{sub_dirs, SubDirs},
{lib_dirs, ["src"]},
{erl_opts, [{i, "../"} | ErlOpts]},