diff options
Diffstat (limited to 'rebar.config.script')
| -rw-r--r-- | rebar.config.script | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/rebar.config.script b/rebar.config.script index f3a975032..af25e61f4 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -139,6 +139,7 @@ SubDirs = [ "src/couch_expiring_cache", "src/global_changes", "src/ioq", + "src/jwtf", "src/ken", "src/mango", "src/rexi", @@ -146,7 +147,7 @@ SubDirs = [ "src/smoosh", "src/ebtree", "rel" -], +]. DepDescs = [ %% Independent Apps @@ -159,9 +160,9 @@ DepDescs = [ %% Non-Erlang deps {docs, {url, "https://github.com/apache/couchdb-documentation"}, - {tag, "3.0.0"}, [raw]}, + {tag, "3.1.0-RC1"}, [raw]}, {fauxton, {url, "https://github.com/apache/couchdb-fauxton"}, - {tag, "v1.2.2"}, [raw]}, + {tag, "v1.2.4"}, [raw]}, %% Third party deps {folsom, "folsom", {tag, "CouchDB-0.8.3"}}, {hyper, "hyper", {tag, "CouchDB-2.2.0-6"}}, @@ -174,18 +175,18 @@ DepDescs = [ {recon, "recon", {tag, "2.5.0"}}, {passage, "passage", {tag, "0.2.6"}}, {thrift_protocol, "thrift-protocol", {tag, "0.1.5"}} -], +]. -WithProper = lists:keyfind(with_proper, 1, CouchConfig) == {with_proper, true}, +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, +end. -BaseUrl = "https://github.com/apache/", +BaseUrl = "https://github.com/apache/". MakeDep = fun ({AppName, {url, Url}, Version}) -> @@ -198,12 +199,12 @@ MakeDep = fun ({AppName, RepoName, Version, Options}) -> Url = BaseUrl ++ "couchdb-" ++ RepoName ++ ".git", {AppName, ".*", {git, Url, Version}, Options} -end, +end. ErlOpts = case os:getenv("ERL_OPTS") of false -> []; Opts -> [list_to_atom(O) || O <- string:tokens(Opts, ",")] -end, +end. AddConfig = [ {require_otp_vsn, "19|20|21|22"}, @@ -218,11 +219,11 @@ AddConfig = [ {plt_location, local}, {plt_location, COUCHDB_ROOT}, {plt_extra_apps, [ - asn1, compiler, crypto, inets, kernel, os_mon, runtime_tools, + asn1, compiler, crypto, inets, kernel, runtime_tools, sasl, setup, ssl, stdlib, syntax_tools, xmerl]}, {warnings, [unmatched_returns, error_handling, race_conditions]}]}, {post_hooks, [{compile, "escript support/build_js.escript"}]} -], +]. lists:foldl(fun({K, V}, CfgAcc) -> case lists:keyfind(K, 1, CfgAcc) of |