Prepare release

3 files changed, 80 insertions, 4 deletions

diff --git a/lib/erl_interface/doc/src/ei.xml b/lib/erl_interface/doc/src/ei.xml
index c22f3fb0ce..70af5642da 100644
--- a/lib/erl_interface/doc/src/ei.xml
+++ b/lib/erl_interface/doc/src/ei.xml
@@ -183,7 +183,7 @@ typedef enum {
       </func>
 
       <func>
-          <name since="OTP @OTP-15712@"><ret>int</ret><nametext>ei_decode_bitstring(const char *buf, int *index, const char **pp, unsigned int *bitoffsp, size_t *nbitsp)</nametext></name>
+          <name since="OTP 22.0"><ret>int</ret><nametext>ei_decode_bitstring(const char *buf, int *index, const char **pp, unsigned int *bitoffsp, size_t *nbitsp)</nametext></name>
           <fsummary>Decode a bitstring.</fsummary>
           <desc>
             <p>Decodes a bit string from the binary format.</p>
@@ -498,9 +498,9 @@ typedef enum {
     </func>
 
     <func>
-      <name since="OTP @OTP-15712@"><ret>int</ret>
+      <name since="OTP 22.0"><ret>int</ret>
       <nametext>ei_encode_bitstring(char *buf, int *index, const char *p, size_t bitoffs, size_t nbits)</nametext></name>
-      <name since="OTP @OTP-15712@"><ret>int</ret>
+      <name since="OTP 22.0"><ret>int</ret>
       <nametext>ei_x_encode_bitstring(ei_x_buff* x, const char *p, size_t bitoffs, size_t nbits)</nametext></name>
       <fsummary>Encode a bitstring.</fsummary>
       <desc>
diff --git a/lib/erl_interface/doc/src/notes.xml b/lib/erl_interface/doc/src/notes.xml
index 3d7f7e5637..c47f0d2bd1 100644
--- a/lib/erl_interface/doc/src/notes.xml
+++ b/lib/erl_interface/doc/src/notes.xml
@@ -31,6 +31,82 @@
   </header>
   <p>This document describes the changes made to the Erl_interface application.</p>
 
+<section><title>Erl_Interface 3.12</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The vxworks configure has been updated to respect the
+	    environment CFLAGS.</p>
+          <p>
+	    Own Id: OTP-15773</p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Minor adjustments made to build system for parallel
+	    configure.</p>
+          <p>
+	    Own Id: OTP-15340 Aux Id: OTP-14625 </p>
+        </item>
+        <item>
+          <p>
+	    The limited support for VxWorks is deprecated as of OTP
+	    22, and will be removed in OTP 23.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15621</p>
+        </item>
+        <item>
+	    <p>The old legacy <c>erl_interface</c> library (functions
+	    with prefix <c>erl_</c>) is deprecated as of OTP 22, and
+	    will be removed in OTP 23. This does not apply to the
+	    <c>ei</c> library. Reasonably new <c>gcc</c> compilers
+	    will issue deprecation warnings. In order to disable
+	    these warnings, define the macro
+	    <c>EI_NO_DEPR_WARN</c>.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15622</p>
+        </item>
+        <item>
+	    <p>Added support to receive, decode, encode and send both
+	    bit strings and export funs (<c>fun M:F/A</c>).</p>
+	    <p>New functions <c>ei_decode_bitstring</c> and
+	    <c>ei_encode_bitstring</c> have been added in order to
+	    decode and encode bit strings where the number of bits is
+	    not necessary divisible by 8 (a whole number of bytes).
+	    The existing functions <c>ei_decode_fun</c> and
+	    <c>ei_encode_fun</c> can now also handle export funs.</p>
+	    <p>Before this change, bit strings and export funs sent
+	    to an erl_interface c-node were encoded using an
+	    undocumented fallback tuple format. For bit strings
+	    <c>{Binary,BitsInLastByte}</c> and for export funs
+	    <c>{M,F}</c>. Existing c-node implementations expecting
+	    these tuples must be changed to instead use
+	    <c>ei_decode_bitstring</c> and <c>ei_decode_fun</c>. As a
+	    temporary solution you can also build erl_interface with
+	    macro <c>EI_COMPAT=21</c> or call
+	    <c>ei_set_compat_rel(21)</c> to receive the old fallback
+	    tuples.</p>
+          <p>
+	    *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>
+	    Own Id: OTP-15712 Aux Id: OTP-15774 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erl_Interface 3.11.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/erl_interface/vsn.mk b/lib/erl_interface/vsn.mk
index 4e31b3835d..cc72ed639a 100644
--- a/lib/erl_interface/vsn.mk
+++ b/lib/erl_interface/vsn.mk
@@ -1,2 +1,2 @@
-EI_VSN = 3.11.3
+EI_VSN = 3.12
 ERL_INTERFACE_VSN = $(EI_VSN)