-add rebar2 support, based on processone#16

-support R18 api

Author: Marcello Ceschia

EPLICENSE

@@ -0,0 +1,27 @@
+#!/usr/bin/env escript
+%% -*- erlang -*-
+
+main([ Known_ATTRS_Src ]) ->
+    io:format("% Generated by ~p~n", [filename:basename(escript:script_name())]),
+    Attributes = lists:usort(read_attrs(Known_ATTRS_Src)),
+    io:format("-define(XMPP_KNOWN_ATTRS,~n"
+              "        ~p).~n~n",
+              [ [ binary_to_atom(ATTR, utf8)
+                  || ATTR <- Attributes ] ]).
+
+read_attrs(Known_ATTRS_Src) ->
+    {ok, File} = file:open(Known_ATTRS_Src, [read, binary]),
+    read_attrs(File, io:get_line(File, ""), []).
+
+read_attrs(File, eof, Acc) ->
+    file:close(File),
+    lists:reverse(Acc);
+read_attrs(File, << $#, _/binary >>, Acc) ->
+    read_attrs(File, io:get_line(File, ""), Acc);
+read_attrs(File, << $\n >>, Acc) ->
+    read_attrs(File, io:get_line(File, ""), Acc);
+read_attrs(File, ATTR_bin, Acc) when is_binary(ATTR_bin) ->
+    Len = byte_size(ATTR_bin) - 1,
+    << ATTR:Len/binary, _/binary >> = ATTR_bin,
+    read_attrs(File, io:get_line(File, ""),
+	       [ATTR | Acc]).

README

@@ -0,0 +1,28 @@
+#!/usr/bin/env escript
+%% -*- erlang -*-
+
+main([ Known_ELEMS_Src ]) ->
+    io:format("% Generated by ~p~n", [filename:basename(escript:script_name())]),
+    Elements = lists:usort(read_elems(Known_ELEMS_Src)),
+    io:format("-define(XMPP_KNOWN_ELEMS,~n"
+              "        ~p).~n~n",
+              [ [ binary_to_atom(EL, utf8)
+                  || EL <- Elements ] ]),
+    timer:sleep(10).
+
+read_elems(Known_ELEMS_Src) ->
+    {ok, File} = file:open(Known_ELEMS_Src, [read, binary]),
+    read_elems(File, io:get_line(File, ""), []).
+
+read_elems(File, eof, Acc) ->
+    file:close(File),
+    lists:reverse(Acc);
+read_elems(File, << $#, _/binary >>, Acc) ->
+    read_elems(File, io:get_line(File, ""), Acc);
+read_elems(File, << $\n >>, Acc) ->
+    read_elems(File, io:get_line(File, ""), Acc);
+read_elems(File, EL_bin, Acc) when is_binary(EL_bin) ->
+    Len = byte_size(EL_bin) - 1,
+    << EL:Len/binary, _/binary >> = EL_bin,
+    read_elems(File, io:get_line(File, ""),
+	       [EL | Acc]).

include/internal/exmpp_known_attrs.hrl.es

@@ -0,0 +1,28 @@
+#!/usr/bin/env escript
+%% -*- erlang -*-
+
+main([ Known_NSS_Src ]) ->
+    io:format("% Generated by ~p~n", [filename:basename(escript:script_name())]),
+    Namespaces = lists:usort(read_nss(Known_NSS_Src)),
+    io:format("-define(XMPP_KNOWN_NSS,~n"
+              "        ~p).~n~n",
+              [ [ binary_to_atom(NS, utf8)
+                  || NS <- Namespaces ] ]),
+    timer:sleep(10).
+
+read_nss(Known_NSS_Src) ->
+    {ok, File} = file:open(Known_NSS_Src, [read, binary]),
+    read_nss(File, io:get_line(File, ""), []).
+
+read_nss(File, eof, Acc) ->
+    file:close(File),
+    lists:reverse(Acc);
+read_nss(File, << $#, _/binary >>, Acc) ->
+    read_nss(File, io:get_line(File, ""), Acc);
+read_nss(File, << $\n >>, Acc) ->
+    read_nss(File, io:get_line(File, ""), Acc);
+read_nss(File, NS_bin, Acc) when is_binary(NS_bin) ->
+    Len = byte_size(NS_bin) - 1,
+    << NS:Len/binary, _/binary >> = NS_bin,
+    read_nss(File, io:get_line(File, ""),
+             [NS | Acc]).

include/internal/exmpp_known_elems.hrl.es

@@ -0,0 +1,9 @@
+# --------------------------------------------------------------------
+XEP:		TBD1
+NAME:		OCCI Schema
+URL:		http://redmine.ogf.org/projects/occi-wg/repository/revisions/xml-data-format/raw/schemas/occi.xsd
+
+# --------------------------------------------------------------------
+XEP:		TBD2
+NAME:		XMLSchema schema
+URL:		http://www.w3.org/2001/XMLSchema.xsd

include/internal/exmpp_known_nss.hrl.es

@@ -0,0 +1,60 @@
+% -*- mode: erlang -*-
+{erl_opts, [debug_info,
+	    {d, 'HAVE_EXPAT', true},
+	    {d, 'HAVE_LIBXML2', true}
+	   ]}.
+
+%{require_otp_vsn, "R18.*"}.
+
+{clean_files, ["src/exmpp_known_attrs.erl",
+	       "src/exmpp_known_elems.erl",
+	       "src/exmpp_known_nss.erl",
+	       "include/internal/exmpp_known_attrs.hrl",
+	       "include/internal/exmpp_known_elems.hrl",
+	       "include/internal/exmpp_known_nss.hrl"]}.
+
+{pre_hooks, [
+	     {compile, "make -C include/internal/"},
+	     {compile, "make -C src/"}
+	    ]}.
+
+{port_specs, [
+	      % Stringprep port driver
+	      {"linux", "priv/lib/exmpp_stringprep.so",
+	       ["c_src/exmpp_driver.c", "c_src/stringprep_uni_data.c",
+		"c_src/stringprep_uni_norm.c", "c_src/exmpp_stringprep.c"],
+	       [{env,
+		 [{"LDFLAGS", "$LDFLAGS $ERL_LDFLAGS"}]}
+	       ]},
+	      % Expat port driver
+	      {"linux", "priv/lib/exmpp_xml_expat.so",
+	       ["c_src/exmpp_driver.c", "c_src/exmpp_xml.c", "c_src/exmpp_xml_expat.c"],
+	       [{env,
+		 [{"LDFLAGS", "$LDFLAGS -lexpat"}]}
+	       ]},
+	      {"linux", "priv/lib/exmpp_xml_expat_legacy.so",
+	       ["c_src/exmpp_driver.c", "c_src/exmpp_xml.c",
+		"c_src/exmpp_xml_expat_legacy.c"],
+	       [{env,
+		 [{"LDFLAGS", "$LDFLAGS -lexpat"}]}
+	       ]},
+	      % LibXML2 port drivers
+	      {"linux", "priv/lib/exmpp_xml_libxml2.so",
+	       ["c_src/exmpp_driver.c", "c_src/exmpp_xml.c", "c_src/exmpp_xml_libxml2.c"],
+	       [{env,
+		 [{"CFLAGS", "$CFLAGS -I/usr/include/libxml2"},
+		  {"LDFLAGS", "$LDFLAGS -lxml2"}]}
+	       ]},
+	      % OpenSSL TLS port driver
+	      {"linux", "priv/lib/exmpp_tls_openssl.so",
+	       ["c_src/exmpp_driver.c", "c_src/exmpp_tls.c", "c_src/exmpp_tls_openssl.c"],
+	       [{env,
+		 [{"LDFLAGS", "$LDFLAGS -lssl"}]}
+	       ]},
+	      % Zlib compression port driver
+	      {"linux", "priv/lib/exmpp_compress_zlib.so",
+	       ["c_src/exmpp_driver.c", "c_src/exmpp_compress_zlib.c"],
+	       [{env,
+		 [{"LDFLAGS", "$LDFLAGS -lz"}]}
+	       ]}
+	     ]}.

include/internal/occi-schemas.in

@@ -365,7 +365,7 @@ is_success(IQ) when ?IS_IQ(IQ) ->
 digest(ID, Passwd) ->
     Token = ID ++ Passwd,
     crypto:start(),
-    binary_to_list(crypto:sha(Token)).
+    binary_to_list(crypto:hash(sha, Token)).
 
 %% @spec (Plain) -> Hex
 %%     Plain = string()

rebar.config

@@ -218,6 +218,6 @@ identities(_) ->
 -spec(hash_caps/1 :: (string()) -> hash()).
 
 hash_caps(String) when is_list(String)->
-    base64:encode(crypto:sha(unicode:characters_to_list(String)));
+    base64:encode(crypto:hash(sha, unicode:characters_to_list(String)));
 hash_caps(_) ->
     throw({exmpp_caps, hash_caps, 'String : string()'}).

src/client/exmpp_client_legacy_auth.erl

@@ -348,24 +348,24 @@ iq_to_xmlel2(#iq{type = Type, id = ID, lang = Lang, payload = Payload,
 %% IQ standard attributes.
 %% --------------------------------------------------------------------
 
-%% @spec (El) -> bool()
+%% @spec (El) -> boolean()
 %%     El = exmpp_xml:xmlel()
 %% @doc Tell if `El' is an IQ.
 %%
 %% You should probably use the `IS_IQ(El)' guard expression.
 
--spec(is_iq/1 :: (#xmlel{}) -> bool()).
+-spec(is_iq/1 :: (#xmlel{}) -> boolean()).
 
 is_iq(IQ) when ?IS_IQ(IQ) -> true;
 is_iq(_El)                -> false.
 
-%% @spec (El) -> bool()
+%% @spec (El) -> boolean()
 %%     El = iq()
 %% @doc Tell if `El' is an IQ record.
 %%
 %% You should probably use the `IS_IQ_RECORD(El)' guard expression.
 
--spec(is_iq_record/1 :: (#iq{}) -> bool()).
+-spec(is_iq_record/1 :: (#iq{}) -> boolean()).
 
 is_iq_record(IQ) when ?IS_IQ_RECORD(IQ) -> true;
 is_iq_record(_El)                       -> false.
@@ -408,11 +408,11 @@ get_kind(IQ) when ?IS_IQ(IQ) ->
 get_kind(#iq{kind = Kind}) ->
     Kind.
 
-%% @spec (IQ) -> bool()
+%% @spec (IQ) -> boolean()
 %%     IQ = exmpp_xml:xmlel() | iq()
 %% @doc Tell if the IQ is a request.
 
--spec(is_request/1 :: (#xmlel{} | #iq{}) -> bool()).
+-spec(is_request/1 :: (#xmlel{} | #iq{}) -> boolean()).
 
 is_request(IQ) when ?IS_IQ(IQ) ->
     case get_kind(IQ) of
@@ -422,11 +422,11 @@ is_request(IQ) when ?IS_IQ(IQ) ->
 is_request(#iq{kind = Kind}) ->
     Kind == request.
 
-%% @spec (IQ) -> bool()
+%% @spec (IQ) -> boolean()
 %%     IQ = exmpp_xml:xmlel() | iq()
 %% @doc Tell if the IQ is a response.
 
--spec(is_response/1 :: (#xmlel{} | #iq{}) -> bool()).
+-spec(is_response/1 :: (#xmlel{} | #iq{}) -> boolean()).
 
 is_response(IQ) when ?IS_IQ(IQ) ->
     case get_kind(IQ) of
@@ -436,11 +436,11 @@ is_response(IQ) when ?IS_IQ(IQ) ->
 is_response(#iq{kind = Kind}) ->
     Kind == response.
 
-%% @spec (IQ) -> bool()
+%% @spec (IQ) -> boolean()
 %%     IQ = exmpp_xml:xmlel() | iq()
 %% @doc Tell if the IQ is a result (response of type `result').
 
--spec(is_result/1 :: (#xmlel{} | #iq{}) -> bool()).
+-spec(is_result/1 :: (#xmlel{} | #iq{}) -> boolean()).
 
 is_result(IQ) when ?IS_IQ(IQ) ->
     case get_type(IQ) of
@@ -450,11 +450,11 @@ is_result(IQ) when ?IS_IQ(IQ) ->
 is_result(#iq{type = Type}) ->
     Type == 'result'.
 
-%% @spec (IQ) -> bool()
+%% @spec (IQ) -> boolean()
 %%     IQ = exmpp_xml:xmlel() | iq()
 %% @doc Tell if the IQ is an error (response of type `error').
 
--spec(is_error/1 :: (#xmlel{} | #iq{}) -> bool()).
+-spec(is_error/1 :: (#xmlel{} | #iq{}) -> boolean()).
 
 is_error(IQ) when ?IS_IQ(IQ) ->
     case get_type(IQ) of