Request 1436 (accepted)

Overview

Request 1436 (accepted)

Submit erlang-rebar to Winterfell

Created by vanmeeuwen almost 9 years ago
In state accepted

Submit erlang-rebar

Submit package Kolab:Development / erlang-rebar to package Kolab:Winterfell / erlang-rebar

erlang-rebar.spec Added

@@ -0,0 +1,211 @@
+%if 0%{?opensuse_bs}
+#!BuildIgnore:  ghostscript-x11
+%endif
+
+%global realname rebar
+%global upstream rebar
+%global debug_package %{nil}
+%global git_tag e9f62c4
+%global patchnumber 0
+
+# Set this to true when starting a rebuild of the whole erlang stack. There's
+# a cyclical dependency between erlang-rebar and erlang-getopt so this package
+# (rebar) needs to get built first in bootstrap mode.
+%global bootstrap 0
+
+Name:           erlang-%{realname}
+Version:        2.5.1
+Release:        1%{?dist}
+Summary:        Erlang Build Tools
+Group:          Development/Tools
+License:        MIT
+URL:            https://github.com/rebar/rebar
+# wget --content-disposition https://github.com/rebar/rebar/tarball/2.5.1
+Source0:        %{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz
+Source1:        rebar.escript
+
+Patch1:         0001-Don-t-load-templates-from-the-bundle.patch
+
+Patch2:         0002-Unbundle-mustache.patch
+
+# The bundled getopt is necessary to do the initial bootstrap since
+# erlang-getopt requires erlang-rebar to build and vice versa.
+%if 0%{?bootstrap} < 1
+# Fedora/EPEL-specific
+Patch3:         0003-Unbundle-getopt.patch
+%endif
+
+Patch4:         0004-Allow-discarding-building-ports.patch
+Patch5:         0005-Check-system-wide-libdir-in-case-of-source-based-dep.patch
+Patch6:         0006-Remove-any-traces-of-long-time-obsolete-escript-fold.patch
+Patch7:         0007-Remove-abnfc-compiler-support-n-a-in-Fedora-EPEL.patch
+
+%if 0%{?bootstrap} < 1
+BuildRequires:  erlang-rebar >= 0.1
+%else
+BuildRequires:  erlang
+%endif
+
+%if 0%{?bootstrap} < 1
+Requires:       erlang-erlydtl%{?_isa}
+Requires:       erlang-lfe%{?_isa}
+Requires:       erlang-neotoma%{?_isa}
+Requires:       erlang-protobuffs%{?_isa}
+%endif
+
+# FIXME wip
+#Requires:       erlang-abnfc%{?_isa}
+Requires:       erlang-asn1%{?_isa}
+Requires:       erlang-common_test%{?_isa}
+Requires:       erlang-compiler%{?_isa}
+Requires:       erlang-crypto%{?_isa}
+# FIXME does it still needed?
+Requires:       erlang-dialyzer%{?_isa}
+Requires:       erlang-edoc%{?_isa}
+Requires:       erlang-erts%{?_isa}
+# Requires for port compiling - no direct references in Rebar's src/*.erl files
+Requires:       erlang-erl_interface%{?_isa}
+# Autochecker picks up a missing dependency in R16 -
+# eunit_test:function_wrapper/2.  This function was removed in R16, and rebar
+# contains a workaround for that. So no need to worry about that.
+Requires:       erlang-eunit%{?_isa}
+Requires:       erlang-kernel%{?_isa}
+Requires:       erlang-mustache%{?_isa}
+Requires:       erlang-parsetools%{?_isa}
+Requires:       erlang-reltool%{?_isa}
+Requires:       erlang-sasl%{?_isa}
+Requires:       erlang-snmp%{?_isa}
+Requires:       erlang-stdlib%{?_isa}
+Requires:       erlang-syntax_tools%{?_isa}
+Requires:       erlang-tools%{?_isa}
+Provides:       %{realname} = %{version}-%{release}
+%if 0%{?bootstrap} < 1
+Requires:       erlang-getopt%{?_isa}
+%endif
+
+%description
+Erlang Build Tools.
+
+%prep
+%setup -q -n %{upstream}-%{realname}-57ea1c5
+%patch1 -p1
+
+%if 0
+%patch2 -p1
+%if 0%{?bootstrap} < 1
+%patch3 -p1
+%endif
+%endif
+
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+
+
+%build
+%if 0%{?bootstrap} < 1
+rebar compile -v
+%else
+./bootstrap
+./rebar compile -v
+%endif
+
+
+%install
+install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/rebar
+mkdir -p %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin
+mkdir -p %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/include
+install -m 644 ebin/%{realname}.app %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin
+install -m 644 ebin/*.beam %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin
+install -m 644 include/*.hrl %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/include
+cp -a priv %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/
+
+
+%check
+#rebar eunit -v
+
+
+%files
+%doc LICENSE NOTES.org README.md THANKS rebar.config.sample
+%{_bindir}/rebar
+%{_libdir}/erlang/lib/%{realname}-%{version}
+
+%changelog
+* Mon May 18 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.1-1
+- Use the upstream version of rebar
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-0.9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-0.8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sat Mar 8 2014 Sam Kottler <skottler@fedoraproject.org> - 2.1.0-0.7
+- Add bootstrap variable and necessary conditionals for building without external getopt
+
+* Sun Sep 01 2013 Peter Lemenkov <lemenkov@gmail.com> - 2.1.0-0.5
+- Added missing runtime requirements
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-0.5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue Mar 12 2013 Peter Lemenkov <lemenkov@gmail.com> - 2.1.0-0.4
+- backported fix for ErlyDTL templates compilation
+
+* Wed Mar 06 2013 Peter Lemenkov <lemenkov@gmail.com> - 2.1.0-0.3
+- Don't bootstrap anymore - use rebar for building rebar
+
+* Sun Mar 03 2013 Peter Lemenkov <lemenkov@gmail.com> - 2.1.0-0.2
+- Backported fix for suppress building *.so libraries everytime
+
+* Sat Mar 02 2013 Peter Lemenkov <lemenkov@gmail.com> - 2.1.0-0.1
+- Ver. 2.1.0-pre
+- Remove R12B-related patches (EL5-related)
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Tue Dec 18 2012 Peter Lemenkov <lemenkov@gmail.com> - 2.0.0-3
+- Fix templates
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Jun 05 2012 Peter Lemenkov <lemenkov@gmail.com> - 2.0.0-1
+- Ver. 2.0.0
+
+* Tue May 22 2012 Peter Lemenkov <lemenkov@gmail.com> - 2-9.20120514git635d1a9
+- Fix building in EL6 and Fedora
+
+* Mon May 21 2012 Peter Lemenkov <lemenkov@gmail.com> - 2-8.20120514git635d1a9
+- Explicitly list erlang-erl_interface as a dependency
+- Fixed EPEL5 dependencies
+
+* Sun May 20 2012 Peter Lemenkov <lemenkov@gmail.com> - 2-7.20120514git635d1a9
+- Enable building on EL5 (remove erlydtl-related stuff on el5)
+- Remove abnfc-related stff until we package it
+
+* Wed May 16 2012 Peter Lemenkov <lemenkov@gmail.com> - 2-6.20120514git635d1a9
+- Updated to the latest git snapshot
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-5.20101120git90058c7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2-4.20101120git90058c7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Nov 22 2010 Peter Lemenkov <lemenkov@gmail.com> - 2-3.20101120git90058c7
+- Added missing buildrequires
+
+* Sat Nov 20 2010 Peter Lemenkov <lemenkov@gmail.com> - 2-2.20101120git90058c7
+- Removed bundled mustache and getopt
+- Fixed license tag
+- Removed wrong license text from package
+- Simplified %%files section
+- Fixed links (project was moved to GitHub)
+- Changed versioning scheme (post-release)
+
+* Sun Sep  5 2010 Peter Lemenkov <lemenkov@gmail.com> - 2-1
+- Initial build
+

0001-Don-t-load-templates-from-the-bundle.patch Added

@@ -0,0 +1,71 @@
+From 4c221409234ce24cedce19c56efa5e2192b0970c Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
+Date: Mon, 18 May 2015 11:45:03 +0200
+Subject: [PATCH 1/7] Don't load templates from the bundle
+
+---
+ src/rebar_templater.erl | 31 +++++--------------------------
+ 1 file changed, 5 insertions(+), 26 deletions(-)
+
+diff --git a/src/rebar_templater.erl b/src/rebar_templater.erl
+index dd89f3a..4c237a2 100644
+--- a/src/rebar_templater.erl
++++ b/src/rebar_templater.erl
+@@ -205,27 +205,11 @@ create1(Config, TemplateId) ->
+     execute_template(Files, FinalTemplate, Type, Template, Context, Force, []).
+ 
+ find_templates(Config) ->
+-    %% Load a list of all the files in the escript -- cache them since
+-    %% we'll potentially need to walk it several times over the course of
+-    %% a run.
+-    Files = cache_escript_files(Config),
+-
+     %% Build a list of available templates
+     AvailTemplates = find_disk_templates(Config)
+-        ++ find_escript_templates(Files),
+-
+-    {AvailTemplates, Files}.
++        ++ find_escript_templates(),
+ 
+-%%
+-%% Scan the current escript for available files
+-%%
+-cache_escript_files(Config) ->
+-    {ok, Files} = rebar_utils:escript_foldl(
+-                    fun(Name, _, GetBin, Acc) ->
+-                            [{Name, GetBin()} | Acc]
+-                    end,
+-                    [], rebar_config:get_xconf(Config, escript)),
+-    Files.
++    {AvailTemplates, []}.
+ 
+ template_id(Config) ->
+     case rebar_config:get_global(Config, template, undefined) of
+@@ -235,10 +219,8 @@ template_id(Config) ->
+             TemplateId
+     end.
+ 
+-find_escript_templates(Files) ->
+-    [{escript, Name}
+-     || {Name, _Bin} <- Files,
+-        re:run(Name, ?TEMPLATE_RE, [{capture, none}]) == match].
++find_escript_templates() ->
++    [{file, Name} || Name <- rebar_utils:find_files(code:priv_dir(rebar) ++ "/templates", ?TEMPLATE_RE)].
+ 
+ find_disk_templates(Config) ->
+     OtherTemplates = find_other_templates(Config),
+@@ -270,10 +252,7 @@ select_template([{Type, Avail} | Rest], Template) ->
+ %%
+ %% Read the contents of a file from the appropriate source
+ %%
+-load_file(Files, escript, Name) ->
+-    {Name, Bin} = lists:keyfind(Name, 1, Files),
+-    Bin;
+-load_file(_Files, file, Name) ->
++load_file(_Files, _, Name) ->
+     {ok, Bin} = file:read_file(Name),
+     Bin.
+ 
+-- 
+2.1.0
+

0002-Unbundle-mustache.patch Added

@@ -0,0 +1,264 @@
+From f4b1720e7f58feaa415473c353f3e5c2d390e74a Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
+Date: Mon, 18 May 2015 11:45:34 +0200
+Subject: [PATCH 2/7] Unbundle mustache
+
+---
+ ebin/rebar.app         |   3 +-
+ src/rebar_mustache.erl | 230 -------------------------------------------------
+ 2 files changed, 1 insertion(+), 232 deletions(-)
+ delete mode 100644 src/rebar_mustache.erl
+
+diff --git a/ebin/rebar.app b/ebin/rebar.app
+index 55454e9..9a81f90 100644
+--- a/ebin/rebar.app
++++ b/ebin/rebar.app
+@@ -40,8 +40,7 @@
+               rebar_utils,
+               rebar_xref,
+               rebar_metacmds,
+-              rebar_getopt,
+-              rebar_mustache ]},
++              rebar_getopt ]},
+   {registered, []},
+   {applications, [kernel,
+                   stdlib,
+diff --git a/src/rebar_mustache.erl b/src/rebar_mustache.erl
+deleted file mode 100644
+index 9016c0f..0000000
+--- a/src/rebar_mustache.erl
++++ /dev/null
+@@ -1,230 +0,0 @@
+-%% The MIT License
+-%%
+-%% Copyright (c) 2009 Tom Preston-Werner <tom@mojombo.com>
+-%%
+-%% Permission is hereby granted, free of charge, to any person obtaining a copy
+-%% of this software and associated documentation files (the "Software"), to deal
+-%% in the Software without restriction, including without limitation the rights
+-%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+-%% copies of the Software, and to permit persons to whom the Software is
+-%% furnished to do so, subject to the following conditions:
+-%%
+-%% The above copyright notice and this permission notice shall be included in
+-%% all copies or substantial portions of the Software.
+-%%
+-%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+-%% THE SOFTWARE.
+-
+-%% See the README at http://github.com/mojombo/mustache.erl for additional
+-%% documentation and usage examples.
+-
+--module(rebar_mustache).  %% v0.1.0
+--author("Tom Preston-Werner").
+--export([compile/1, compile/2, render/1, render/2, render/3, get/2, get/3, escape/1, start/1]).
+-
+--record(mstate, {mod = undefined,
+-                 section_re = undefined,
+-                 tag_re = undefined}).
+-
+--define(MUSTACHE_STR, "rebar_mustache").
+-
+-compile(Body) when is_list(Body) ->
+-  State = #mstate{},
+-  CompiledTemplate = pre_compile(Body, State),
+-  % io:format("~p~n~n", [CompiledTemplate]),
+-  % io:format(CompiledTemplate ++ "~n", []),
+-  {ok, Tokens, _} = erl_scan:string(CompiledTemplate),
+-  {ok, [Form]} = erl_parse:parse_exprs(Tokens),
+-  Bindings = erl_eval:new_bindings(),
+-  {value, Fun, _} = erl_eval:expr(Form, Bindings),
+-  Fun;
+-compile(Mod) ->
+-  TemplatePath = template_path(Mod),
+-  compile(Mod, TemplatePath).
+-
+-compile(Mod, File) ->
+-  code:purge(Mod),
+-  {module, _} = code:load_file(Mod),
+-  {ok, TemplateBin} = file:read_file(File),
+-  Template = re:replace(TemplateBin, "\"", "\\\\\"", [global, {return,list}]),
+-  State = #mstate{mod = Mod},
+-  CompiledTemplate = pre_compile(Template, State),
+-  % io:format("~p~n~n", [CompiledTemplate]),
+-  % io:format(CompiledTemplate ++ "~n", []),
+-  {ok, Tokens, _} = erl_scan:string(CompiledTemplate),
+-  {ok, [Form]} = erl_parse:parse_exprs(Tokens),
+-  Bindings = erl_eval:new_bindings(),
+-  {value, Fun, _} = erl_eval:expr(Form, Bindings),
+-  Fun.
+-
+-render(Mod) ->
+-  TemplatePath = template_path(Mod),
+-  render(Mod, TemplatePath).
+-
+-render(Body, Ctx) when is_list(Body) ->
+-  TFun = compile(Body),
+-  render(undefined, TFun, Ctx);
+-render(Mod, File) when is_list(File) ->
+-  render(Mod, File, dict:new());
+-render(Mod, CompiledTemplate) ->
+-  render(Mod, CompiledTemplate, dict:new()).
+-
+-render(Mod, File, Ctx) when is_list(File) ->
+-  CompiledTemplate = compile(Mod, File),
+-  render(Mod, CompiledTemplate, Ctx);
+-render(Mod, CompiledTemplate, Ctx) ->
+-  Ctx2 = dict:store('__mod__', Mod, Ctx),
+-  lists:flatten(CompiledTemplate(Ctx2)).
+-
+-pre_compile(T, State) ->
+-  SectionRE = "\{\{\#([^\}]*)}}\s*(.+?){{\/\\1\}\}\s*",
+-  {ok, CompiledSectionRE} = re:compile(SectionRE, [dotall]),
+-  TagRE = "\{\{(#|=|!|<|>|\{)?(.+?)\\1?\}\}+",
+-  {ok, CompiledTagRE} = re:compile(TagRE, [dotall]),
+-  State2 = State#mstate{section_re = CompiledSectionRE, tag_re = CompiledTagRE},
+-  "fun(Ctx) -> " ++
+-    "CFun = fun(A, B) -> A end, " ++
+-    compiler(T, State2) ++ " end.".
+-
+-compiler(T, State) ->
+-  Res = re:run(T, State#mstate.section_re),
+-  case Res of
+-    {match, [{M0, M1}, {N0, N1}, {C0, C1}]} ->
+-      Front = string:substr(T, 1, M0),
+-      Back = string:substr(T, M0 + M1 + 1),
+-      Name = string:substr(T, N0 + 1, N1),
+-      Content = string:substr(T, C0 + 1, C1),
+-      "[" ++ compile_tags(Front, State) ++
+-        " | [" ++ compile_section(Name, Content, State) ++
+-        " | [" ++ compiler(Back, State) ++ "]]]";
+-    nomatch ->
+-      compile_tags(T, State)
+-  end.
+-
+-compile_section(Name, Content, State) ->
+-  Mod = State#mstate.mod,
+-  Result = compiler(Content, State),
+-  "fun() -> " ++
+-    "case " ++ ?MUSTACHE_STR ++ ":get(" ++ Name ++ ", Ctx, " ++ atom_to_list(Mod) ++ ") of " ++
+-      "\"true\" -> " ++
+-        Result ++ "; " ++
+-      "\"false\" -> " ++
+-        "[]; " ++
+-      "List when is_list(List) -> " ++
+-        "[fun(Ctx) -> " ++ Result ++ " end(dict:merge(CFun, SubCtx, Ctx)) || SubCtx <- List]; " ++
+-      "Else -> " ++
+-        "throw({template, io_lib:format(\"Bad context for ~p: ~p\", [" ++ Name ++ ", Else])}) " ++
+-    "end " ++
+-  "end()".
+-
+-compile_tags(T, State) ->
+-  Res = re:run(T, State#mstate.tag_re),
+-  case Res of
+-    {match, [{M0, M1}, K, {C0, C1}]} ->
+-      Front = string:substr(T, 1, M0),
+-      Back = string:substr(T, M0 + M1 + 1),
+-      Content = string:substr(T, C0 + 1, C1),
+-      Kind = tag_kind(T, K),
+-      Result = compile_tag(Kind, Content, State),
+-      "[\"" ++ Front ++
+-        "\" | [" ++ Result ++
+-        " | " ++ compile_tags(Back, State) ++ "]]";
+-    nomatch ->
+-      "[\"" ++ T ++ "\"]"
+-  end.
+-
+-tag_kind(_T, {-1, 0}) ->
+-  none;
+-tag_kind(T, {K0, K1}) ->
+-  string:substr(T, K0 + 1, K1).
+-
+-compile_tag(none, Content, State) ->
+-  Mod = State#mstate.mod,
+-  ?MUSTACHE_STR ++ ":escape(" ++ ?MUSTACHE_STR ++ ":get(" ++ Content ++ ", Ctx, " ++ atom_to_list(Mod) ++ "))";
+-compile_tag("{", Content, State) ->
+-  Mod = State#mstate.mod,
+-  ?MUSTACHE_STR ++ ":get(" ++ Content ++ ", Ctx, " ++ atom_to_list(Mod) ++ ")";
+-compile_tag("!", _Content, _State) ->
+-  "[]".
+-
+-template_dir(Mod) ->
+-  DefaultDirPath = filename:dirname(code:which(Mod)),
+-  case application:get_env(mustache, templates_dir) of
+-    {ok, DirPath} when is_list(DirPath) ->
+-      case filelib:ensure_dir(DirPath) of
+-        ok -> DirPath;
+-        _  -> DefaultDirPath
+-      end;
+-    _ ->
+-      DefaultDirPath
+-  end.
+-template_path(Mod) ->
+-  DirPath = template_dir(Mod),
+-  Basename = atom_to_list(Mod),
+-  filename:join(DirPath, Basename ++ ".mustache").
+-
+-get(Key, Ctx) when is_list(Key) ->
+-  {ok, Mod} = dict:find('__mod__', Ctx),
+-  get(list_to_atom(Key), Ctx, Mod);
+-get(Key, Ctx) ->
+-  {ok, Mod} = dict:find('__mod__', Ctx),
+-  get(Key, Ctx, Mod).
+-
+-get(Key, Ctx, Mod) when is_list(Key) ->
+-  get(list_to_atom(Key), Ctx, Mod);
+-get(Key, Ctx, Mod) ->
+-  case dict:find(Key, Ctx) of
+-    {ok, Val} ->
+-      % io:format("From Ctx {~p, ~p}~n", [Key, Val]),
+-      to_s(Val);
+-    error ->
+-      case erlang:function_exported(Mod, Key, 1) of
+-        true ->
+-          Val = to_s(Mod:Key(Ctx)),
+-          % io:format("From Mod/1 {~p, ~p}~n", [Key, Val]),
+-          Val;
+-        false ->
+-          case erlang:function_exported(Mod, Key, 0) of
+-            true ->
+-              Val = to_s(Mod:Key()),
+-              % io:format("From Mod/0 {~p, ~p}~n", [Key, Val]),
+-              Val;
+-            false ->
+-              []
+-          end
+-      end
+-  end.
+-
+-to_s(Val) when is_integer(Val) ->
+-  integer_to_list(Val);
+-to_s(Val) when is_float(Val) ->
+-  io_lib:format("~.2f", [Val]);
+-to_s(Val) when is_atom(Val) ->
+-  atom_to_list(Val);
+-to_s(Val) ->
+-  Val.
+-
+-escape(HTML) ->
+-  escape(HTML, []).
+-
+-escape([], Acc) ->
+-  lists:reverse(Acc);
+-escape(["<" | Rest], Acc) ->
+-  escape(Rest, lists:reverse("&lt;", Acc));
+-escape([">" | Rest], Acc) ->
+-  escape(Rest, lists:reverse("&gt;", Acc));
+-escape(["&" | Rest], Acc) ->
+-  escape(Rest, lists:reverse("&amp;", Acc));
+-escape([X | Rest], Acc) ->
+-  escape(Rest, [X | Acc]).
+-
+-%%---------------------------------------------------------------------------
+-
+-start([T]) ->
+-  Out = render(list_to_atom(T)),
+-  io:format(Out ++ "~n", []).
+-- 
+2.1.0
+

0003-Unbundle-getopt.patch Added

@@ -0,0 +1,948 @@
+From a840b65449ff1993c99f0b5f6ac7db11da882471 Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
+Date: Mon, 18 May 2015 11:46:47 +0200
+Subject: [PATCH 3/7] Unbundle getopt
+
+---
+ ebin/rebar.app       |   3 +-
+ src/rebar_getopt.erl | 914 ---------------------------------------------------
+ 2 files changed, 1 insertion(+), 916 deletions(-)
+ delete mode 100644 src/rebar_getopt.erl
+
+diff --git a/ebin/rebar.app b/ebin/rebar.app
+index 9a81f90..c9932fc 100644
+--- a/ebin/rebar.app
++++ b/ebin/rebar.app
+@@ -39,8 +39,7 @@
+               rebar_upgrade,
+               rebar_utils,
+               rebar_xref,
+-              rebar_metacmds,
+-              rebar_getopt ]},
++              rebar_metacmds ]},
+   {registered, []},
+   {applications, [kernel,
+                   stdlib,
+diff --git a/src/rebar_getopt.erl b/src/rebar_getopt.erl
+deleted file mode 100644
+index 79b871d..0000000
+--- a/src/rebar_getopt.erl
++++ /dev/null
+@@ -1,914 +0,0 @@
+-%%%-------------------------------------------------------------------
+-%%% @author Juan Jose Comellas <juanjo@comellas.org>
+-%%% @copyright (C) 2009 Juan Jose Comellas
+-%%% @doc Parses command line options with a format similar to that of GNU getopt.
+-%%% @end
+-%%%
+-%%% This source file is subject to the New BSD License. You should have received
+-%%% a copy of the New BSD license with this software. If not, it can be
+-%%% retrieved from: http://www.opensource.org/licenses/bsd-license.php
+-%%%-------------------------------------------------------------------
+--module(rebar_getopt).
+--author('juanjo@comellas.org').
+-
+--export([parse/2, check/2, parse_and_check/2, format_error/2,
+-         usage/2, usage/3, usage/4, tokenize/1]).
+--export([usage_cmd_line/2]).
+-
+--define(LINE_LENGTH, 75).
+--define(MIN_USAGE_COMMAND_LINE_OPTION_LENGTH, 25).
+-
+-%% Position of each field in the option specification tuple.
+--define(OPT_NAME, 1).
+--define(OPT_SHORT, 2).
+--define(OPT_LONG, 3).
+--define(OPT_ARG, 4).
+--define(OPT_HELP, 5).
+-
+--define(IS_OPT_SPEC(Opt), (tuple_size(Opt) =:= ?OPT_HELP)).
+--define(IS_WHITESPACE(Char), ((Char) =:= $\s orelse (Char) =:= $\t orelse
+-                              (Char) =:= $\n orelse (Char) =:= $\r)).
+-
+-%% Atom indicating the data type that an argument can be converted to.
+--type arg_type()                                :: 'atom' | 'binary' | 'boolean' | 'float' | 'integer' | 'string'.
+-%% Data type that an argument can be converted to.
+--type arg_value()                               :: atom() | binary() | boolean() | float() | integer() | string().
+-%% Argument specification.
+--type arg_spec()                                :: arg_type() | {arg_type(), arg_value()} | undefined.
+-%% Option type and optional default argument.
+--type simple_option()                           :: atom().
+--type compound_option()                         :: {atom(), arg_value()}.
+--type option()                                  :: simple_option() | compound_option().
+-%% Command line option specification.
+--type option_spec() :: {
+-                   Name                         :: atom(),
+-                   Short                        :: char() | undefined,
+-                   Long                         :: string() | undefined,
+-                   ArgSpec                      :: arg_spec(),
+-                   Help                         :: string() | undefined
+-                  }.
+-%% Output streams
+--type output_stream()                           :: 'standard_io' | 'standard_error'.
+-
+-%% For internal use
+--type usage_line()                              :: {OptionText :: string(), HelpText :: string()}.
+--type usage_line_with_length()                  :: {OptionLength :: non_neg_integer(), OptionText :: string(), HelpText :: string()}.
+-
+-
+--export_type([arg_type/0, arg_value/0, arg_spec/0, simple_option/0, compound_option/0, option/0, option_spec/0]).
+-
+-
+-%% @doc Parse the command line options and arguments returning a list of tuples
+-%%      and/or atoms using the Erlang convention for sending options to a
+-%%      function.  Additionally perform check if all required options (the ones
+-%%      without default values) are present.  The function is a combination of
+-%%      two calls: parse/2 and check/2.
+--spec parse_and_check([option_spec()], string() | [string()]) ->
+-                {ok, {[option()], [string()]}} | {error, {Reason :: atom(), Data :: term()}}.
+-parse_and_check(OptSpecList, CmdLine) when is_list(OptSpecList), is_list(CmdLine) ->
+-    case parse(OptSpecList, CmdLine) of
+-        {ok, {Opts, _}} = Result ->
+-            case check(OptSpecList, Opts) of
+-                ok    -> Result;
+-                Error -> Error
+-            end;
+-        Error ->
+-            Error
+-    end.
+-
+-%% @doc Check the parsed command line arguments returning ok if all required
+-%%      options (i.e. that don't have defaults) are present, and returning
+-%%      error otherwise.
+--spec check([option_spec()], [option()]) ->
+-                ok | {error, {Reason :: atom(), Option :: atom()}}.
+-check(OptSpecList, ParsedOpts) when is_list(OptSpecList), is_list(ParsedOpts) ->
+-    try
+-        RequiredOpts = [Name || {Name, _, _, Arg, _} <- OptSpecList,
+-                                not is_tuple(Arg) andalso Arg =/= undefined],
+-        lists:foreach(fun (Option) ->
+-            case proplists:is_defined(Option, ParsedOpts) of
+-                true ->
+-                    ok;
+-                false ->
+-                    throw({error, {missing_required_option, Option}})
+-            end
+-        end, RequiredOpts)
+-    catch
+-        _:Error ->
+-            Error
+-    end.
+-
+-
+-%% @doc Parse the command line options and arguments returning a list of tuples
+-%%      and/or atoms using the Erlang convention for sending options to a
+-%%      function.
+--spec parse([option_spec()], string() | [string()]) ->
+-                   {ok, {[option()], [string()]}} | {error, {Reason :: atom(), Data :: term()}}.
+-parse(OptSpecList, CmdLine) when is_list(CmdLine) ->
+-    try
+-        Args = if
+-                   is_integer(hd(CmdLine)) -> tokenize(CmdLine);
+-                   true                    -> CmdLine
+-               end,
+-        parse(OptSpecList, [], [], 0, Args)
+-    catch
+-        throw: {error, {_Reason, _Data}} = Error ->
+-            Error
+-    end.
+-
+-
+--spec parse([option_spec()], [option()], [string()], integer(), [string()]) ->
+-                   {ok, {[option()], [string()]}}.
+-%% Process the option terminator.
+-parse(OptSpecList, OptAcc, ArgAcc, _ArgPos, ["--" | Tail]) ->
+-    %% Any argument present after the terminator is not considered an option.
+-    {ok, {lists:reverse(append_default_options(OptSpecList, OptAcc)), lists:reverse(ArgAcc, Tail)}};
+-%% Process long options.
+-parse(OptSpecList, OptAcc, ArgAcc, ArgPos, ["--" ++ OptArg = OptStr | Tail]) ->
+-    parse_long_option(OptSpecList, OptAcc, ArgAcc, ArgPos, Tail, OptStr, OptArg);
+-%% Process short options.
+-parse(OptSpecList, OptAcc, ArgAcc, ArgPos, ["-" ++ ([_Char | _] = OptArg) = OptStr | Tail]) ->
+-    parse_short_option(OptSpecList, OptAcc, ArgAcc, ArgPos, Tail, OptStr, OptArg);
+-%% Process non-option arguments.
+-parse(OptSpecList, OptAcc, ArgAcc, ArgPos, [Arg | Tail]) ->
+-    case find_non_option_arg(OptSpecList, ArgPos) of
+-        {value, OptSpec} when ?IS_OPT_SPEC(OptSpec) ->
+-            parse(OptSpecList, add_option_with_arg(OptSpec, Arg, OptAcc), ArgAcc, ArgPos + 1, Tail);
+-        false ->
+-            parse(OptSpecList, OptAcc, [Arg | ArgAcc], ArgPos, Tail)
+-    end;
+-parse(OptSpecList, OptAcc, ArgAcc, _ArgPos, []) ->
+-    %% Once we have completed gathering the options we add the ones that were
+-    %% not present but had default arguments in the specification.
+-    {ok, {lists:reverse(append_default_options(OptSpecList, OptAcc)), lists:reverse(ArgAcc)}}.
+-
+-
+-%% @doc Format the error code returned by prior call to parse/2 or check/2.
+--spec format_error([option_spec()], {error, {Reason :: atom(), Data :: term()}} |
+-                   {Reason :: term(), Data :: term()}) -> string().
+-format_error(OptSpecList, {error, Reason}) ->
+-    format_error(OptSpecList, Reason);
+-format_error(OptSpecList, {missing_required_option, Name}) ->
+-    {_Name, Short, Long, _Type, _Help} = lists:keyfind(Name, 1, OptSpecList),
+-    lists:flatten(["missing required option: -", [Short], " (", to_string(Long), ")"]);
+-format_error(_OptSpecList, {invalid_option, OptStr}) ->
+-    lists:flatten(["invalid option: ", to_string(OptStr)]);
+-format_error(_OptSpecList, {invalid_option_arg, {Name, Arg}}) ->
+-    lists:flatten(["option \'", to_string(Name) ++ "\' has invalid argument: ", to_string(Arg)]);
+-format_error(_OptSpecList, {invalid_option_arg, OptStr}) ->
+-    lists:flatten(["invalid option argument: ", to_string(OptStr)]);
+-format_error(_OptSpecList, {Reason, Data}) ->
+-    lists:flatten([to_string(Reason), " ", to_string(Data)]).
+-
+-
+-%% @doc Parse a long option, add it to the option accumulator and continue
+-%%      parsing the rest of the arguments recursively.
+-%%      A long option can have the following syntax:
+-%%        --foo      Single option 'foo', no argument
+-%%        --foo=bar  Single option 'foo', argument "bar"
+-%%        --foo bar  Single option 'foo', argument "bar"
+--spec parse_long_option([option_spec()], [option()], [string()], integer(), [string()], string(), string()) ->
+-                               {ok, {[option()], [string()]}}.
+-parse_long_option(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptStr, OptArg) ->
+-    case split_assigned_arg(OptArg) of
+-        {Long, Arg} ->
+-            %% Get option that has its argument within the same string
+-            %% separated by an equal ('=') character (e.g. "--port=1000").
+-            parse_long_option_assigned_arg(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptStr, Long, Arg);
+-
+-        Long ->
+-            case lists:keyfind(Long, ?OPT_LONG, OptSpecList) of
+-                {Name, _Short, Long, undefined, _Help} ->
+-                    parse(OptSpecList, [Name | OptAcc], ArgAcc, ArgPos, Args);
+-
+-                {_Name, _Short, Long, _ArgSpec, _Help} = OptSpec ->
+-                    %% The option argument string is empty, but the option requires
+-                    %% an argument, so we look into the next string in the list.
+-                    %% e.g ["--port", "1000"]
+-                    parse_long_option_next_arg(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptSpec);
+-                false ->
+-                    throw({error, {invalid_option, OptStr}})
+-            end
+-    end.
+-
+-
+-%% @doc Parse an option where the argument is 'assigned' in the same string using
+-%%      the '=' character, add it to the option accumulator and continue parsing the
+-%%      rest of the arguments recursively. This syntax is only valid for long options.
+--spec parse_long_option_assigned_arg([option_spec()], [option()], [string()], integer(),
+-                                     [string()], string(), string(), string()) ->
+-                                            {ok, {[option()], [string()]}}.
+-parse_long_option_assigned_arg(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptStr, Long, Arg) ->
+-    case lists:keyfind(Long, ?OPT_LONG, OptSpecList) of
+-        {_Name, _Short, Long, ArgSpec, _Help} = OptSpec ->
+-            case ArgSpec of
+-                undefined ->
+-                    throw({error, {invalid_option_arg, OptStr}});
+-                _ ->
+-                    parse(OptSpecList, add_option_with_assigned_arg(OptSpec, Arg, OptAcc), ArgAcc, ArgPos, Args)
+-            end;
+-        false ->
+-            throw({error, {invalid_option, OptStr}})
+-    end.
+-
+-
+-%% @doc Split an option string that may contain an option with its argument
+-%%      separated by an equal ('=') character (e.g. "port=1000").
+--spec split_assigned_arg(string()) -> {Name :: string(), Arg :: string()} | string().
+-split_assigned_arg(OptStr) ->
+-    split_assigned_arg(OptStr, OptStr, []).
+-
+-split_assigned_arg(_OptStr, "=" ++ Tail, Acc) ->
+-    {lists:reverse(Acc), Tail};
+-split_assigned_arg(OptStr, [Char | Tail], Acc) ->
+-    split_assigned_arg(OptStr, Tail, [Char | Acc]);
+-split_assigned_arg(OptStr, [], _Acc) ->
+-    OptStr.
+-
+-
+-%% @doc Retrieve the argument for an option from the next string in the list of
+-%%      command-line parameters or set the value of the argument from the argument
+-%%      specification (for boolean and integer arguments), if possible.
+-parse_long_option_next_arg(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, {Name, _Short, _Long, ArgSpec, _Help} = OptSpec) ->
+-    ArgSpecType = arg_spec_type(ArgSpec),
+-    case Args =:= [] orelse is_implicit_arg(ArgSpecType, hd(Args)) of
+-        true ->
+-            parse(OptSpecList, add_option_with_implicit_arg(OptSpec, OptAcc), ArgAcc, ArgPos, Args);
+-        false ->
+-            [Arg | Tail] = Args,
+-            try
+-                parse(OptSpecList, [{Name, to_type(ArgSpecType, Arg)} | OptAcc], ArgAcc, ArgPos, Tail)
+-            catch
+-                error:_ ->
+-                    throw({error, {invalid_option_arg, {Name, Arg}}})
+-            end
+-    end.
+-
+-
+-%% @doc Parse a short option, add it to the option accumulator and continue
+-%%      parsing the rest of the arguments recursively.
+-%%      A short option can have the following syntax:
+-%%        -a       Single option 'a', no argument or implicit boolean argument
+-%%        -a foo   Single option 'a', argument "foo"
+-%%        -afoo    Single option 'a', argument "foo"
+-%%        -abc     Multiple options: 'a'; 'b'; 'c'
+-%%        -bcafoo  Multiple options: 'b'; 'c'; 'a' with argument "foo"
+-%%        -aaa     Multiple repetitions of option 'a' (only valid for options with integer arguments)
+--spec parse_short_option([option_spec()], [option()], [string()], integer(), [string()], string(), string()) ->
+-                                {ok, {[option()], [string()]}}.
+-parse_short_option(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptStr, OptArg) ->
+-    parse_short_option(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptStr, first, OptArg).
+-
+-parse_short_option(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptStr, OptPos, [Short | Arg]) ->
+-    case lists:keyfind(Short, ?OPT_SHORT, OptSpecList) of
+-        {Name, Short, _Long, undefined, _Help} ->
+-            parse_short_option(OptSpecList, [Name | OptAcc], ArgAcc, ArgPos, Args, OptStr, first, Arg);
+-
+-        {_Name, Short, _Long, ArgSpec, _Help} = OptSpec ->
+-            %% The option has a specification, so it requires an argument.
+-            case Arg of
+-                [] ->
+-                    %% The option argument string is empty, but the option requires
+-                    %% an argument, so we look into the next string in the list.
+-                    parse_short_option_next_arg(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, OptSpec, OptPos);
+-
+-                _ ->
+-                    case is_valid_arg(ArgSpec, Arg) of
+-                        true ->
+-                            parse(OptSpecList, add_option_with_arg(OptSpec, Arg, OptAcc), ArgAcc, ArgPos, Args);
+-                        _ ->
+-                            NewOptAcc = case OptPos of
+-                                            first -> add_option_with_implicit_arg(OptSpec, OptAcc);
+-                                            _     -> add_option_with_implicit_incrementable_arg(OptSpec, OptAcc)
+-                                        end,
+-                            parse_short_option(OptSpecList, NewOptAcc, ArgAcc, ArgPos, Args, OptStr, next, Arg)
+-                    end
+-            end;
+-
+-        false ->
+-            throw({error, {invalid_option, OptStr}})
+-    end;
+-parse_short_option(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, _OptStr, _OptPos, []) ->
+-    parse(OptSpecList, OptAcc, ArgAcc, ArgPos, Args).
+-
+-
+-%% @doc Retrieve the argument for an option from the next string in the list of
+-%%      command-line parameters or set the value of the argument from the argument
+-%%      specification (for boolean and integer arguments), if possible.
+-parse_short_option_next_arg(OptSpecList, OptAcc, ArgAcc, ArgPos, Args, {Name, _Short, _Long, ArgSpec, _Help} = OptSpec, OptPos) ->
+-    case Args =:= [] orelse is_implicit_arg(ArgSpec, hd(Args)) of
+-        true when OptPos =:= first ->
+-            parse(OptSpecList, add_option_with_implicit_arg(OptSpec, OptAcc), ArgAcc, ArgPos, Args);
+-        true ->
+-            parse(OptSpecList, add_option_with_implicit_incrementable_arg(OptSpec, OptAcc), ArgAcc, ArgPos, Args);
+-        false ->
+-            [Arg | Tail] = Args,
+-            try
+-                parse(OptSpecList, [{Name, to_type(ArgSpec, Arg)} | OptAcc], ArgAcc, ArgPos, Tail)
+-            catch
+-                error:_ ->
+-                    throw({error, {invalid_option_arg, {Name, Arg}}})
+-            end
+-    end.
+-
+-
+-%% @doc Find the option for the discrete argument in position specified in the
+-%%      Pos argument.
+--spec find_non_option_arg([option_spec()], integer()) -> {value, option_spec()} | false.
+-find_non_option_arg([{_Name, undefined, undefined, _ArgSpec, _Help} = OptSpec | _Tail], 0) ->
+-    {value, OptSpec};
+-find_non_option_arg([{_Name, undefined, undefined, _ArgSpec, _Help} | Tail], Pos) ->
+-    find_non_option_arg(Tail, Pos - 1);
+-find_non_option_arg([_Head | Tail], Pos) ->
+-    find_non_option_arg(Tail, Pos);
+-find_non_option_arg([], _Pos) ->
+-    false.
+-
+-
+-%% @doc Append options that were not present in the command line arguments with
+-%%      their default arguments.
+--spec append_default_options([option_spec()], [option()]) -> [option()].
+-append_default_options([{Name, _Short, _Long, {_Type, DefaultArg}, _Help} | Tail], OptAcc) ->
+-    append_default_options(Tail,
+-                           case lists:keymember(Name, 1, OptAcc) of
+-                               false ->
+-                                   [{Name, DefaultArg} | OptAcc];
+-                               _ ->
+-                                   OptAcc
+-                           end);
+-%% For options with no default argument.
+-append_default_options([_Head | Tail], OptAcc) ->
+-    append_default_options(Tail, OptAcc);
+-append_default_options([], OptAcc) ->
+-    OptAcc.
+-
+-
+-%% @doc Add an option with argument converting it to the data type indicated by the
+-%%      argument specification.
+--spec add_option_with_arg(option_spec(), string(), [option()]) -> [option()].
+-add_option_with_arg({Name, _Short, _Long, ArgSpec, _Help} = OptSpec, Arg, OptAcc) ->
+-    case is_valid_arg(ArgSpec, Arg) of
+-        true ->
+-            try
+-                [{Name, to_type(ArgSpec, Arg)} | OptAcc]
+-            catch
+-                error:_ ->
+-                    throw({error, {invalid_option_arg, {Name, Arg}}})
+-            end;
+-        false ->
+-            add_option_with_implicit_arg(OptSpec, OptAcc)
+-    end.
+-
+-
+-%% @doc Add an option with argument that was part of an assignment expression
+-%%      (e.g. "--verbose=3") converting it to the data type indicated by the
+-%%      argument specification.
+--spec add_option_with_assigned_arg(option_spec(), string(), [option()]) -> [option()].
+-add_option_with_assigned_arg({Name, _Short, _Long, ArgSpec, _Help}, Arg, OptAcc) ->
+-    try
+-        [{Name, to_type(ArgSpec, Arg)} | OptAcc]
+-    catch
+-        error:_ ->
+-            throw({error, {invalid_option_arg, {Name, Arg}}})
+-    end.
+-
+-
+-%% @doc Add an option that required an argument but did not have one. Some data
+-%%      types (boolean, integer) allow implicit or assumed arguments.
+--spec add_option_with_implicit_arg(option_spec(), [option()]) -> [option()].
+-add_option_with_implicit_arg({Name, _Short, _Long, ArgSpec, _Help}, OptAcc) ->
+-    case arg_spec_type(ArgSpec) of
+-        boolean ->
+-            %% Special case for boolean arguments: if there is no argument we
+-            %% set the value to 'true'.
+-            [{Name, true} | OptAcc];
+-        integer ->
+-            %% Special case for integer arguments: if the option had not been set
+-            %% before we set the value to 1. This is needed to support options like
+-            %% "-v" to return something like {verbose, 1}.
+-            [{Name, 1} | OptAcc];
+-        _ ->
+-            throw({error, {missing_option_arg, Name}})
+-    end.
+-
+-
+-%% @doc Add an option with an implicit or assumed argument.
+--spec add_option_with_implicit_incrementable_arg(option_spec() | arg_spec(), [option()]) -> [option()].
+-add_option_with_implicit_incrementable_arg({Name, _Short, _Long, ArgSpec, _Help}, OptAcc) ->
+-    case arg_spec_type(ArgSpec) of
+-        boolean ->
+-            %% Special case for boolean arguments: if there is no argument we
+-            %% set the value to 'true'.
+-            [{Name, true} | OptAcc];
+-        integer ->
+-            %% Special case for integer arguments: if the option had not been set
+-            %% before we set the value to 1; if not we increment the previous value
+-            %% the option had. This is needed to support options like "-vvv" to
+-            %% return something like {verbose, 3}.
+-            case OptAcc of
+-                [{Name, Count} | Tail] ->
+-                    [{Name, Count + 1} | Tail];
+-                _ ->
+-                    [{Name, 1} | OptAcc]
+-            end;
+-        _ ->
+-            throw({error, {missing_option_arg, Name}})
+-    end.
+-
+-
+-%% @doc Retrieve the data type form an argument specification.
+--spec arg_spec_type(arg_spec()) -> arg_type() | undefined.
+-arg_spec_type({Type, _DefaultArg}) ->
+-    Type;
+-arg_spec_type(Type) when is_atom(Type) ->
+-    Type.
+-
+-
+-%% @doc Convert an argument string to its corresponding data type.
+--spec to_type(arg_spec() | arg_type(), string()) -> arg_value().
+-to_type({Type, _DefaultArg}, Arg) ->
+-    to_type(Type, Arg);
+-to_type(binary, Arg) ->
+-    list_to_binary(Arg);
+-to_type(atom, Arg) ->
+-    list_to_atom(Arg);
+-to_type(integer, Arg) ->
+-    list_to_integer(Arg);
+-to_type(float, Arg) ->
+-    list_to_float(Arg);
+-to_type(boolean, Arg) ->
+-    LowerArg = string:to_lower(Arg),
+-    case is_arg_true(LowerArg) of
+-        true ->
+-            true;
+-        _ ->
+-            case is_arg_false(LowerArg) of
+-                true ->
+-                    false;
+-                false ->
+-                    erlang:error(badarg)
+-            end
+-    end;
+-to_type(_Type, Arg) ->
+-    Arg.
+-
+-
+--spec is_arg_true(string()) -> boolean().
+-is_arg_true(Arg) ->
+-    (Arg =:= "true") orelse (Arg =:= "t") orelse
+-    (Arg =:= "yes") orelse (Arg =:= "y") orelse
+-    (Arg =:= "on") orelse (Arg =:= "enabled") orelse
+-    (Arg =:= "1").
+-
+-
+--spec is_arg_false(string()) -> boolean().
+-is_arg_false(Arg) ->
+-    (Arg =:= "false") orelse (Arg =:= "f") orelse
+-    (Arg =:= "no") orelse (Arg =:= "n") orelse
+-    (Arg =:= "off") orelse (Arg =:= "disabled") orelse
+-    (Arg =:= "0").
+-
+-
+--spec is_valid_arg(arg_spec(), nonempty_string()) -> boolean().
+-is_valid_arg({Type, _DefaultArg}, Arg) ->
+-    is_valid_arg(Type, Arg);
+-is_valid_arg(boolean, Arg) ->
+-    is_boolean_arg(Arg);
+-is_valid_arg(integer, Arg) ->
+-    is_non_neg_integer_arg(Arg);
+-is_valid_arg(float, Arg) ->
+-    is_non_neg_float_arg(Arg);
+-is_valid_arg(_Type, _Arg) ->
+-    true.
+-
+-
+--spec is_implicit_arg(arg_spec(), nonempty_string()) -> boolean().
+-is_implicit_arg({Type, _DefaultArg}, Arg) ->
+-    is_implicit_arg(Type, Arg);
+-is_implicit_arg(boolean, Arg) ->
+-    not is_boolean_arg(Arg);
+-is_implicit_arg(integer, Arg) ->
+-    not is_integer_arg(Arg);
+-is_implicit_arg(_Type, _Arg) ->
+-    false.
+-
+-
+--spec is_boolean_arg(string()) -> boolean().
+-is_boolean_arg(Arg) ->
+-    LowerArg = string:to_lower(Arg),
+-    is_arg_true(LowerArg) orelse is_arg_false(LowerArg).
+-
+-
+--spec is_integer_arg(string()) -> boolean().
+-is_integer_arg("-" ++ Tail) ->
+-    is_non_neg_integer_arg(Tail);
+-is_integer_arg(Arg) ->
+-    is_non_neg_integer_arg(Arg).
+-
+-
+--spec is_non_neg_integer_arg(string()) -> boolean().
+-is_non_neg_integer_arg([Head | Tail]) when Head >= $0, Head =< $9 ->
+-    is_non_neg_integer_arg(Tail);
+-is_non_neg_integer_arg([_Head | _Tail]) ->
+-    false;
+-is_non_neg_integer_arg([]) ->
+-    true.
+-
+-
+--spec is_non_neg_float_arg(string()) -> boolean().
+-is_non_neg_float_arg([Head | Tail]) when (Head >= $0 andalso Head =< $9) orelse Head =:= $. ->
+-    is_non_neg_float_arg(Tail);
+-is_non_neg_float_arg([_Head | _Tail]) ->
+-    false;
+-is_non_neg_float_arg([]) ->
+-    true.
+-
+-
+-%% @doc  Show a message on standard_error indicating the command line options and
+-%%       arguments that are supported by the program.
+--spec usage([option_spec()], string()) -> ok.
+-usage(OptSpecList, ProgramName) ->
+-    usage(OptSpecList, ProgramName, standard_error).
+-
+-
+-%% @doc  Show a message on standard_error or standard_io indicating the command line options and
+-%%       arguments that are supported by the program.
+--spec usage([option_spec()], string(), output_stream() | string()) -> ok.
+-usage(OptSpecList, ProgramName, OutputStream) when is_atom(OutputStream) ->
+-    io:format(OutputStream, "~s~n~n~s~n",
+-              [usage_cmd_line(ProgramName, OptSpecList), usage_options(OptSpecList)]);
+-%% @doc  Show a message on standard_error indicating the command line options and
+-%%       arguments that are supported by the program. The CmdLineTail argument
+-%%       is a string that is added to the end of the usage command line.
+-usage(OptSpecList, ProgramName, CmdLineTail) ->
+-    usage(OptSpecList, ProgramName, CmdLineTail, standard_error).
+-
+-
+-%% @doc  Show a message on standard_error or standard_io indicating the command line options and
+-%%       arguments that are supported by the program. The CmdLineTail argument
+-%%       is a string that is added to the end of the usage command line.
+--spec usage([option_spec()], ProgramName :: string(), CmdLineTail :: string(), output_stream() | [{string(), string()}]) -> ok.
+-usage(OptSpecList, ProgramName, CmdLineTail, OutputStream) when is_atom(OutputStream) ->
+-    io:format(OutputStream, "~s~n~n~s~n",
+-              [usage_cmd_line(ProgramName, OptSpecList, CmdLineTail), usage_options(OptSpecList)]);
+-%% @doc  Show a message on standard_error indicating the command line options and
+-%%       arguments that are supported by the program. The CmdLineTail and OptionsTail
+-%%       arguments are a string that is added to the end of the usage command line
+-%%       and a list of tuples that are added to the end of the options' help lines.
+-usage(OptSpecList, ProgramName, CmdLineTail, OptionsTail) ->
+-    usage(OptSpecList, ProgramName, CmdLineTail, OptionsTail, standard_error).
+-
+-
+-%% @doc  Show a message on standard_error or standard_io indicating the command line options and
+-%%       arguments that are supported by the program. The CmdLineTail and OptionsTail
+-%%       arguments are a string that is added to the end of the usage command line
+-%%       and a list of tuples that are added to the end of the options' help lines.
+--spec usage([option_spec()], ProgramName :: string(), CmdLineTail :: string(),
+-            [{OptionName :: string(), Help :: string()}], output_stream()) -> ok.
+-usage(OptSpecList, ProgramName, CmdLineTail, OptionsTail, OutputStream) ->
+-    io:format(OutputStream, "~s~n~n~s~n",
+-              [usage_cmd_line(ProgramName, OptSpecList, CmdLineTail), usage_options(OptSpecList, OptionsTail)]).
+-
+-
+--spec usage_cmd_line(ProgramName :: string(), [option_spec()]) -> iolist().
+-usage_cmd_line(ProgramName, OptSpecList) ->
+-    usage_cmd_line(ProgramName, OptSpecList, "").
+-
+--spec usage_cmd_line(ProgramName :: string(), [option_spec()], CmdLineTail :: string()) -> iolist().
+-usage_cmd_line(ProgramName, OptSpecList, CmdLineTail) ->
+-    Prefix = "Usage: " ++ ProgramName,
+-    PrefixLength = length(Prefix),
+-    LineLength = line_length(),
+-    %% Only align the command line options after the program name when there is
+-    %% enough room to do so (i.e. at least 25 characters). If not, show the
+-    %% command line options below the program name with a 2-character indentation.
+-    if
+-        (LineLength - PrefixLength) > ?MIN_USAGE_COMMAND_LINE_OPTION_LENGTH ->
+-            Indentation = lists:duplicate(PrefixLength, $\s),
+-            [FirstOptLine | OptLines] = usage_cmd_line_options(LineLength - PrefixLength, OptSpecList, CmdLineTail),
+-            IndentedOptLines = [[Indentation | OptLine] || OptLine <- OptLines],
+-            [Prefix, FirstOptLine | IndentedOptLines];
+-        true ->
+-            IndentedOptLines = [[" " | OptLine] || OptLine <- usage_cmd_line_options(LineLength, OptSpecList, CmdLineTail)],
+-            [Prefix, $\n, IndentedOptLines]
+-    end.
+-
+-
+-%% @doc Return a list of the lines corresponding to the usage command line
+-%%      already wrapped according to the maximum MaxLineLength.
+--spec usage_cmd_line_options(MaxLineLength :: non_neg_integer(), [option_spec()], CmdLineTail :: string()) -> iolist().
+-usage_cmd_line_options(MaxLineLength, OptSpecList, CmdLineTail) ->
+-    usage_cmd_line_options(MaxLineLength, OptSpecList ++ string:tokens(CmdLineTail, " "), [], 0, []).
+-
+-usage_cmd_line_options(MaxLineLength, [OptSpec | Tail], LineAcc, LineAccLength, Acc) ->
+-    Option = [$\s | lists:flatten(usage_cmd_line_option(OptSpec))],
+-    OptionLength = length(Option),
+-    %% We accumulate the options in LineAcc until its length is over the
+-    %% maximum allowed line length. When that happens, we append the line in
+-    %% LineAcc to the list with all the lines in the command line (Acc).
+-    NewLineAccLength = LineAccLength + OptionLength,
+-    if
+-        NewLineAccLength < MaxLineLength ->
+-            usage_cmd_line_options(MaxLineLength, Tail, [Option | LineAcc], NewLineAccLength, Acc);
+-        true ->
+-            usage_cmd_line_options(MaxLineLength, Tail, [Option], OptionLength + 1,
+-                                   [lists:reverse([$\n | LineAcc]) | Acc])
+-    end;
+-usage_cmd_line_options(MaxLineLength, [], [_ | _] = LineAcc, _LineAccLength, Acc) ->
+-    %% If there was a non-empty line in LineAcc when there are no more options
+-    %% to process, we add it to the list of lines to return.
+-    usage_cmd_line_options(MaxLineLength, [], [], 0, [lists:reverse(LineAcc) | Acc]);
+-usage_cmd_line_options(_MaxLineLength, [], [], _LineAccLength, Acc) ->
+-    lists:reverse(Acc).
+-
+-
+--spec usage_cmd_line_option(option_spec()) -> string().
+-usage_cmd_line_option({_Name, Short, _Long, undefined, _Help}) when Short =/= undefined ->
+-    %% For options with short form and no argument.
+-    [$[, $-, Short, $]];
+-usage_cmd_line_option({_Name, _Short, Long, undefined, _Help}) when Long =/= undefined ->
+-    %% For options with only long form and no argument.
+-    [$[, $-, $-, Long, $]];
+-usage_cmd_line_option({_Name, _Short, _Long, undefined, _Help}) ->
+-    [];
+-usage_cmd_line_option({Name, Short, Long, ArgSpec, _Help}) when is_atom(ArgSpec) ->
+-    %% For options with no default argument.
+-    if
+-        %% For options with short form and argument.
+-        Short =/= undefined -> [$[, $-, Short, $\s, $<, atom_to_list(Name), $>, $]];
+-        %% For options with only long form and argument.
+-        Long =/= undefined  -> [$[, $-, $-, Long, $\s, $<, atom_to_list(Name), $>, $]];
+-        %% For options with neither short nor long form and argument.
+-        true                -> [$[, $<, atom_to_list(Name), $>, $]]
+-    end;
+-usage_cmd_line_option({Name, Short, Long, ArgSpec, _Help}) when is_tuple(ArgSpec) ->
+-    %% For options with default argument.
+-    if
+-        %% For options with short form and default argument.
+-        Short =/= undefined -> [$[, $-, Short, $\s, $[, $<, atom_to_list(Name), $>, $], $]];
+-        %% For options with only long form and default argument.
+-        Long =/= undefined  -> [$[, $-, $-, Long, $\s, $[, $<, atom_to_list(Name), $>, $], $]];
+-        %% For options with neither short nor long form and default argument.
+-        true                -> [$[, $<, atom_to_list(Name), $>, $]]
+-    end;
+-usage_cmd_line_option(Option) when is_list(Option) ->
+-    %% For custom options that are added to the command line.
+-    Option.
+-
+-
+-%% @doc Return a list of help messages to print for each of the options and arguments.
+--spec usage_options([option_spec()]) -> [string()].
+-usage_options(OptSpecList) ->
+-    usage_options(OptSpecList, []).
+-
+-
+-%% @doc Return a list of usage lines to print for each of the options and arguments.
+--spec usage_options([option_spec()], [{OptionName :: string(), Help :: string()}]) -> [string()].
+-usage_options(OptSpecList, CustomHelp) ->
+-    %% Add the usage lines corresponding to the option specifications.
+-    {MaxOptionLength0, UsageLines0} = add_option_spec_help_lines(OptSpecList, 0, []),
+-    %% Add the custom usage lines.
+-    {MaxOptionLength, UsageLines} = add_custom_help_lines(CustomHelp, MaxOptionLength0, UsageLines0),
+-    MaxLineLength = line_length(),
+-    lists:reverse([format_usage_line(MaxOptionLength + 1, MaxLineLength, UsageLine) || UsageLine <- UsageLines]).
+-
+-
+--spec add_option_spec_help_lines([option_spec()], PrevMaxOptionLength :: non_neg_integer(), [usage_line_with_length()]) ->
+-                                        {MaxOptionLength :: non_neg_integer(), [usage_line_with_length()]}.
+-add_option_spec_help_lines([OptSpec | Tail], PrevMaxOptionLength, Acc) ->
+-    OptionText = usage_option_text(OptSpec),
+-    HelpText = usage_help_text(OptSpec),
+-    {MaxOptionLength, ColsWithLength} = get_max_option_length({OptionText, HelpText}, PrevMaxOptionLength),
+-    add_option_spec_help_lines(Tail, MaxOptionLength, [ColsWithLength | Acc]);
+-add_option_spec_help_lines([], MaxOptionLength, Acc) ->
+-    {MaxOptionLength, Acc}.
+-
+-
+--spec add_custom_help_lines([usage_line()], PrevMaxOptionLength :: non_neg_integer(), [usage_line_with_length()]) ->
+-                                   {MaxOptionLength :: non_neg_integer(), [usage_line_with_length()]}.
+-add_custom_help_lines([CustomCols | Tail], PrevMaxOptionLength, Acc) ->
+-    {MaxOptionLength, ColsWithLength} = get_max_option_length(CustomCols, PrevMaxOptionLength),
+-    add_custom_help_lines(Tail, MaxOptionLength, [ColsWithLength | Acc]);
+-add_custom_help_lines([], MaxOptionLength, Acc) ->
+-    {MaxOptionLength, Acc}.
+-
+-
+--spec usage_option_text(option_spec()) -> string().
+-usage_option_text({Name, undefined, undefined, _ArgSpec, _Help}) ->
+-    %% Neither short nor long form (non-option argument).
+-    "<" ++ atom_to_list(Name) ++ ">";
+-usage_option_text({_Name, Short, undefined, _ArgSpec, _Help}) ->
+-    %% Only short form.
+-    [$-, Short];
+-usage_option_text({_Name, undefined, Long, _ArgSpec, _Help}) ->
+-    %% Only long form.
+-    [$-, $- | Long];
+-usage_option_text({_Name, Short, Long, _ArgSpec, _Help}) ->
+-    %% Both short and long form.
+-    [$-, Short, $,, $\s, $-, $- | Long].
+-
+-
+--spec usage_help_text(option_spec()) -> string().
+-usage_help_text({_Name, _Short, _Long, {_ArgType, ArgValue}, [_ | _] = Help}) ->
+-    Help ++ " [default: " ++ default_arg_value_to_string(ArgValue) ++ "]";
+-usage_help_text({_Name, _Short, _Long, _ArgSpec, Help}) ->
+-    Help.
+-
+-
+-%% @doc Calculate the maximum width of the column that shows the option's short
+-%%      and long form.
+--spec get_max_option_length(usage_line(), PrevMaxOptionLength :: non_neg_integer()) ->
+-                                   {MaxOptionLength :: non_neg_integer(), usage_line_with_length()}.
+-get_max_option_length({OptionText, HelpText}, PrevMaxOptionLength) ->
+-    OptionLength = length(OptionText),
+-    {erlang:max(OptionLength, PrevMaxOptionLength), {OptionLength, OptionText, HelpText}}.
+-
+-
+-%% @doc Format the usage line that is shown for the options' usage. Each usage
+-%%      line has 2 columns. The first column shows the options in their short
+-%%      and long form. The second column shows the wrapped (if necessary) help
+-%%      text lines associated with each option. e.g.:
+-%%
+-%%        -h, --host  Database server host name or IP address; this is the
+-%%                    hostname of the server where the database is running
+-%%                    [default: localhost]
+-%%        -p, --port  Database server port [default: 1000]
+-%%
+--spec format_usage_line(MaxOptionLength :: non_neg_integer(), MaxLineLength :: non_neg_integer(),
+-                        usage_line_with_length()) -> iolist().
+-format_usage_line(MaxOptionLength, MaxLineLength, {OptionLength, OptionText, [_ | _] = HelpText})
+-  when MaxOptionLength < (MaxLineLength div 2) ->
+-    %% If the width of the column where the options are shown is smaller than
+-    %% half the width of a console line then we show the help text line aligned
+-    %% next to its corresponding option, with a separation of at least 2
+-    %% characters.
+-    [Head | Tail] = wrap_text_line(MaxLineLength - MaxOptionLength - 3, HelpText),
+-    FirstLineIndentation = lists:duplicate(MaxOptionLength - OptionLength + 1, $\s),
+-    Indentation = [$\n | lists:duplicate(MaxOptionLength + 3, $\s)],
+-    ["  ", OptionText, FirstLineIndentation, Head,
+-     [[Indentation, Line] || Line <- Tail], $\n];
+-format_usage_line(_MaxOptionLength, MaxLineLength, {_OptionLength, OptionText, [_ | _] = HelpText}) ->
+-    %% If the width of the first column is bigger than the width of a console
+-    %% line, we show the help text on the next line with an indentation of 6
+-    %% characters.
+-    HelpLines = wrap_text_line(MaxLineLength - 6, HelpText),
+-    ["  ", OptionText, [["\n      ", Line] || Line <- HelpLines], $\n];
+-format_usage_line(_MaxOptionLength, _MaxLineLength, {_OptionLength, OptionText, _HelpText}) ->
+-    ["  ", OptionText, $\n].
+-
+-
+-%% @doc Wrap a text line converting it into several text lines so that the
+-%%      length of each one of them is never over Length characters.
+--spec wrap_text_line(Length :: non_neg_integer(), Text :: string()) -> [string()].
+-wrap_text_line(Length, Text) ->
+-    wrap_text_line(Length, Text, [], 0, []).
+-
+-wrap_text_line(Length, [Char | Tail], Acc, Count, CurrentLineAcc) when Count < Length ->
+-    wrap_text_line(Length, Tail, Acc, Count + 1, [Char | CurrentLineAcc]);
+-wrap_text_line(Length, [_ | _] = Help, Acc, Count, CurrentLineAcc) ->
+-    %% Look for the first whitespace character in the current (reversed) line
+-    %% buffer to get a wrapped line. If there is no whitespace just cut the
+-    %% line at the position corresponding to the maximum length.
+-    {NextLineAcc, WrappedLine} = case string:cspan(CurrentLineAcc, " \t") of
+-                                     WhitespacePos when WhitespacePos < Count ->
+-                                         lists:split(WhitespacePos, CurrentLineAcc);
+-                                     _ ->
+-                                         {[], CurrentLineAcc}
+-                                 end,
+-    wrap_text_line(Length, Help, [lists:reverse(WrappedLine) | Acc], length(NextLineAcc), NextLineAcc);
+-wrap_text_line(_Length, [], Acc, _Count, [_ | _] = CurrentLineAcc) ->
+-    %% If there was a non-empty line when we reached the buffer, add it to the accumulator
+-    lists:reverse([lists:reverse(CurrentLineAcc) | Acc]);
+-wrap_text_line(_Length, [], Acc, _Count, _CurrentLineAcc) ->
+-    lists:reverse(Acc).
+-
+-
+-default_arg_value_to_string(Value) when is_atom(Value) ->
+-    atom_to_list(Value);
+-default_arg_value_to_string(Value) when is_binary(Value) ->
+-    binary_to_list(Value);
+-default_arg_value_to_string(Value) when is_integer(Value) ->
+-    integer_to_list(Value);
+-default_arg_value_to_string(Value) when is_float(Value) ->
+-    lists:flatten(io_lib:format("~w", [Value]));
+-default_arg_value_to_string(Value) ->
+-    Value.
+-
+-
+-%% @doc Tokenize a command line string with support for single and double
+-%%      quoted arguments (needed for arguments that have embedded whitespace).
+-%%      The function also supports the expansion of environment variables in
+-%%      both the Unix (${VAR}; $VAR) and Windows (%VAR%) formats. It does NOT
+-%%      support wildcard expansion of paths.
+--spec tokenize(CmdLine :: string()) -> [nonempty_string()].
+-tokenize(CmdLine) ->
+-    tokenize(CmdLine, [], []).
+-
+--spec tokenize(CmdLine :: string(), Acc :: [string()], ArgAcc :: string()) -> [string()].
+-tokenize([Sep | Tail], Acc, ArgAcc) when ?IS_WHITESPACE(Sep) ->
+-    NewAcc = case ArgAcc of
+-                 [_ | _] ->
+-                     %% Found separator: add to the list of arguments.
+-                     [lists:reverse(ArgAcc) | Acc];
+-                 [] ->
+-                     %% Found separator with no accumulated argument; discard it.
+-                     Acc
+-             end,
+-    tokenize(Tail, NewAcc, []);
+-tokenize([QuotationMark | Tail], Acc, ArgAcc) when QuotationMark =:= $"; QuotationMark =:= $' ->
+-    %% Quoted argument (might contain spaces, tabs, etc.)
+-    tokenize_quoted_arg(QuotationMark, Tail, Acc, ArgAcc);
+-tokenize([Char | _Tail] = CmdLine, Acc, ArgAcc) when Char =:= $$; Char =:= $% ->
+-    %% Unix and Windows environment variable expansion: ${VAR}; $VAR; %VAR%
+-    {NewCmdLine, Var} = expand_env_var(CmdLine),
+-    tokenize(NewCmdLine, Acc, lists:reverse(Var, ArgAcc));
+-tokenize([$\\, Char | Tail], Acc, ArgAcc) ->
+-    %% Escaped char.
+-    tokenize(Tail, Acc, [Char | ArgAcc]);
+-tokenize([Char | Tail], Acc, ArgAcc) ->
+-    tokenize(Tail, Acc, [Char | ArgAcc]);
+-tokenize([], Acc, []) ->
+-    lists:reverse(Acc);
+-tokenize([], Acc, ArgAcc) ->
+-    lists:reverse([lists:reverse(ArgAcc) | Acc]).
+-
+--spec tokenize_quoted_arg(QuotationMark :: char(), CmdLine :: string(), Acc :: [string()], ArgAcc :: string()) -> [string()].
+-tokenize_quoted_arg(QuotationMark, [QuotationMark | Tail], Acc, ArgAcc) ->
+-    %% End of quoted argument
+-    tokenize(Tail, Acc, ArgAcc);
+-tokenize_quoted_arg(QuotationMark, [$\\, Char | Tail], Acc, ArgAcc) ->
+-    %% Escaped char.
+-    tokenize_quoted_arg(QuotationMark, Tail, Acc, [Char | ArgAcc]);
+-tokenize_quoted_arg($" = QuotationMark, [Char | _Tail] = CmdLine, Acc, ArgAcc) when Char =:= $$; Char =:= $% ->
+-    %% Unix and Windows environment variable expansion (only for double-quoted arguments): ${VAR}; $VAR; %VAR%
+-    {NewCmdLine, Var} = expand_env_var(CmdLine),
+-    tokenize_quoted_arg(QuotationMark, NewCmdLine, Acc, lists:reverse(Var, ArgAcc));
+-tokenize_quoted_arg(QuotationMark, [Char | Tail], Acc, ArgAcc) ->
+-    tokenize_quoted_arg(QuotationMark, Tail, Acc, [Char | ArgAcc]);
+-tokenize_quoted_arg(_QuotationMark, CmdLine, Acc, ArgAcc) ->
+-    tokenize(CmdLine, Acc, ArgAcc).
+-
+-
+--spec expand_env_var(CmdLine :: nonempty_string()) -> {string(), string()}.
+-expand_env_var(CmdLine) ->
+-    case CmdLine of
+-        "${" ++ Tail ->
+-            expand_env_var("${", $}, Tail, []);
+-        "$" ++ Tail ->
+-            expand_env_var("$", Tail, []);
+-        "%" ++ Tail ->
+-            expand_env_var("%", $%, Tail, [])
+-    end.
+-
+--spec expand_env_var(Prefix :: string(), EndMark :: char(), CmdLine :: string(), Acc :: string()) -> {string(), string()}.
+-expand_env_var(Prefix, EndMark, [Char | Tail], Acc)
+-  when (Char >= $A andalso Char =< $Z) orelse (Char >= $a andalso Char =< $z) orelse
+-       (Char >= $0 andalso Char =< $9) orelse (Char =:= $_) ->
+-    expand_env_var(Prefix, EndMark, Tail, [Char | Acc]);
+-expand_env_var(Prefix, EndMark, [EndMark | Tail], Acc) ->
+-    {Tail, get_env_var(Prefix, [EndMark], Acc)};
+-expand_env_var(Prefix, _EndMark, CmdLine, Acc) ->
+-    {CmdLine, Prefix ++ lists:reverse(Acc)}.
+-
+-
+--spec expand_env_var(Prefix :: string(), CmdLine :: string(), Acc :: string()) -> {string(), string()}.
+-expand_env_var(Prefix, [Char | Tail], Acc)
+-  when (Char >= $A andalso Char =< $Z) orelse (Char >= $a andalso Char =< $z) orelse
+-       (Char >= $0 andalso Char =< $9) orelse (Char =:= $_) ->
+-    expand_env_var(Prefix, Tail, [Char | Acc]);
+-expand_env_var(Prefix, CmdLine, Acc) ->
+-    {CmdLine, get_env_var(Prefix, "", Acc)}.
+-
+-
+--spec get_env_var(Prefix :: string(), Suffix :: string(), Acc :: string()) -> string().
+-get_env_var(Prefix, Suffix, [_ | _] = Acc) ->
+-    Name = lists:reverse(Acc),
+-    %% Only expand valid/existing variables.
+-    case os:getenv(Name) of
+-        false -> Prefix ++ Name ++ Suffix;
+-        Value -> Value
+-    end;
+-get_env_var(Prefix, Suffix, []) ->
+-    Prefix ++ Suffix.
+-
+-
+--spec line_length() -> 0..?LINE_LENGTH.
+-line_length() ->
+-    case io:columns() of
+-        {ok, Columns} when Columns < ?LINE_LENGTH ->
+-            Columns - 1;
+-        _ ->
+-            ?LINE_LENGTH
+-    end.
+-
+-
+--spec to_string(term()) -> string().
+-to_string(List) when is_list(List) ->
+-    case io_lib:printable_list(List) of
+-        true  -> List;
+-        false -> io_lib:format("~p", [List])
+-    end;
+-to_string(Atom) when is_atom(Atom) ->
+-    atom_to_list(Atom);
+-to_string(Value) ->
+-    io_lib:format("~p", [Value]).
+-- 
+2.1.0
+

0004-Allow-discarding-building-ports.patch Added

@@ -0,0 +1,29 @@
+From 764c71d5df5786ed5b74d11a4904b282b5a29c4a Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
+Date: Mon, 18 May 2015 11:48:22 +0200
+Subject: [PATCH 4/7] Allow discarding building ports
+
+---
+ src/rebar_port_compiler.erl | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/rebar_port_compiler.erl b/src/rebar_port_compiler.erl
+index 35adc3c..04a4382 100644
+--- a/src/rebar_port_compiler.erl
++++ b/src/rebar_port_compiler.erl
+@@ -278,6 +278,12 @@ get_specs(Config, AppFile) ->
+                     %% No spec provided. Construct a spec
+                     %% from old-school so_name and sources
+                     [port_spec_from_legacy(Config, AppFile)];
++                [{null,[]}] ->
++                    [];
++                [null] ->
++                    [];
++                [skip] ->
++                    [];
+                 PortSpecs ->
+                     Filtered = filter_port_specs(PortSpecs),
+                     OsType = os:type(),
+-- 
+2.1.0
+

0005-Check-system-wide-libdir-in-case-of-source-based-dep.patch Added

@@ -0,0 +1,30 @@
+From 5d8e7c1db9f64d3a5e98dffde5255a82d23b4720 Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
+Date: Mon, 18 May 2015 11:48:49 +0200
+Subject: [PATCH 5/7] Check system wide libdir in case of source based dep
+
+---
+ src/rebar_deps.erl | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/rebar_deps.erl b/src/rebar_deps.erl
+index bd94921..2fc57f5 100644
+--- a/src/rebar_deps.erl
++++ b/src/rebar_deps.erl
+@@ -392,7 +392,12 @@ find_dep(Config, Dep, _Source) ->
+     %% _Source is defined.  Regardless of what it is, we must find it
+     %% locally satisfied or fetch it from the original source
+     %% into the project's deps
+-    find_dep_in_dir(Config, Dep, get_deps_dir(Config, Dep#dep.app)).
++    case find_dep_in_dir(Config, Dep, get_deps_dir(Config, Dep#dep.app)) of
++        {_Config1, {avail, _Dir}} = Avail ->
++            Avail;
++        {Config1, {missing, _}} ->
++            find_dep_in_dir(Config1, Dep, get_lib_dir(Dep#dep.app))
++    end.
+ 
+ find_dep_in_dir(Config, _Dep, {false, Dir}) ->
+     {Config, {missing, Dir}};
+-- 
+2.1.0
+

0006-Remove-any-traces-of-long-time-obsolete-escript-fold.patch Added

@@ -0,0 +1,30 @@
+From 3b4eb4e097c1252a59945da87efeb65b45bdb4ff Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
+Date: Mon, 18 May 2015 11:49:37 +0200
+Subject: [PATCH 6/7] Remove any traces of long-time obsolete escript:foldl/3
+
+---
+ src/rebar_utils.erl | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl
+index f3a082d..6bbf6d1 100644
+--- a/src/rebar_utils.erl
++++ b/src/rebar_utils.erl
+@@ -190,12 +190,7 @@ abort(String, Args) ->
+ %% undocumented exported fun and has been removed in R14.
+ escript_foldl(Fun, Acc, File) ->
+     {module, zip} = code:ensure_loaded(zip),
+-    case erlang:function_exported(zip, foldl, 3) of
+-        true ->
+-            emulate_escript_foldl(Fun, Acc, File);
+-        false ->
+-            escript:foldl(Fun, Acc, File)
+-    end.
++    emulate_escript_foldl(Fun, Acc, File).
+ 
+ find_executable(Name) ->
+     case os:find_executable(Name) of
+-- 
+2.1.0
+

0007-Remove-abnfc-compiler-support-n-a-in-Fedora-EPEL.patch Added

@@ -0,0 +1,163 @@
+From 9fdfcad5045c067e66a66cf6c6e2165f71a324a9 Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
+Date: Mon, 18 May 2015 11:51:07 +0200
+Subject: [PATCH 7/7] Remove abnfc compiler support (n/a in Fedora/EPEL)
+
+---
+ ebin/rebar.app               |   2 -
+ src/rebar_abnfc_compiler.erl | 123 -------------------------------------------
+ 2 files changed, 125 deletions(-)
+ delete mode 100644 src/rebar_abnfc_compiler.erl
+
+diff --git a/ebin/rebar.app b/ebin/rebar.app
+index c9932fc..bca047e 100644
+--- a/ebin/rebar.app
++++ b/ebin/rebar.app
+@@ -5,7 +5,6 @@
+  [{description, "Rebar: Erlang Build Tool"},
+   {vsn, "2.5.1"},
+   {modules, [ rebar,
+-              rebar_abnfc_compiler,
+               rebar_app_utils,
+               rebar_appups,
+               rebar_asn1_compiler,
+@@ -64,7 +63,6 @@
+          %% Dir specific processing modules
+          {modules, [
+                     {app_dir, [
+-                               rebar_abnfc_compiler,
+                                rebar_protobuffs_compiler,
+                                rebar_neotoma_compiler,
+                                rebar_asn1_compiler,
+diff --git a/src/rebar_abnfc_compiler.erl b/src/rebar_abnfc_compiler.erl
+deleted file mode 100644
+index 37731b5..0000000
+--- a/src/rebar_abnfc_compiler.erl
++++ /dev/null
+@@ -1,123 +0,0 @@
+-%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
+-%% ex: ts=4 sw=4 et
+-%% -------------------------------------------------------------------
+-%%
+-%% rebar: Erlang Build Tools
+-%%
+-%% Copyright (c) 2010 Anthony Ramine (nox@dev-extend.eu),
+-%%
+-%% Permission is hereby granted, free of charge, to any person obtaining a copy
+-%% of this software and associated documentation files (the "Software"), to deal
+-%% in the Software without restriction, including without limitation the rights
+-%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+-%% copies of the Software, and to permit persons to whom the Software is
+-%% furnished to do so, subject to the following conditions:
+-%%
+-%% The above copyright notice and this permission notice shall be included in
+-%% all copies or substantial portions of the Software.
+-%%
+-%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+-%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+-%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+-%% THE SOFTWARE.
+-%% -------------------------------------------------------------------
+-
+-%% The rebar_abnfc_compiler module is a plugin for rebar that compiles
+-%% ABNF grammars into parsers.  By default, it compiles all src/*.abnf
+-%% to src/*.erl.
+-%%
+-%% Configuration options should be placed in rebar.config under
+-%% 'abnfc_opts'.  Available options include:
+-%%
+-%%  doc_root: where to find the ABNF grammars to compile
+-%%            "src" by default
+-%%
+-%%  out_dir: where to put the generated files.
+-%%           "src" by default
+-%%
+-%%  source_ext: the file extension the ABNF grammars have.
+-%%              ".abnf" by default
+-%%
+-%%  module_ext: characters to append to the parser's module name
+-%%              "" by default
+--module(rebar_abnfc_compiler).
+-
+--export([compile/2]).
+-
+-%% for internal use only
+--export([info/2]).
+-
+--include("rebar.hrl").
+-
+-%% ===================================================================
+-%% Public API
+-%% ===================================================================
+-
+-compile(Config, _AppFile) ->
+-    DtlOpts = abnfc_opts(Config),
+-    rebar_base_compiler:run(Config, [],
+-                            option(doc_root, DtlOpts),
+-                            option(source_ext, DtlOpts),
+-                            option(out_dir, DtlOpts),
+-                            option(module_ext, DtlOpts) ++ ".erl",
+-                            fun compile_abnfc/3).
+-
+-%% ===================================================================
+-%% Internal functions
+-%% ===================================================================
+-
+-info(help, compile) ->
+-    ?CONSOLE(
+-       "Build ABNF (*.abnf) sources.~n"
+-       "~n"
+-       "Valid rebar.config options:~n"
+-       "  ~p~n",
+-       [
+-        {abnfc_opts, [{doc_root, "src"},
+-                      {out_dir, "src"},
+-                      {source_ext, ".abnfc"},
+-                      {module_ext, ""}]}
+-       ]).
+-
+-abnfc_opts(Config) ->
+-    rebar_config:get(Config, abnfc_opts, []).
+-
+-option(Opt, DtlOpts) ->
+-    proplists:get_value(Opt, DtlOpts, default(Opt)).
+-
+-default(doc_root) -> "src";
+-default(out_dir)  -> "src";
+-default(source_ext) -> ".abnf";
+-default(module_ext) -> "".
+-
+-abnfc_is_present() ->
+-    code:which(abnfc) =/= non_existing.
+-
+-compile_abnfc(Source, _Target, Config) ->
+-    case abnfc_is_present() of
+-        false ->
+-            ?ERROR("~n===============================================~n"
+-                   " You need to install abnfc to compile ABNF grammars~n"
+-                   " Download the latest tarball release from github~n"
+-                   "    https://github.com/nygge/abnfc~n"
+-                   " and install it into your erlang library dir~n"
+-                   "===============================================~n~n", []),
+-            ?FAIL;
+-        true ->
+-            AbnfcOpts = abnfc_opts(Config),
+-            SourceExt = option(source_ext, AbnfcOpts),
+-            Opts = [noobj,
+-                    {o, option(out_dir, AbnfcOpts)},
+-                    {mod, filename:basename(Source, SourceExt) ++
+-                         option(module_ext, AbnfcOpts)}],
+-            case abnfc:file(Source, Opts) of
+-                ok -> ok;
+-                Error ->
+-                    ?ERROR("Compiling grammar ~s failed:~n  ~p~n",
+-                           [Source, Error]),
+-                    ?FAIL
+-            end
+-    end.
+-- 
+2.1.0
+