You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2015/06/01 22:42:21 UTC
[27/50] rebar commit: updated refs/heads/import to e9f62c4
Fix a few minor formatting inconsistencies
* fix overlong lines
* where appropriate use %% instead of %
Project: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/commit/5f995bfd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/tree/5f995bfd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-rebar/diff/5f995bfd
Branch: refs/heads/import
Commit: 5f995bfdc007c7f8c23d2b933a40627c1f311a04
Parents: 0d1ae7a
Author: Tuncer Ayaz <tu...@gmail.com>
Authored: Sun Jun 29 20:15:43 2014 +0200
Committer: Tuncer Ayaz <tu...@gmail.com>
Committed: Sun Jun 29 21:13:45 2014 +0200
----------------------------------------------------------------------
bootstrap | 9 +++++----
rebar.config | 14 ++++++++++----
src/rebar_config.erl | 4 ++--
src/rebar_erlc_compiler.erl | 4 ++--
4 files changed, 19 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-rebar/blob/5f995bfd/bootstrap
----------------------------------------------------------------------
diff --git a/bootstrap b/bootstrap
index f6aa6cc..ad27898 100755
--- a/bootstrap
+++ b/bootstrap
@@ -28,10 +28,11 @@ main(Args) ->
%% Extract the system info of the version of OTP we use to compile rebar
OtpInfo = string:strip(erlang:system_info(otp_release), both, $\n),
- %% Types dict:dict() and digraph:digraph() have been introduced in Erlang 17.
- %% At the same time, their counterparts dict() and digraph() are to be deprecated
- %% in Erlang 18. namespaced_types option is used to select proper type name
- %% depending of the OTP version used.
+ %% Types dict:dict() and digraph:digraph() have been introduced in
+ %% Erlang 17.
+ %% At the same time, their counterparts dict() and digraph() are to be
+ %% deprecated in Erlang 18. namespaced_types option is used to select
+ %% proper type name depending of the OTP version used.
NamespacedTypes = case is_otp(OtpInfo, "^[0-9]+") of
true -> {d, namespaced_types};
false -> undefined
http://git-wip-us.apache.org/repos/asf/couchdb-rebar/blob/5f995bfd/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
index bf4ef4f..a64f00e 100644
--- a/rebar.config
+++ b/rebar.config
@@ -4,11 +4,17 @@
%% escript_incl_extra is for internal rebar-private use only.
%% Do not use outside rebar. Config interface is not stable.
{escript_incl_extra, [{"priv/templates/*", "."}]}.
+
%% Types dict:dict() and digraph:digraph() have been introduced in Erlang 17.
-%% At the same time, their counterparts dict() and digraph() are to be deprecated
-%% in Erlang 18. namespaced_types option is used to select proper type name
-%% depending of the OTP version used.
-{erl_opts, [{platform_define, "^[0-9]+", namespaced_types}, warnings_as_errors]}.
+%% At the same time, their counterparts dict() and digraph() are to be
+%% deprecated in Erlang 18. namespaced_types option is used to select proper
+%% type name depending of the OTP version used.
+{erl_opts,
+ [
+ {platform_define, "^[0-9]+", namespaced_types},
+ warnings_as_errors
+ ]}.
+
{xref_checks, []}.
{xref_queries,
[{"(XC - UC) || (XU - X - B
http://git-wip-us.apache.org/repos/asf/couchdb-rebar/blob/5f995bfd/src/rebar_config.erl
----------------------------------------------------------------------
diff --git a/src/rebar_config.erl b/src/rebar_config.erl
index 1c90d22..0127aff 100644
--- a/src/rebar_config.erl
+++ b/src/rebar_config.erl
@@ -40,10 +40,10 @@
-include("rebar.hrl").
-ifdef(namespaced_types).
-% dict:dict() exists starting from Erlang 17.
+%% dict:dict() exists starting from Erlang 17.
-type rebar_dict() :: dict:dict().
-else.
-% dict() has been obsoleted in Erlang 17 and deprecated in 18.
+%% dict() has been obsoleted in Erlang 17 and deprecated in 18.
-type rebar_dict() :: dict().
-endif.
http://git-wip-us.apache.org/repos/asf/couchdb-rebar/blob/5f995bfd/src/rebar_erlc_compiler.erl
----------------------------------------------------------------------
diff --git a/src/rebar_erlc_compiler.erl b/src/rebar_erlc_compiler.erl
index 376cde5..ae4503b 100644
--- a/src/rebar_erlc_compiler.erl
+++ b/src/rebar_erlc_compiler.erl
@@ -48,10 +48,10 @@
}).
-ifdef(namespaced_types).
-% digraph:digraph() exists starting from Erlang 17.
+%% digraph:digraph() exists starting from Erlang 17.
-type rebar_digraph() :: digraph:digraph().
-else.
-% digraph() has been obsoleted in Erlang 17 and deprecated in 18.
+%% digraph() has been obsoleted in Erlang 17 and deprecated in 18.
-type rebar_digraph() :: digraph().
-endif.