From 0a701d90ce54dd945a16094996b0e3fb21690797 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Sat, 20 Dec 2014 17:25:09 +0100 Subject: [PATCH] 2014-12-20: Retired because of broken deps: unresolved dependencies for erlang-rebar-2.0.0-3.el5.i386: erlang-tools erlang-syntax_tools erlang-stdlib erlang-snmp erlang-sasl erlang-neotoma erlang-mustache erlang-lfe erlang-kernel erlang-getopt erlang-eunit erlang-erts erlang-erl_interface erlang-edoc erlang-dialyzer erlang-crypto erlang-compiler erlang-asn1 --- .gitignore | 3 - dead.package | 21 + erlang-rebar.spec | 179 ----- ...e-bundle-and-don-t-try-to-load-anyth.patch | 135 ---- rebar-0002-Remove-bundled-mustache.patch | 269 ------- rebar-0003-Remove-bundled-getopt.patch | 656 ------------------ ...0004-Allow-discarding-building-ports.patch | 27 - ...rlang-min-2-and-erlang-max-2-in-R12B.patch | 43 -- ...-lists-keyfind-3-in-R12B5-use-lists-.patch | 137 ---- rebar-0007-No-such-type-dict-in-R12B.patch | 26 - ...008-No-such-directive-opaque-in-R12B.patch | 30 - rebar-0009-No-such-type-boolean-in-R12B.patch | 26 - rebar.escript | 5 - sources | 1 - 14 files changed, 21 insertions(+), 1537 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 erlang-rebar.spec delete mode 100644 rebar-0001-No-need-to-create-bundle-and-don-t-try-to-load-anyth.patch delete mode 100644 rebar-0002-Remove-bundled-mustache.patch delete mode 100644 rebar-0003-Remove-bundled-getopt.patch delete mode 100644 rebar-0004-Allow-discarding-building-ports.patch delete mode 100644 rebar-0005-No-erlang-min-2-and-erlang-max-2-in-R12B.patch delete mode 100644 rebar-0006-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch delete mode 100644 rebar-0007-No-such-type-dict-in-R12B.patch delete mode 100644 rebar-0008-No-such-directive-opaque-in-R12B.patch delete mode 100644 rebar-0009-No-such-type-boolean-in-R12B.patch delete mode 100644 rebar.escript delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e0be0ef..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/basho-rebar-RELEASE-1-327-g90058c7.tar.gz -/basho-rebar-RELEASE-1-821-g635d1a9.tar.gz -/basho-rebar-2.0.0-0-g1c98f6c.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..578c5ac --- /dev/null +++ b/dead.package @@ -0,0 +1,21 @@ +2014-12-20: Retired because of broken deps: +unresolved dependencies for erlang-rebar-2.0.0-3.el5.i386: +erlang-tools +erlang-syntax_tools +erlang-stdlib +erlang-snmp +erlang-sasl +erlang-neotoma +erlang-mustache +erlang-lfe +erlang-kernel +erlang-getopt +erlang-eunit +erlang-erts +erlang-erl_interface +erlang-edoc +erlang-dialyzer +erlang-crypto +erlang-compiler +erlang-asn1 + diff --git a/erlang-rebar.spec b/erlang-rebar.spec deleted file mode 100644 index 873c468..0000000 --- a/erlang-rebar.spec +++ /dev/null @@ -1,179 +0,0 @@ -%global realname rebar -%global upstream basho -%global debug_package %{nil} -%global git_tag 1c98f6c -%global patchnumber 0 - - -Name: erlang-%{realname} -Version: 2.0.0 -Release: 3%{?dist} -Summary: Erlang Build Tools -Group: Development/Tools -License: MIT -URL: https://github.com/basho/rebar -# wget --content-disposition https://github.com/basho/rebar/tarball/635d1a9 -Source0: %{upstream}-%{realname}-%{version}-%{patchnumber}-g%{git_tag}.tar.gz -Source1: rebar.escript -# Fedora/EPEL-specific -Patch1: rebar-0001-No-need-to-create-bundle-and-don-t-try-to-load-anyth.patch -# Fedora/EPEL-specific -Patch2: rebar-0002-Remove-bundled-mustache.patch -# Fedora/EPEL-specific -Patch3: rebar-0003-Remove-bundled-getopt.patch -Patch4: rebar-0004-Allow-discarding-building-ports.patch -# R12B - EPEL5-specific -Patch5: rebar-0005-No-erlang-min-2-and-erlang-max-2-in-R12B.patch -# R12B - EPEL5-specific -Patch6: rebar-0006-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch -# R12B - EPEL5-specific -Patch7: rebar-0007-No-such-type-dict-in-R12B.patch -# R12B - EPEL5-specific -Patch8: rebar-0008-No-such-directive-opaque-in-R12B.patch -# R12B - EPEL5-specific -Patch9: rebar-0009-No-such-type-boolean-in-R12B.patch -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: erlang-erts -BuildRequires: erlang-getopt -BuildRequires: erlang-erl_interface -%if 0%{?el6}%{?fedora} -# No reltool at all in R12B -BuildRequires: erlang-reltool -%endif -# wip -#Requires: erlang-abnfc -Requires: erlang-asn1 -Requires: erlang-compiler -Requires: erlang-crypto -# FIXME does it still needed? -Requires: erlang-dialyzer -Requires: erlang-edoc -%if 0%{?el6}%{?fedora} -# No erlydtl in EPEL5 so far -Requires: erlang-erlydtl -%endif -Requires: erlang-erts -# Requires for port compiling - no direct references in Rebar's src/*.erl files -Requires: erlang-erl_interface -Requires: erlang-eunit -Requires: erlang-getopt -Requires: erlang-kernel -Requires: erlang-lfe -Requires: erlang-mustache -Requires: erlang-neotoma -Requires: erlang-protobuffs -%if 0%{?el6}%{?fedora} -# No reltool at all in R12B -Requires: erlang-reltool -%endif -Requires: erlang-sasl -Requires: erlang-snmp -Requires: erlang-stdlib -Requires: erlang-syntax_tools -Requires: erlang-tools -Provides: %{realname} = %{version}-%{release} - - -%description -Erlang Build Tools. - - -%prep -%setup -q -n %{upstream}-%{realname}-%{git_tag} -%patch1 -p1 -b .no_bundle -%patch2 -p1 -b .remove_bundled_mustache -%patch3 -p1 -b .remove_bundled_getopt -%patch4 -p1 -b .allow_discarding_ports -%if 0%{?el5} -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%endif -# FIXME enable back when erlang-abnfc will be available -rm -f src/rebar_abnfc_compiler.erl -sed -i -e "/rebar_abnfc_compiler/d" ebin/rebar.app -%if 0%{?el5} -# Remove erlydtl support -rm -f src/rebar_erlydtl_compiler.erl -sed -i -e "/rebar_erlydtl_compiler/d" ebin/rebar.app -# Remove reltool support - no reltool at all in the R12B -rm -f src/rebar_reltool.erl -sed -i -e "/rebar_reltool/d" ebin/rebar.app -# Remove templater support - not required just for building anyway -rm -f src/rebar_templater.erl -sed -i -e "/rebar_templater/d" ebin/rebar.app -%endif - - -%build -./bootstrap - - -%install -rm -rf $RPM_BUILD_ROOT -install -D -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/rebar -mkdir -p $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin -mkdir -p $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/include -install -m 644 ebin/%{realname}.app $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin -install -m 644 ebin/*.beam $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ebin -install -m 644 include/*.hrl $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/include -cp -a priv $RPM_BUILD_ROOT%{_libdir}/erlang/lib/%{realname}-%{version}/ - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%doc THANKS rebar.config.sample -%{_bindir}/rebar -%{_libdir}/erlang/lib/%{realname}-%{version} - - -%changelog -* Tue Dec 18 2012 Peter Lemenkov - 2.0.0-3 -- Fix templates - -* Wed Jul 18 2012 Fedora Release Engineering - 2.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jun 05 2012 Peter Lemenkov - 2.0.0-1 -- Ver. 2.0.0 - -* Tue May 22 2012 Peter Lemenkov - 2-9.20120514git635d1a9 -- Fix building in EL6 and Fedora - -* Mon May 21 2012 Peter Lemenkov - 2-8.20120514git635d1a9 -- Explicitly list erlang-erl_interface as a dependency -- Fixed EPEL5 dependencies - -* Sun May 20 2012 Peter Lemenkov - 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 - 2-6.20120514git635d1a9 -- Updated to the latest git snapshot - -* Fri Jan 13 2012 Fedora Release Engineering - 2-5.20101120git90058c7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 2-4.20101120git90058c7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Nov 22 2010 Peter Lemenkov - 2-3.20101120git90058c7 -- Added missing buildrequires - -* Sat Nov 20 2010 Peter Lemenkov - 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 - 2-1 -- Initial build - diff --git a/rebar-0001-No-need-to-create-bundle-and-don-t-try-to-load-anyth.patch b/rebar-0001-No-need-to-create-bundle-and-don-t-try-to-load-anyth.patch deleted file mode 100644 index c022af6..0000000 --- a/rebar-0001-No-need-to-create-bundle-and-don-t-try-to-load-anyth.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 05b31a23c8d70a3867173823478defe029b89c5d Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Tue, 28 Sep 2010 23:04:36 +0400 -Subject: [PATCH 1/9] No need to create bundle and don't try to load anything - from escript - -Signed-off-by: Peter Lemenkov ---- - bootstrap | 40 ---------------------------------------- - src/rebar_templater.erl | 30 ++---------------------------- - 2 files changed, 2 insertions(+), 68 deletions(-) - -diff --git a/bootstrap b/bootstrap -index c8a40de..be0523a 100755 ---- a/bootstrap -+++ b/bootstrap -@@ -56,46 +56,6 @@ main(Args) -> - %% Run rebar to do proper .app validation and such - rebar:main(["compile"] ++ Args), - -- %% Read the contents of the files in ebin and templates; note that we -- %% place all the beam files at the top level of the code archive so -- %% that code loading works properly. -- Files = load_files("*", "ebin") ++ load_files("priv/templates/*", "."), -- -- case zip:create("mem", Files, [memory]) of -- {ok, {"mem", ZipBin}} -> -- %% Archive was successfully created. Prefix that binary with our -- %% header and write to "rebar" file. -- %% Without -noshell -noinput escript consumes all input that would -- %% otherwise go to the shell for the next command. -- Script = <<"#!/usr/bin/env escript\n%%! -noshell -noinput\n", -- ZipBin/binary>>, -- case file:write_file("rebar", Script) of -- ok -> -- ok; -- {error, WriteError} -> -- io:format("Failed to write rebar script: ~p\n", -- [WriteError]), -- halt(1) -- end; -- {error, ZipError} -> -- io:format("Failed to construct rebar script archive: ~p\n", -- [ZipError]), -- halt(1) -- end, -- -- %% Finally, update executable perms for our script on *nix, -- %% or write out script files on win32. -- case os:type() of -- {unix,_} -> -- [] = os:cmd("chmod u+x rebar"), -- ok; -- {win32,_} -> -- write_windows_scripts(), -- ok; -- _ -> -- ok -- end, -- - %% Add a helpful message - io:format("Congratulations! You now have a self-contained script called" - " \"rebar\" in\n" -diff --git a/src/rebar_templater.erl b/src/rebar_templater.erl -index f608512..450eb4d 100644 ---- a/src/rebar_templater.erl -+++ b/src/rebar_templater.erl -@@ -54,11 +54,6 @@ - create(Config, File). - - 'list-templates'(_Config, _File) -> -- %% Load a list of all the files in the escript -- cache it in the pdict -- %% since we'll potentially need to walk it several times over the course -- %% of a run. -- cache_escript_files(), -- - %% Build a list of available templates - AvailTemplates = find_disk_templates() ++ find_escript_templates(), - ?CONSOLE("Available templates:\n", []), -@@ -70,11 +65,6 @@ - - - create(_Config, _) -> -- %% Load a list of all the files in the escript -- cache it in the pdict -- %% since we'll potentially need to walk it several times over the course -- %% of a run. -- cache_escript_files(), -- - %% Build a list of available templates - AvailTemplates = find_disk_templates() ++ find_escript_templates(), - ?DEBUG("Available templates: ~p\n", [AvailTemplates]), -@@ -174,18 +164,6 @@ render(Bin, Context) -> - %% Internal functions - %% =================================================================== - --%% --%% Scan the current escript for available files and cache in pdict. --%% --cache_escript_files() -> -- {ok, Files} = rebar_utils:escript_foldl( -- fun(Name, _, GetBin, Acc) -> -- [{Name, GetBin()} | Acc] -- end, -- [], rebar_config:get_global(escript, undefined)), -- erlang:put(escript_files, Files). -- -- - template_id() -> - case rebar_config:get_global(template, undefined) of - undefined -> -@@ -195,8 +173,7 @@ template_id() -> - end. - - find_escript_templates() -> -- [{escript, Name} || {Name, _Bin} <- erlang:get(escript_files), -- re:run(Name, ?TEMPLATE_RE, [{capture, none}]) == match]. -+ [{escript, Name} || Name <- rebar_utils:find_files(code:priv_dir(rebar) ++ "/templates", ?TEMPLATE_RE)]. - - find_disk_templates() -> - OtherTemplates = find_other_templates(), -@@ -227,10 +204,7 @@ select_template([{Type, Avail} | Rest], Template) -> - %% - %% Read the contents of a file from the appropriate source - %% --load_file(escript, Name) -> -- {Name, Bin} = lists:keyfind(Name, 1, erlang:get(escript_files)), -- Bin; --load_file(file, Name) -> -+load_file(_, Name) -> - {ok, Bin} = file:read_file(Name), - Bin. - --- -1.8.0.1 - diff --git a/rebar-0002-Remove-bundled-mustache.patch b/rebar-0002-Remove-bundled-mustache.patch deleted file mode 100644 index e042c2a..0000000 --- a/rebar-0002-Remove-bundled-mustache.patch +++ /dev/null @@ -1,269 +0,0 @@ -From 73c2af44588a4bc15d2ab6b8aefb28f0a47775b2 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Sat, 20 Nov 2010 16:36:45 +0300 -Subject: [PATCH 2/9] Remove bundled mustache - -Signed-off-by: Peter Lemenkov ---- - ebin/rebar.app | 3 +- - src/mustache.erl | 234 ------------------------------------------------------- - 2 files changed, 1 insertion(+), 236 deletions(-) - delete mode 100644 src/mustache.erl - -diff --git a/ebin/rebar.app b/ebin/rebar.app -index 5689b35..cb4ab64 100644 ---- a/ebin/rebar.app -+++ b/ebin/rebar.app -@@ -35,8 +35,7 @@ - rebar_upgrade, - rebar_utils, - rebar_xref, -- getopt, -- mustache ]}, -+ getopt ]}, - {registered, []}, - {applications, [kernel, - stdlib, -diff --git a/src/mustache.erl b/src/mustache.erl -deleted file mode 100644 -index ac501a0..0000000 ---- a/src/mustache.erl -+++ /dev/null -@@ -1,234 +0,0 @@ --%% The MIT License --%% --%% Copyright (c) 2009 Tom Preston-Werner --%% --%% 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(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}). -- ---ifdef(TEST). ---include_lib("eunit/include/eunit.hrl"). ---endif. -- --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: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:escape(mustache:get(" ++ Content ++ ", Ctx, " ++ atom_to_list(Mod) ++ "))"; --compile_tag("{", Content, State) -> -- Mod = State#mstate.mod, -- "mustache:get(" ++ Content ++ ", Ctx, " ++ atom_to_list(Mod) ++ ")"; --compile_tag("!", _Content, _State) -> -- "[]". -- --template_path(Mod) -> -- ModPath = code:which(Mod), -- re:replace(ModPath, "\.beam$", ".mustache", [{return, list}]). -- --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("<", Acc)); --escape([">" | Rest], Acc) -> -- escape(Rest, lists:reverse(">", Acc)); --escape(["&" | Rest], Acc) -> -- escape(Rest, lists:reverse("&", Acc)); --escape([X | Rest], Acc) -> -- escape(Rest, [X | Acc]). -- --%%--------------------------------------------------------------------------- -- --start([T]) -> -- Out = render(list_to_atom(T)), -- io:format(Out ++ "~n", []). -- ---ifdef(TEST). -- --simple_test() -> -- Ctx = dict:from_list([{name, "world"}]), -- Result = render("Hello {{name}}!", Ctx), -- ?assertEqual("Hello world!", Result). -- --integer_values_too_test() -> -- Ctx = dict:from_list([{name, "Chris"}, {value, 10000}]), -- Result = render("Hello {{name}}~nYou have just won ${{value}}!", Ctx), -- ?assertEqual("Hello Chris~nYou have just won $10000!", Result). -- ---endif. --- -1.8.0.1 - diff --git a/rebar-0003-Remove-bundled-getopt.patch b/rebar-0003-Remove-bundled-getopt.patch deleted file mode 100644 index 624a727..0000000 --- a/rebar-0003-Remove-bundled-getopt.patch +++ /dev/null @@ -1,656 +0,0 @@ -From f8b747a9fc7126bec35c1e4bc81257baa838e289 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Sat, 20 Nov 2010 16:40:15 +0300 -Subject: [PATCH 3/9] Remove bundled getopt - -Signed-off-by: Peter Lemenkov ---- - ebin/rebar.app | 3 +- - src/getopt.erl | 621 --------------------------------------------------------- - 2 files changed, 1 insertion(+), 623 deletions(-) - delete mode 100644 src/getopt.erl - -diff --git a/ebin/rebar.app b/ebin/rebar.app -index cb4ab64..cf69b8a 100644 ---- a/ebin/rebar.app -+++ b/ebin/rebar.app -@@ -34,8 +34,7 @@ - rebar_templater, - rebar_upgrade, - rebar_utils, -- rebar_xref, -- getopt ]}, -+ rebar_xref]}, - {registered, []}, - {applications, [kernel, - stdlib, -diff --git a/src/getopt.erl b/src/getopt.erl -deleted file mode 100644 -index 175b7a5..0000000 ---- a/src/getopt.erl -+++ /dev/null -@@ -1,621 +0,0 @@ --%%%------------------------------------------------------------------- --%%% @author Juan Jose Comellas --%%% @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(getopt). ---author('juanjo@comellas.org'). -- ---export([parse/2, usage/2, usage/3, usage/4]). -- ---export_type([arg_type/0, -- arg_value/0, -- arg_spec/0, -- simple_option/0, -- compound_option/0, -- option/0, -- option_spec/0]). -- ---define(TAB_LENGTH, 8). --%% Indentation of the help messages in number of tabs. ---define(INDENTATION, 3). -- --%% 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)). -- -- --%% 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'. -- -- --%% @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 :: any()}}. --parse(OptSpecList, CmdLine) -> -- try -- Args = if -- is_integer(hd(CmdLine)) -> -- string:tokens(CmdLine, " \t\n"); -- 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 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, "Usage: ~s~s~n~n~s~n", -- [ProgramName, usage_cmd_line(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()], string(), string(), output_stream() | [{string(), string()}]) -> ok. --usage(OptSpecList, ProgramName, CmdLineTail, OutputStream) when is_atom(OutputStream) -> -- io:format(OutputStream, "Usage: ~s~s ~s~n~n~s~n", -- [ProgramName, usage_cmd_line(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()], string(), string(), [{string(), string()}], output_stream()) -> ok. --usage(OptSpecList, ProgramName, CmdLineTail, OptionsTail, OutputStream) -> -- UsageOptions = lists:foldl( -- fun ({Prefix, Help}, Acc) -> -- add_option_help(Prefix, Help, Acc) -- end, usage_options_reverse(OptSpecList, []), OptionsTail), -- io:format(OutputStream, "Usage: ~s~s ~s~n~n~s~n", -- [ProgramName, usage_cmd_line(OptSpecList), CmdLineTail, -- lists:flatten(lists:reverse(UsageOptions))]). -- -- --%% @doc Return a string with the syntax for the command line options and --%% arguments. ---spec usage_cmd_line([option_spec()]) -> string(). --usage_cmd_line(OptSpecList) -> -- usage_cmd_line(OptSpecList, []). -- --usage_cmd_line([{Name, Short, Long, ArgSpec, _Help} | Tail], Acc) -> -- CmdLine = -- case ArgSpec of -- undefined -> -- if -- %% For options with short form and no argument. -- Short =/= undefined -> -- [$\s, $[, $-, Short, $]]; -- %% For options with only long form and no argument. -- Long =/= undefined -> -- [$\s, $[, $-, $-, Long, $]]; -- true -> -- [] -- end; -- _ -> -- if -- %% For options with short form and argument. -- Short =/= undefined -> -- [$\s, $[, $-, Short, $\s, $<, atom_to_list(Name), $>, $]]; -- %% For options with only long form and argument. -- Long =/= undefined -> -- [$\s, $[, $-, $-, Long, $\s, $<, atom_to_list(Name), $>, $]]; -- %% For options with neither short nor long form and argument. -- true -> -- [$\s, $<, atom_to_list(Name), $>] -- end -- end, -- usage_cmd_line(Tail, [CmdLine | Acc]); --usage_cmd_line([], Acc) -> -- lists:flatten(lists:reverse(Acc)). -- -- --%% @doc Return a string with the help message for each of the options and --%% arguments. ---spec usage_options([option_spec()]) -> string(). --usage_options(OptSpecList) -> -- lists:flatten(lists:reverse(usage_options_reverse(OptSpecList, []))). -- --usage_options_reverse([{Name, Short, Long, _ArgSpec, Help} | Tail], Acc) -> -- Prefix = -- case Long of -- undefined -> -- case Short of -- %% Neither short nor long form (non-option argument). -- undefined -> -- [$<, atom_to_list(Name), $>]; -- %% Only short form. -- _ -> -- [$-, Short] -- end; -- _ -> -- case Short of -- %% Only long form. -- undefined -> -- [$-, $- | Long]; -- %% Both short and long form. -- _ -> -- [$-, Short, $,, $\s, $-, $- | Long] -- end -- end, -- usage_options_reverse(Tail, add_option_help(Prefix, Help, Acc)); --usage_options_reverse([], Acc) -> -- Acc. -- -- --%% @doc Add the help message corresponding to an option specification to a list --%% with the correct indentation. ---spec add_option_help(Prefix :: string(), Help :: string(), Acc :: string()) -> string(). --add_option_help(Prefix, Help, Acc) when is_list(Help), Help =/= [] -> -- FlatPrefix = lists:flatten(Prefix), -- case ((?INDENTATION * ?TAB_LENGTH) - 2 - length(FlatPrefix)) of -- TabSize when TabSize > 0 -> -- Tab = lists:duplicate(ceiling(TabSize / ?TAB_LENGTH), $\t), -- [[$\s, $\s, FlatPrefix, Tab, Help, $\n] | Acc]; -- _ -> -- % The indentation for the option description is 3 tabs (i.e. 24 characters) -- % IMPORTANT: Change the number of tabs below if you change the -- % value of the INDENTATION macro. -- [[$\t, $\t, $\t, Help, $\n], [$\s, $\s, FlatPrefix, $\n] | Acc] -- end; --add_option_help(_Opt, _Prefix, Acc) -> -- Acc. -- -- -- --%% @doc Return the smallest integral value not less than the argument. ---spec ceiling(float()) -> integer(). --ceiling(X) -> -- T = erlang:trunc(X), -- case (X - T) of -- % Neg when Neg < 0 -> -- % T; -- Pos when Pos > 0 -> -- T + 1; -- _ -> -- T -- end. --- -1.8.0.1 - diff --git a/rebar-0004-Allow-discarding-building-ports.patch b/rebar-0004-Allow-discarding-building-ports.patch deleted file mode 100644 index df23c69..0000000 --- a/rebar-0004-Allow-discarding-building-ports.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b65a6fee95d3e97fc7047493ff4bd907971043d9 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Tue, 5 Jun 2012 15:10:12 +0400 -Subject: [PATCH 4/9] Allow discarding building ports - -Signed-off-by: Peter Lemenkov ---- - src/rebar_port_compiler.erl | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/rebar_port_compiler.erl b/src/rebar_port_compiler.erl -index cdd9be6..e56089b 100644 ---- a/src/rebar_port_compiler.erl -+++ b/src/rebar_port_compiler.erl -@@ -110,6 +110,9 @@ compile(Config, AppFile) -> - ok; % old specs empty - {new, [], []} -> - ok; % port_specs empty -+ {_, _, [{_,_,_,[],[],_}]} -> -+ % Special case to discard port processing at all -+ ok; % port_specs empty - - _ -> % have old/new specs - --- -1.8.0.1 - diff --git a/rebar-0005-No-erlang-min-2-and-erlang-max-2-in-R12B.patch b/rebar-0005-No-erlang-min-2-and-erlang-max-2-in-R12B.patch deleted file mode 100644 index 9d30894..0000000 --- a/rebar-0005-No-erlang-min-2-and-erlang-max-2-in-R12B.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 61ee2778f3931fdc95437208bdbb04b5477dabd9 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Tue, 22 May 2012 14:03:31 +0400 -Subject: [PATCH 5/9] No erlang:min/2 and erlang:max/2 in R12B - -Signed-off-by: Peter Lemenkov ---- - src/rebar_config.erl | 2 +- - src/rebar_log.erl | 5 ++++- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/rebar_config.erl b/src/rebar_config.erl -index 7f7d03c..41fa7be 100644 ---- a/src/rebar_config.erl -+++ b/src/rebar_config.erl -@@ -110,7 +110,7 @@ set(Config, Key, Value) -> - set_global(jobs=Key, Value) when is_list(Value) -> - set_global(Key, list_to_integer(Value)); - set_global(jobs=Key, Value) when is_integer(Value) -> -- application:set_env(rebar_global, Key, erlang:max(1, Value)); -+ application:set_env(rebar_global, Key, case (1 > Value) of true -> 1; _ -> Value end); - set_global(Key, Value) -> - application:set_env(rebar_global, Key, Value). - -diff --git a/src/rebar_log.erl b/src/rebar_log.erl -index b7529a9..29cd4ee 100644 ---- a/src/rebar_log.erl -+++ b/src/rebar_log.erl -@@ -69,7 +69,10 @@ default_level() -> error_level(). - %% =================================================================== - - valid_level(Level) -> -- erlang:max(error_level(), erlang:min(Level, debug_level())). -+ DL0= debug_level(), -+ EL = error_level(), -+ DL = case (Level < DL0) of true -> Level; _ -> DL0 end, -+ case (EL > DL) of true -> EL; _ -> DL end. - - error_level() -> 0. - debug_level() -> 3. --- -1.8.0.1 - diff --git a/rebar-0006-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch b/rebar-0006-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch deleted file mode 100644 index 2722bf9..0000000 --- a/rebar-0006-No-such-function-lists-keyfind-3-in-R12B5-use-lists-.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 9a2ccd60d6336d2faefd86d54606f5e824c6976b Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Tue, 22 May 2012 14:11:11 +0400 -Subject: [PATCH 6/9] No such function lists:keyfind/3 in R12B5 - use - lists:keysearch/3 instead - -Signed-off-by: Peter Lemenkov ---- - src/rebar_rel_utils.erl | 18 +++++++++--------- - src/rebar_reltool.erl | 10 +++++----- - src/rebar_templater.erl | 4 ++-- - src/rebar_xref.erl | 4 ++-- - 4 files changed, 18 insertions(+), 18 deletions(-) - -diff --git a/src/rebar_rel_utils.erl b/src/rebar_rel_utils.erl -index e502743..21ff2dc 100644 ---- a/src/rebar_rel_utils.erl -+++ b/src/rebar_rel_utils.erl -@@ -137,8 +137,8 @@ load_config(ReltoolFile) -> - %% Without this present, we can't run reltool. - %% - get_sys_tuple(ReltoolConfig) -> -- case lists:keyfind(sys, 1, ReltoolConfig) of -- {sys, _} = SysTuple -> -+ case lists:keysearch(sys, 1, ReltoolConfig) of -+ {value, {sys, _}} = SysTuple -> - SysTuple; - false -> - ?ABORT("Failed to find {sys, [...]} tuple in reltool.config.", []) -@@ -151,13 +151,13 @@ get_sys_tuple(ReltoolConfig) -> - get_target_dir(ReltoolConfig) -> - case rebar_config:get_global(target_dir, undefined) of - undefined -> -- case lists:keyfind(target_dir, 1, ReltoolConfig) of -- {target_dir, TargetDir} -> -+ case lists:keysearch(target_dir, 1, ReltoolConfig) of -+ {value, {target_dir, TargetDir}} -> - filename:absname(TargetDir); - false -> - {sys, SysInfo} = get_sys_tuple(ReltoolConfig), -- case lists:keyfind(rel, 1, SysInfo) of -- {rel, Name, _Vsn, _Apps} -> -+ case lists:keysearch(rel, 1, SysInfo) of -+ {value, {rel, Name, _Vsn, _Apps}} -> - filename:absname(Name); - false -> - filename:absname("target") -@@ -180,7 +180,7 @@ get_target_parent_dir(ReltoolConfig) -> - %% - get_root_dir(ReltoolConfig) -> - {sys, SysInfo} = get_sys_tuple(ReltoolConfig), -- SysRootDirTuple = lists:keyfind(root_dir, 1, SysInfo), -+ {value, SysRootDirTuple} = lists:keysearch(root_dir, 1, SysInfo), - CmdRootDir = rebar_config:get_global(root_dir, undefined), - case {SysRootDirTuple, CmdRootDir} of - %% root_dir in sys typle and no root_dir on cmd-line -@@ -218,8 +218,8 @@ make_proplist([], Acc) -> - Acc. - - expand_version(ReltoolConfig, Dir) -> -- case lists:keyfind(sys, 1, ReltoolConfig) of -- {sys, Sys} -> -+ case lists:keysearch(sys, 1, ReltoolConfig) of -+ {value, {sys, Sys}} -> - ExpandedSys = {sys, [expand_rel_version(Term, Dir) || Term <- Sys]}, - lists:keyreplace(sys, 1, ReltoolConfig, ExpandedSys); - _ -> -diff --git a/src/rebar_reltool.erl b/src/rebar_reltool.erl -index c114811..eb34385 100644 ---- a/src/rebar_reltool.erl -+++ b/src/rebar_reltool.erl -@@ -116,8 +116,8 @@ process_overlay(ReltoolConfig) -> - OverlayVars1), - - %% Finally, overlay the files specified by the overlay section -- case lists:keyfind(overlay, 1, ReltoolConfig) of -- {overlay, Overlay} when is_list(Overlay) -> -+ case lists:keysearch(overlay, 1, ReltoolConfig) of -+ {value, {overlay, Overlay}} when is_list(Overlay) -> - execute_overlay(Overlay, OverlayVars, rebar_utils:get_cwd(), - TargetDir); - false -> -@@ -156,10 +156,10 @@ load_vars_file(File) -> - - - validate_rel_apps(ReltoolServer, {sys, ReltoolConfig}) -> -- case lists:keyfind(rel, 1, ReltoolConfig) of -+ case lists:keysearch(rel, 1, ReltoolConfig) of - false -> - ok; -- {rel, _Name, _Vsn, Apps} -> -+ {value, {rel, _Name, _Vsn, Apps}} -> - %% Identify all the apps that do NOT exist, based on - %% what's available from the reltool server - Missing = lists:sort( -@@ -172,7 +172,7 @@ validate_rel_apps(ReltoolServer, {sys, ReltoolConfig}) -> - ?ABORT("Apps in {rel, ...} section not found by " - "reltool: ~p\n", [Missing]) - end; -- Rel -> -+ {value, Rel} -> - %% Invalid release format! - ?ABORT("Invalid {rel, ...} section in reltools.config: ~p\n", [Rel]) - end. -diff --git a/src/rebar_templater.erl b/src/rebar_templater.erl -index 450eb4d..6ec3277 100644 ---- a/src/rebar_templater.erl -+++ b/src/rebar_templater.erl -@@ -80,8 +80,8 @@ create(_Config, _) -> - %% Load the template definition as is and get the list of variables the - %% template requires. - TemplateTerms = consult(load_file(Type, Template)), -- case lists:keyfind(variables, 1, TemplateTerms) of -- {variables, Vars} -> -+ case lists:keysearch(variables, 1, TemplateTerms) of -+ {value, {variables, Vars}} -> - case parse_vars(Vars, dict:new()) of - {error, Entry} -> - Context0 = undefined, -diff --git a/src/rebar_xref.erl b/src/rebar_xref.erl -index 94103eb..17fb2a1 100644 ---- a/src/rebar_xref.erl -+++ b/src/rebar_xref.erl -@@ -159,8 +159,8 @@ filter_away_ignored(UnusedExports) -> - - - kf(Key, List) -> -- case lists:keyfind(Key, 1, List) of -- {Key, Value} -> -+ case lists:keysearch(Key, 1, List) of -+ {value, {Key, Value}} -> - Value; - false -> - [] --- -1.8.0.1 - diff --git a/rebar-0007-No-such-type-dict-in-R12B.patch b/rebar-0007-No-such-type-dict-in-R12B.patch deleted file mode 100644 index a47964a..0000000 --- a/rebar-0007-No-such-type-dict-in-R12B.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2bb73de1e7e86b9a92cc872927f68cdc8775731f Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Tue, 22 May 2012 14:44:44 +0400 -Subject: [PATCH 7/9] No such type dict() in R12B - -Signed-off-by: Peter Lemenkov ---- - src/rebar_config.erl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/rebar_config.erl b/src/rebar_config.erl -index 41fa7be..6cc9c53 100644 ---- a/src/rebar_config.erl -+++ b/src/rebar_config.erl -@@ -38,7 +38,7 @@ - - -record(config, { dir :: file:filename(), - opts = [] :: list(), -- envs = new_env() :: dict() }). -+ envs = new_env() :: term() }). - - %% Types that can be used from other modules -- alphabetically ordered. - -export_type([config/0]). --- -1.8.0.1 - diff --git a/rebar-0008-No-such-directive-opaque-in-R12B.patch b/rebar-0008-No-such-directive-opaque-in-R12B.patch deleted file mode 100644 index 8eb5757..0000000 --- a/rebar-0008-No-such-directive-opaque-in-R12B.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 35557ef77faceeb44e48aefe59dee6f40746bf84 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Tue, 22 May 2012 14:55:39 +0400 -Subject: [PATCH 8/9] No such directive -opaque in R12B - -Signed-off-by: Peter Lemenkov ---- - src/rebar_config.erl | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/src/rebar_config.erl b/src/rebar_config.erl -index 6cc9c53..50aba5b 100644 ---- a/src/rebar_config.erl -+++ b/src/rebar_config.erl -@@ -40,12 +40,6 @@ - opts = [] :: list(), - envs = new_env() :: term() }). - --%% Types that can be used from other modules -- alphabetically ordered. ---export_type([config/0]). -- --%% data types ---opaque config() :: #config{}. -- - %% =================================================================== - %% Public API - %% =================================================================== --- -1.8.0.1 - diff --git a/rebar-0009-No-such-type-boolean-in-R12B.patch b/rebar-0009-No-such-type-boolean-in-R12B.patch deleted file mode 100644 index d9a9a1b..0000000 --- a/rebar-0009-No-such-type-boolean-in-R12B.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e4a9974bb323f82fd39cbbe4e3eef2f42bfbc593 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Tue, 22 May 2012 15:06:36 +0400 -Subject: [PATCH 9/9] No such type boolean in R12B - -Signed-off-by: Peter Lemenkov ---- - src/rebar_erlc_compiler.erl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/rebar_erlc_compiler.erl b/src/rebar_erlc_compiler.erl -index 6535324..4c77af1 100644 ---- a/src/rebar_erlc_compiler.erl -+++ b/src/rebar_erlc_compiler.erl -@@ -233,7 +233,7 @@ inspect_epp(Epp, Source, Module, Includes) -> - end. - - -spec needs_compile(Source::file:filename(), Target::file:filename(), -- Hrls::[string()]) -> boolean(). -+ Hrls::[string()]) -> bool(). - needs_compile(Source, Target, Hrls) -> - TargetLastMod = filelib:last_modified(Target), - lists:any(fun(I) -> TargetLastMod < filelib:last_modified(I) end, --- -1.8.0.1 - diff --git a/rebar.escript b/rebar.escript deleted file mode 100644 index b0f8c62..0000000 --- a/rebar.escript +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env escript -%%! -noshell -noinput - -main (Args) -> - rebar:main(Args). diff --git a/sources b/sources deleted file mode 100644 index 1bef9c0..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -c7fd0775e25c5ab55c2ddef859f56816 basho-rebar-2.0.0-0-g1c98f6c.tar.gz