aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README360
-rw-r--r--erts/vsn.mk4
-rw-r--r--lib/ic/doc/src/Makefile14
-rw-r--r--lib/ic/doc/src/ic.xml32
-rw-r--r--lib/ic/doc/src/notes.xml14
-rw-r--r--lib/ic/vsn.mk6
-rw-r--r--lib/inets/doc/src/notes.xml34
-rw-r--r--lib/inets/src/inets_app/inets.appup.src10
-rw-r--r--lib/inets/src/inets_app/inets.erl5
-rw-r--r--lib/inets/vsn.mk2
-rw-r--r--lib/kernel/vsn.mk21
-rw-r--r--lib/megaco/doc/src/notes.xml61
-rw-r--r--lib/megaco/src/app/megaco.appup.src11
-rw-r--r--lib/megaco/vsn.mk2
-rw-r--r--lib/snmp/doc/src/Makefile4
-rw-r--r--lib/snmp/src/app/snmp.appup.src8
-rw-r--r--lib/snmp/vsn.mk2
-rw-r--r--lib/stdlib/src/array.erl16
-rw-r--r--lib/stdlib/test/array_SUITE.erl16
-rw-r--r--lib/stdlib/vsn.mk21
20 files changed, 404 insertions, 239 deletions
diff --git a/README b/README
index d175755704..51a9ddb756 100644
--- a/README
+++ b/README
@@ -2,16 +2,14 @@
OpenSource Erlang/OTP
===========================================================================
-
Please read the whole file before attempting to build and install Erlang.
-You can find more information about OpenSource Erlang at
+You can find more information about Open Source Erlang at:
- http://www.erlang.org/
+ http://www.erlang.org/
-The source code for Erlang/OTP can also be found in a Git
-repository at
+The source code for Erlang/OTP can also be found in a Git repository:
- http://github.com/erlang/otp
+ http://github.com/erlang/otp
%CopyrightBegin%
@@ -30,7 +28,6 @@ under the License.
%CopyrightEnd%
-
Portability
-----------
@@ -47,15 +44,14 @@ At Ericsson we have a "Daily Build and Test" that runs on:
Solaris/Sparc32 8, 9, 10
Solaris/Sparc64 10
Solaris/x86 10
- Linux/Suse x86 9.4, 10.1
- Linux/Suse x86_64 10.0, 10.1, 11.0
+ Linux/Suse x86 9.4, 10.1
+ Linux/Suse x86_64 10.0, 10.1, 11.0
FreeBSD x86 7.1
Mac OS X/Intel 10.4.11 (Tiger), 10.5.8 (Leopard)
- Windows XP SP3, 2003, Vista
+ Windows XP SP3, 2003, Vista
We have also done some testing on Mac OS 10.6.0 (Snow Leopard).
-
Versions known *not* to work
-------------------------------------
@@ -70,86 +66,66 @@ that will crash immediately. The bug is supposed to be fixed in gcc-4.3.1.
FreeBSD had a bug which caused kqueue/poll/select to fail to detect
that a writev() on a pipe has been made. This bug should have been fixed
-in FreeBSD 6.3 and FreeBSD 7.0. More information can be found at:
-* http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/kern/sys_pipe.c
-* http://lists.freebsd.org/pipermail/freebsd-arch/2007-September/006790.html
-NetBSD and DragonFlyBSD probably have or have had the same bug.
+in FreeBSD 6.3 and FreeBSD 7.0. NetBSD and DragonFlyBSD probably have or
+have had the same bug. More information can be found at:
+ * http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/kern/sys_pipe.c
+ * http://lists.freebsd.org/pipermail/freebsd-arch/2007-September/006790.html
getcwd() on Solaris 9 can cause an emulator crash. If you have async-threads
enabled you can increase the stack size of the async-threads as a temporary
workaround. See the +a command-line argument in the documentation of erl(1).
Without async-threads the emulator isn't as vulnerable to this bug, but if
you hit it without async-threads the only workaround available is to enable
-async-threads and increase the stack size of the async-threads.
-Sun has however released patches that fixes the issue:
+async-threads and increase the stack size of the async-threads. Sun has
+however released patches that fixes the issue:
+
Problem Description: 6448300 large mnttab can cause stack overrun during
- Solaris 9 getcwd
-* http://sunsolve.sun.com/search/document.do?assetkey=1-21-112874-40-1&searchclause=6448300
-* http://sunsolve.sun.com/search/document.do?assetkey=1-21-114432-29-1&searchclause=6448300
+Solaris 9 getcwd
+
+More information can be found at:
+ * http://sunsolve.sun.com/search/document.do?assetkey=1-21-112874-40-1&searchclause=6448300
+ * http://sunsolve.sun.com/search/document.do?assetkey=1-21-114432-29-1&searchclause=6448300
Required utilities
------------------
These are the tools you will need in order to unpack and build Erlang/OTP.
- Unpacking
- ---------
-
- GNU unzip, or a modern uncompress.
-
- A TAR program that understands the GNU TAR format for long
- filenames (such as GNU TAR).
-
-
- Compiling
- ---------
-
- GNU make
-
- GNU C compiler
-
- Perl 5
-
- GNU m4 If hipe (native code) support is enabled.
-
- ncurses (Or termcap or termlib.) The development headers and
- libraries are needed, often known as ncurses-devel.
- (Use --without-termcap to build without any of these
- libraries. Only the old shell (without any line
- editing) can be used.)
-
- OpenSSL Optional, but needed for building the Erlang/OTP
- applications 'ssl' and 'crypto'. You need the
- "development package" of OpenSSL, i.e. including
- the header files. For building the application 'ssl'
- the OpenSSL binary command program 'openssl' is also
- needed.
-
- At least version 0.9.7 of OpenSSL is required.
-
- Sun Java jdk-1.5.0 Or higher. Optional but needed for building
- the Erlang/OTP application 'jinterface' and parts
- of 'ic' and 'orber'. We have also tested
- IBM's JDK 1.5.0.
-
- X Windows Optional, but development headers and libraries
- are needed to build the Erlang/OTP application 'gs'
- on Unix/Linux.
-
- sed There seem to be some problems with some of the
- 'sed' version on Solaris. Make sure "/bin/sed"
- or "/usr/bin/sed" is used on the Solaris platform.
-
- Flex Optional, headers and libraries are needed to
- build the flex scanner for the megaco application
- on Unix/Linux.
-
-
- Installing
- ----------
-
- An 'install' program that can take multiple file names.
-
+Unpacking
+
+ * GNU unzip, or a modern uncompress.
+ * A TAR program that understands the GNU TAR format for long filenames (such
+as GNU TAR).
+
+Compiling
+
+ * GNU make
+ * GNU C compiler
+ * Perl 5
+ * GNU m4 -- If hipe (native code) support is enabled.
+ * ncurses (or termcap or termlib) -- The development headers and libraries
+ are needed, often known as ncurses-devel. (Use --without-termcap to build
+ without any of these libraries. Only the old shell (without any line
+ editing) can be used.)
+ * OpenSSL -- Optional, but needed for building the Erlang/OTP applications
+ 'ssl' and 'crypto'. You need the "development package" of OpenSSL, i.e.
+ including the header files. For building the application 'ssl' the OpenSSL
+ binary command program 'openssl' is also needed.
+ At least version 0.9.7 of OpenSSL is required.
+ * Sun Java jdk-1.5.0 or higher -- Optional but needed for building the
+ Erlang/OTP application 'jinterface' and parts of 'ic' and 'orber'. We
+ have also tested IBM's JDK 1.5.0.
+ * X Windows -- Optional, but development headers and libraries are needed
+ to build the Erlang/OTP application 'gs' on Unix/Linux.
+ * sed -- There seem to be some problems with some of the 'sed' version on
+ Solaris. Make sure "/bin/sed" or "/usr/bin/sed" is used on the Solaris
+ platform.
+ * Flex -- Optional, headers and libraries are needed to build the flex
+ scanner for the megaco application on Unix/Linux.
+
+Installing
+
+ * An 'install' program that can take multiple file names.
How to build and install Erlang/OTP
-----------------------------------
@@ -158,31 +134,30 @@ If you are building in a Git repository, see
http://wiki.github.com/erlang/otp
-The following instructions are for building using the
-source tar ball.
+The following instructions are for building using the source tar ball.
-Start by unpacking the Erlang/OTP distribution file with your
-GNU compatible TAR
+Step 1: Start by unpacking the Erlang/OTP distribution file with your GNU
+compatible TAR program.
- 1) gunzip -c otp_src_R13B03.tar.gz | tar xf -
- 1) zcat otp_src_R13B03.tar.gz | tar xf -
+ $ gunzip -c otp_src_R13B03.tar.gz | tar xf -
+ $ zcat otp_src_R13B03.tar.gz | tar xf -
-Now cd into the base directory
+Step 2: Now cd into the base directory.
- 2) cd otp_src_R13B03
+ $ cd otp_src_R13B03
-On some platforms Perl may behave strangely if certain locales are set,
-so optionally you may need to set the LANG variable:
+Step 3: On some platforms Perl may behave strangely if certain locales are
+set, so optionally you may need to set the LANG variable:
- 3a) LANG=C; export LANG #Bourne shell
+ # Bourne shell
+ $ LANG=C; export LANG
or
- 3b) setenv LANG C #C-shell
+ # C-Shell
+ $ setenv LANG C
-Run the following commands
+Step 4: Run the following commands to configure the build:
- 4a) ./configure [ options ]
-or
- 4b) ./configure --prefix=<BaseDir> [ other options ]
+ $ ./configure [ options ]
By default, Erlang/OTP will be installed in /usr/local/{bin,lib/erlang,man/man1}.
To instead install in <BaseDir>/{bin,lib/erlang,man/man1}, use the --prefix=<BaseDir>
@@ -192,14 +167,18 @@ If you upgraded the source with some patch you may need to clean up
from previous builds before the new build. Do a "make clean"; see
"Caveats" below.
- 5) make
- 6) make install
+Step 5: Build the Erlang/OTP package.
+
+ $ make
+
+Step 6: Install then Erlang/OTP package
+
+ $ make install
Let's go through them in some detail:
-Step 4 runs a configuration script created by the GNU autoconf
-utility, which checks for system specific features and then creates a
-number of makefiles.
+Step 4 runs a configuration script created by the GNU autoconf utility, which
+checks for system specific features and then creates a number of makefiles.
The configure script allows you to customize a number of parameters;
type "./configure --help" for details.
@@ -221,30 +200,28 @@ located, or alternatively disable the use of SSL and Crypto.
Other options are:
- --enable-smp-support See the next section.
+ --enable-smp-support See the next section.
+
+ --disable-smp-support See the next section.
- --disable-smp-support See the next section.
+ --disable-threads Disable support for threaded I/O;
+ this option also disables building of the SMP
+ emulator. (See the next section.)
- --disable-threads Disable support for threaded I/O;
- this option also disables building
- of the SMP emulator. (See the next section.)
+ --enable-threads Enable support for threaded I/O.
+ (This is the default if SMP support is enabled.
+ See the next section.)
- --enable-threads Enable support for threaded I/O.
- (This is the default if SMP support is enabled.
- See the next section.)
-
- --disable-hipe Disable HiPE (High-Performance Erlang).
- HiPE will automatically be enabled on
- supported platforms.
-
+ --disable-hipe Disable HiPE (High-Performance Erlang).
+ HiPE will automatically be enabled on supported
+ platforms.
- Step 5 builds the Erlang/OTP system. On a fast computer,
-this will take about 5 minutes. After completion of this step,
-you should have a working Erlang/OTP system which you can
-try by typing "bin/erl". This should start up Erlang/OTP and give you
-a prompt.
+Step 5 builds the Erlang/OTP system. On a fast computer, this will take about
+5 minutes. After completion of this step, you should have a working
+Erlang/OTP system which you can try by typing "bin/erl". This should start
+up Erlang/OTP and give you a prompt.
- Step 6 is optional. It installs Erlang/OTP (if you change your
+Step 6 is optional. It installs Erlang/OTP (if you change your
mind about where you wish to install you can rerun step 4, without
having to do step 5 again).
@@ -329,14 +306,14 @@ How to install the Erlang/OTP documentation
For some graphical tools to find the on-line help you have to install
the HTML documentation on top of the installed OTP applications, i.e.
- cd <PrefixDir>/lib/erlang
- gunzip -c otp_html_R<XY>B-<Z>.tar.gz | tar xf -
+ $ cd <PrefixDir>/lib/erlang
+ $ gunzip -c otp_html_R<XY>B-<Z>.tar.gz | tar xf -
For "erl -man <page>" to work the Unix manual pages have to be
installed in the same way, i.e.
- cd <PrefixDir>/lib/erlang
- gunzip -c otp_man_R<XY>B-<Z>.tar.gz | tar xf -
+ $ cd <PrefixDir>/lib/erlang
+ $gunzip -c otp_man_R<XY>B-<Z>.tar.gz | tar xf -
GS (Graphic System)
@@ -344,110 +321,107 @@ GS (Graphic System)
GS now Tcl/Tk 8.4. It will be searched for when starting GS.
-
Using HiPE
----------
HiPE supports the following system configurations:
x86:
- All 32-bit and 64-bit mode processors should work.
-
- The following systems are supported:
-
- Linux:
- Fedora Core is supported.
- Both 32-bit and 64-bit modes are supported.
-
- NPTL glibc is strongly preferred, or a LinuxThreads
- glibc configured for "floating stacks". Old non-floating
- stacks glibcs have a fundamental problem that makes HiPE
- support and threads support mutually exclusive.
- Solaris:
- Solaris 10 (32-bit and 64-bit) and 9 (32-bit) are
- supported.
-
- The build requires a version of the GNU C compiler (gcc)
- that has been configured to use the GNU assembler (gas).
- Sun's x86 assembler is emphatically /not/ supported.
- FreeBSD:
- FreeBSD 6.1 and 6.2 in 32-bit and 64-bit modes should work.
- MacOSX/Darwin:
- Darwin 9.8.0 in 32-bit mode should work.
+ All 32-bit and 64-bit mode processors should work.
+
+ Linux:
+ Fedora Core is supported.
+ Both 32-bit and 64-bit modes are supported.
+
+ NPTL glibc is strongly preferred, or a LinuxThreads
+ glibc configured for "floating stacks". Old non-floating
+ stacks glibcs have a fundamental problem that makes HiPE
+ support and threads support mutually exclusive.
+
+ Solaris:
+ Solaris 10 (32-bit and 64-bit) and 9 (32-bit) are supported.
+
+ The build requires a version of the GNU C compiler (gcc)
+ that has been configured to use the GNU assembler (gas).
+ Sun's x86 assembler is emphatically /not/ supported.
+
+ FreeBSD:
+ FreeBSD 6.1 and 6.2 in 32-bit and 64-bit modes should work.
+
+ MacOSX/Darwin:
+ Darwin 9.8.0 in 32-bit mode should work.
PowerPC:
- All 32-bit 6xx/7xx(G3)/74xx(G4) processors should work.
- 32-bit mode on 970 (G5) and POWER5 processors should work.
+ All 32-bit 6xx/7xx(G3)/74xx(G4) processors should work. 32-bit mode on
+ 970 (G5) and POWER5 processors should work.
- Linux (Yellow Dog) and Mac OSX 10.4 are supported.
+ Linux (Yellow Dog) and Mac OSX 10.4 are supported.
SPARC:
- All UltraSPARC processors running 32-bit user code should work.
+ All UltraSPARC processors running 32-bit user code should work.
+
+ Solaris 9 and Linux (Aurora) are supported.
- Solaris 9 and Linux (Aurora) are supported.
+ On Solaris the build requires a gcc that has been configured to use Sun's
+ assembler and linker. Using the GNU assembler but Sun's linker has been
+ known to cause problems.
- On Solaris the build requires a gcc that has been configured
- to use Sun's assembler and linker. Using the GNU assembler but
- Sun's linker has been known to cause problems.
ARM:
- ARMv5TE (i.e. XScale) processors should work.
- Both big-endian and little-endian modes are supported.
+ ARMv5TE (i.e. XScale) processors should work. Both big-endian and
+ little-endian modes are supported.
- Linux is supported.
+ Linux is supported.
HiPE is automatically enabled on the following systems:
- x86 in 32-bit mode: Linux, Solaris, FreeBSD
- x86 in 64-bit mode: Linux, Solaris, FreeBSD
- PowerPC: Linux, MacOSX
- SPARC: Linux
- ARM: Linux
-On other supported systems you need to "./configure --enable-hipe".
+ x86 in 32-bit mode: Linux, Solaris, FreeBSD
+ x86 in 64-bit mode: Linux, Solaris, FreeBSD
+ PowerPC: Linux, MacOSX
+ SPARC: Linux
+ ARM: Linux
+On other supported systems you need to "./configure --enable-hipe".
-If you are running on a platform supporting HiPE and if
-you have not disabled HiPE, you can compile a module into
-native code like this from the Erlang shell:
+If you are running on a platform supporting HiPE and if you have not disabled
+HiPE, you can compile a module into native code like this from the Erlang
+shell:
- c(Module, native).
+ 1> c(Module, native).
or
- c(Module, [native|OtherOptions]).
+ 1> c(Module, [native|OtherOptions]).
Using the erlc program, write like this:
- erlc +native Module.erl
+ $ erlc +native Module.erl
-The native code will be placed into the beam file and automatically
-loaded when the beam file is loaded.
+The native code will be placed into the beam file and automatically loaded
+when the beam file is loaded.
To add hipe options, write like this from the Erlang shell:
- c(Module, [native,{hipe,HipeOptions}|MoreOptions]).
+ 1> c(Module, [native,{hipe,HipeOptions}|MoreOptions]).
-Use
-
- hipe:help_options().
-
-to print out the available options.
+Use hipe:help_options/0 to print out the available options.
+ 1> hipe:help_options().
Mac OS X (Darwin)
-----------------
-We test Mac OS X 10.4.11 (Tiger) and Mac OS X 10.5.x (Leopard)
-in our daily builds (but only on Intel processors).
+We test Mac OS X 10.4.11 (Tiger) and Mac OS X 10.5.x (Leopard) in our daily
+builds (but only on Intel processors).
-Make sure that the command "hostname" returns a valid fully qualified
-host name (this is configured in "/etc/hostconfig").
+Make sure that the command "hostname" returns a valid fully qualified host
+name (this is configured in "/etc/hostconfig").
If you develop linked-in drivers (shared library) you need to link
-using "gcc" and the flags "-bundle -flat_namespace -undefined
-suppress". You also include "-fno-common" in CFLAGS when
+using "gcc" and the flags '-bundle -flat_namespace -undefined
+suppress'. You also include '-fno-common' in CFLAGS when
compiling. Use ".so" as the library suffix.
Universal 32bit binaries can be built on an Intel Mac using the
---enable-darwin-universal configure option. There still may occur
+'--enable-darwin-universal' configure option. There still may occur
problems with certain applications using this option, but the base
system should run smoothly.
@@ -455,16 +429,16 @@ When building universal binaries on a PowerPC Mac (at least on Tiger),
you must point out a suitable SDK that contains universal binaries.
For instance, to build universal binaries for Tiger (10.4):
-CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk" LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk" ./configure --enable-darwin-universal
-
-Also, if you run Leopard, but want to build for Tiger, you must do
+ $ CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk" \
+ LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk" \
+ ./configure --enable-darwin-universal
-export MACOSX_DEPLOYMENT_TARGET=10.4
+Also, if you run Leopard, but want to build for Tiger, you must do by setting the MACOSX_DEPLOYMENT_TARGET environmental variable.
-before running the above configure command.
+ $ export MACOSX_DEPLOYMENT_TARGET=10.4
Experimental support for 64bit x86 darwin binaries can be enabled
-using the --enable-darwin-64bit configure flag. The 64bit binaries are
+using the '--enable-darwin-64bit' configure flag. The 64bit binaries are
best built and run on Leopard, but most of the system also works on
Tiger (Tiger's 64bit libraries are, however, limited; therefore e.g. odbc,
crypto, ssl etc. are not supported in Tiger). 64bit PPC binaries are not
@@ -473,7 +447,6 @@ test on).
Universal binaries and 64bit binaries are mutually exclusive options.
-
Make and the variable "ERL_TOP"
-------------------------------
@@ -488,12 +461,11 @@ before you run make.
For example, assume your GNU make program is called "make" and you
want to rebuild the application STDLIB, then you could do:
- cd lib/stdlib; env ERL_TOP=<Dir> make
+ $ cd lib/stdlib; env ERL_TOP=<Dir> make
where <Dir> would be what you find ERL_TOP is set to in the top level
Makefile.
-
Authors
-------
Authors are mostly listed in the application's AUTHORS files,
@@ -504,4 +476,4 @@ not in the individual source files.
More Information
----------------
-More information can be found at http://www.erlang.org.
+More information can be found at http://www.erlang.org/.
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 199b1cbf22..8f940339df 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -17,8 +17,8 @@
# %CopyrightEnd%
#
-VSN = 5.7.4
-SYSTEM_VSN = R13B03
+VSN = 5.7.5
+SYSTEM_VSN = R13B04
# Port number 4365 in 4.2
# Port number 4366 in 4.3
diff --git a/lib/ic/doc/src/Makefile b/lib/ic/doc/src/Makefile
index fff930d745..f00bba2c71 100644
--- a/lib/ic/doc/src/Makefile
+++ b/lib/ic/doc/src/Makefile
@@ -169,6 +169,7 @@ JD_GIF_FILES = \
PACK_DIR = com/ericsson/otp/ic
JAVA_SOURCE_DIR = ../../java_src/$(PACK_DIR)
+JAVA_OUT_DIR = ../html/java
JD_PACK_HTML_FILES = \
package-frame.html \
@@ -176,10 +177,10 @@ JD_PACK_HTML_FILES = \
package-tree.html
JAVADOC_PACK_HTML_FILES = \
- $(JAVA_SOURCE_FILES:%.java=../html/java/$(PACK_DIR)/%.html) \
- $(JD_PACK_HTML_FILES:%=../html/java/$(PACK_DIR)/%)
+ $(JAVA_SOURCE_FILES:%.java=$(JAVA_OUT_DIR)/$(PACK_DIR)/%.html) \
+ $(JD_PACK_HTML_FILES:%=$(JAVA_OUT_DIR)/$(PACK_DIR)/%)
-JAVADOC_INDEX_HTML_FILES = $(JD_INDEX_HTML_FILES:%=../html/java/%)
+JAVADOC_INDEX_HTML_FILES = $(JD_INDEX_HTML_FILES:%=$(JAVA_OUT_DIR)/%)
JAVADOC_GENERATED_FILES = $(JAVADOC_PACK_HTML_FILES) $(JAVADOC_INDEX_HTML_FILES)
@@ -244,11 +245,14 @@ clean clean_docs clean_tex:
rm -f $(HTML_FILES) $(MAN3_FILES)
rm -f $(TOP_PDF_FILE) $(TOP_PS_FILE)
rm -f errs core *~ *xmls_output *xmls_errs $(LATEX_CLEAN)
- rm -rf ../html/java/*
+ rm -rf $(JAVA_OUT_DIR)
endif
-$(JAVADOC_GENERATED_FILES):
+$(JAVA_OUT_DIR):
+ mkdir $(JAVA_OUT_DIR)
+
+$(JAVADOC_GENERATED_FILES): $(JAVA_OUT_DIR)
@(cd ../../java_src; $(JAVADOC) $(JAVADOCFLAGS) com.ericsson.otp.ic)
man: $(MAN3_FILES)
diff --git a/lib/ic/doc/src/ic.xml b/lib/ic/doc/src/ic.xml
index 9f48229425..b743736a66 100644
--- a/lib/ic/doc/src/ic.xml
+++ b/lib/ic/doc/src/ic.xml
@@ -4,23 +4,21 @@
<erlref>
<header>
<copyright>
- <year>1997</year>
- <year>2007</year>
- <holder>Ericsson AB, All Rights Reserved</holder>
+ <year>1997</year><year>2009</year>
+ <holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
- The contents of this file are subject to the Erlang Public License,
- Version 1.1, (the "License"); you may not use this file except in
- compliance with the License. You should have received a copy of the
- Erlang Public License along with this software. If not, it can be
- retrieved online at http://www.erlang.org/.
-
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and limitations
- under the License.
-
- The Initial Developer of the Original Code is Ericsson AB.
+ The contents of this file are subject to the Erlang Public License,
+ Version 1.1, (the "License"); you may not use this file except in
+ compliance with the License. You should have received a copy of the
+ Erlang Public License along with this software. If not, it can be
+ retrieved online at http://www.erlang.org/.
+
+ Software distributed under the License is distributed on an "AS IS"
+ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+ the License for the specific language governing rights and limitations
+ under the License.
+
</legalnotice>
<title>ic</title>
@@ -64,7 +62,7 @@
<v>timeout | {timeout, String()} | {{timeout, String()}, bool()} |</v>
<v>{scoped_op_calls, bool()} | {scl, bool()} |</v>
<v>{user_protocol, Prefix} |</v>
- <v>{c_timeout, SendTimeout, RecvTimeout} |</v>
+ <v>{c_timeout, {SendTimeout, RecvTimeout}} |</v>
<v>{c_report, bool()} |</v>
<v>{precond, {atom(), atom()}} | {{precond, String()} {atom(), atom()}} |</v>
<v>{postcond, {atom(), atom()}} | {{postcond, String()} {atom(), atom()}}</v>
@@ -264,7 +262,7 @@ The option
<p>Makes sends and receives to have timeouts (C back-ends only). These
timeouts are specified in milliseconds. </p>
<p>Example options:
- <c>[{be,c_client},{c_timeout, 10000, 20000}])</c> produces
+ <c>[{be,c_client},{c_timeout, {10000, 20000}}])</c> produces
client stubs which use a 10 seconds send timeout, and a
20 seconds receive timeout.</p>
</item>
diff --git a/lib/ic/doc/src/notes.xml b/lib/ic/doc/src/notes.xml
index c4314d8cc1..021a1e058f 100644
--- a/lib/ic/doc/src/notes.xml
+++ b/lib/ic/doc/src/notes.xml
@@ -31,6 +31,20 @@
</header>
<section>
+ <title>IC 4.2.24</title>
+
+ <section>
+ <title>Fixed Bugs and Malfunctions</title>
+ <list type="bulleted">
+ <item>
+ <p>The option c_timeout was not correctly documented.</p>
+ <p>Own id: OTP-8307 Aux Id: seq11390</p>
+ </item>
+ </list>
+ </section>
+ </section>
+
+ <section>
<title>IC 4.2.23</title>
<section>
diff --git a/lib/ic/vsn.mk b/lib/ic/vsn.mk
index 6f973e3db4..ec4bb7c3a6 100644
--- a/lib/ic/vsn.mk
+++ b/lib/ic/vsn.mk
@@ -1,6 +1,8 @@
-IC_VSN = 4.2.23
+IC_VSN = 4.2.24
-TICKETS = OTP-8201
+TICKETS = OTP-8307
+
+TICKETS_4.2.23 = OTP-8201
TICKETS_4.2.22 = OTP-8088
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 489e88cbe5..687e127d0b 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -32,6 +32,40 @@
<file>notes.xml</file>
</header>
+ <section><title>Inets 5.2.0.1</title>
+
+ <section><title>Improvements and New Features</title>
+ <p>-</p>
+<!--
+ <list>
+ <item>
+ <p>The documentation is now built with open source tools
+ (<em>xsltproc</em> and <em>fop</em>) that exists on most
+ platforms. One visible change is that the frames are removed.</p>
+ <p>Own Id: OTP-8249</p>
+ </item>
+
+ </list>
+-->
+ </section>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+
+<!--
+ <p>-</p>
+-->
+
+ <list>
+ <item>
+ <p>Fixing minor Dialyzer and copyright problem.</p>
+ </item>
+
+ </list>
+ </section>
+
+ </section> <!-- 5.2.0.1 -->
+
+
<section><title>Inets 5.2</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index 59ee1ba03d..0112a64239 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,6 +18,11 @@
{"%VSN%",
[
+ {"5.2",
+ [
+ {load_module, inets, soft_purge, soft_purge, []}
+ ]
+ },
{"5.1.3",
[
{load_module, httpd_response, soft_purge, soft_purge, []},
@@ -33,6 +38,11 @@
}
],
[
+ {"5.2",
+ [
+ {load_module, inets, soft_purge, soft_purge, []}
+ ]
+ },
{"5.1.3",
[
{load_module, httpd_response, soft_purge, soft_purge, []},
diff --git a/lib/inets/src/inets_app/inets.erl b/lib/inets/src/inets_app/inets.erl
index 7977a3dc2a..77cb14cc20 100644
--- a/lib/inets/src/inets_app/inets.erl
+++ b/lib/inets/src/inets_app/inets.erl
@@ -87,6 +87,7 @@ start(Service, ServiceConfig, How) ->
Module = service_module(Service),
start_service(Module, ServiceConfig, How).
+
%%--------------------------------------------------------------------
%% Function: stop() -> ok
%%
@@ -579,8 +580,8 @@ handle_trace({trace_ts, _Who, call,
{?MODULE, report_event,
[_Sev, "stop trace", stop_trace, [stop_trace]]},
Timestamp},
- {standard_io, _} = Fd) ->
- (catch io:format(Fd, "stop trace at ~s~n", [format_timestamp(Timestamp)])),
+ {_, standard_io} = Fd) ->
+ (catch io:format(standard_io, "stop trace at ~s~n", [format_timestamp(Timestamp)])),
Fd;
handle_trace({trace_ts, _Who, call,
{?MODULE, report_event,
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index f80524e7e7..8ed4f0c192 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -17,7 +17,7 @@
#
# %CopyrightEnd%
-INETS_VSN = 5.2
+INETS_VSN = 5.2.0.1
PRE_VSN =
APP_VSN = "inets-$(INETS_VSN)$(PRE_VSN)"
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index f93ad09b44..5b4369740d 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1,20 @@
-KERNEL_VSN = 2.13.4
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+#
+# The contents of this file are subject to the Erlang Public License,
+# Version 1.1, (the "License"); you may not use this file except in
+# compliance with the License. You should have received a copy of the
+# Erlang Public License along with this software. If not, it can be
+# retrieved online at http://www.erlang.org/.
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+# the License for the specific language governing rights and limitations
+# under the License.
+#
+# %CopyrightEnd%
+#
+
+KERNEL_VSN = 2.13.5
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index 26c64f7c52..bacb7275d7 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -36,6 +36,67 @@
section is the version number of Megaco.</p>
<section>
+ <title>Megaco 3.13.0.1</title>
+
+ <p>Version 3.13.0.1 supports code replacement in runtime from/to
+ version 3.13, 3.12 and 3.11.3.</p>
+
+ <section>
+ <title>Improvements and new features</title>
+
+ <p>-</p>
+
+<!--
+ <list type="bulleted">
+ <item>
+ <p>The documentation is now built with open source tools
+ (<em>xsltproc</em> and <em>fop</em>) that exists on most
+ platforms. One visible change is that the frames are removed.</p>
+ <p>Own Id: OTP-8249</p>
+ </item>
+
+ </list>
+-->
+
+ </section>
+
+ <section>
+ <title>Fixed bugs and malfunctions</title>
+<!--
+ <p>-</p>
+-->
+
+ <list type="bulleted">
+ <item>
+ <p>Fixing copyright problems.</p>
+ </item>
+
+ </list>
+
+ </section>
+
+ <section>
+ <title>Incompatibilities</title>
+ <p>-</p>
+
+<!--
+ <list type="bulleted">
+ <item>
+ <p>For those implementing their own codec's, the new megaco_encoder
+ behaviour will require three more functions. See above for more
+ info. </p>
+ <p>Own Id: OTP-7168</p>
+ <p>Aux Id: Seq 10867</p>
+ </item>
+
+ </list>
+-->
+
+ </section>
+ </section> <!-- 3.13.0.1 -->
+
+
+ <section>
<title>Megaco 3.13</title>
<p>Version 3.13 supports code replacement in runtime from/to
diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src
index 163ff06651..2d5ee2ddbd 100644
--- a/lib/megaco/src/app/megaco.appup.src
+++ b/lib/megaco/src/app/megaco.appup.src
@@ -120,10 +120,17 @@
%% |
%% v
%% 3.13
+%% |
+%% v
+%% 3.13.0.1
%%
%%
{"%VSN%",
[
+ {"3.13",
+ [
+ ]
+ },
{"3.12",
[
{load_module, megaco_udp, soft_purge, soft_purge, []},
@@ -143,6 +150,10 @@
}
],
[
+ {"3.13",
+ [
+ ]
+ },
{"3.12",
[
{load_module, megaco_udp, soft_purge, soft_purge, []},
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index 6ec7f3192a..1c637fe8aa 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -17,7 +17,7 @@
#
# %CopyrightEnd%
-MEGACO_VSN = 3.13
+MEGACO_VSN = 3.13.0.1
PRE_VSN =
APP_VSN = "megaco-$(MEGACO_VSN)$(PRE_VSN)"
diff --git a/lib/snmp/doc/src/Makefile b/lib/snmp/doc/src/Makefile
index e1e3c7f41a..e8d9efb148 100644
--- a/lib/snmp/doc/src/Makefile
+++ b/lib/snmp/doc/src/Makefile
@@ -247,9 +247,9 @@ release_docs_spec: docs
$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
$(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man3
$(INSTALL_DIR) $(RELEASE_PATH)/man/man6
- $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man6
+ $(INSTALL_DATA) $(MAN6DIR)/* $(RELEASE_PATH)/man/man6
$(INSTALL_DIR) $(RELEASE_PATH)/man/man7
- $(INSTALL_DATA) $(MAN3DIR)/* $(RELEASE_PATH)/man/man7
+ $(INSTALL_DATA) $(MAN7DIR)/* $(RELEASE_PATH)/man/man7
else
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 3abce3d759..0b8f0bbddd 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -22,6 +22,10 @@
%% ----- U p g r a d e -------------------------------------------------------
[
+ {"4.15",
+ [
+ ]
+ },
{"4.14",
[
{load_module, snmpm_user, soft_purge, soft_purge, []},
@@ -48,6 +52,10 @@
%% ------D o w n g r a d e ---------------------------------------------------
[
+ {"4.15",
+ [
+ ]
+ },
{"4.14",
[
{load_module, snmpm_user, soft_purge, soft_purge, []},
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index e7a93f026d..9931bb90f4 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -17,7 +17,7 @@
#
# %CopyrightEnd%
-SNMP_VSN = 4.15
+SNMP_VSN = 4.15.0.1
PRE_VSN =
APP_VSN = "snmp-$(SNMP_VSN)$(PRE_VSN)"
diff --git a/lib/stdlib/src/array.erl b/lib/stdlib/src/array.erl
index 295eeac221..83576c9fd3 100644
--- a/lib/stdlib/src/array.erl
+++ b/lib/stdlib/src/array.erl
@@ -741,11 +741,17 @@ set_get_test_() ->
?_assert(array:get(0, set(0, 42, set(0, 17, new()))) =:= 42),
- ?_assert(array:get(0, reset(0, new())) =:= undefined),
- ?_assert(array:get(0, reset(0, set(0, 17, new()))) =:= undefined),
- ?_assert(array:get(0, reset(0, new({default,42}))) =:= 42),
- ?_assert(array:get(0, reset(0, set(0, 17, new({default,42}))))
- =:= 42)
+ ?_assertError(badarg, array:get(0, reset(11, new([{size,10}])))),
+ ?_assertError(badarg, array:get(0, reset(-1, new([{size,10}])))),
+ ?_assert(array:get(0, reset(0, new())) =:= undefined),
+ ?_assert(array:get(0, reset(0, set(0, 17, new()))) =:= undefined),
+ ?_assert(array:get(0, reset(9, set(9, 17, new()))) =:= undefined),
+ ?_assert(array:get(0, reset(11, set(11, 17, new()))) =:= undefined),
+ ?_assert(array:get(0, reset(11, set(12, 17, new()))) =:= undefined),
+ ?_assert(array:get(0, reset(1, set(12, 17, new()))) =:= undefined),
+ ?_assert(array:get(0, reset(11, new())) =:= undefined),
+ ?_assert(array:get(0, reset(0, set(0, 17, new({default,42})))) =:= 42),
+ ?_assert(array:get(0, reset(0, new({default,42}))) =:= 42)
].
-endif.
diff --git a/lib/stdlib/test/array_SUITE.erl b/lib/stdlib/test/array_SUITE.erl
index 7cfdcf6dfd..e7cfc65be1 100644
--- a/lib/stdlib/test/array_SUITE.erl
+++ b/lib/stdlib/test/array_SUITE.erl
@@ -384,11 +384,17 @@ set_get_test_() ->
?_assert(array:get(0, set(0, 42, set(0, 17, new()))) =:= 42),
- ?_assert(array:get(0, reset(0, new())) =:= undefined),
- ?_assert(array:get(0, reset(0, set(0, 17, new()))) =:= undefined),
- ?_assert(array:get(0, reset(0, new({default,42}))) =:= 42),
- ?_assert(array:get(0, reset(0, set(0, 17, new({default,42}))))
- =:= 42)
+ ?_assertError(badarg, array:get(0, reset(11, new([{size,10}])))),
+ ?_assertError(badarg, array:get(0, reset(-1, new([{size,10}])))),
+ ?_assert(array:get(0, reset(0, new())) =:= undefined),
+ ?_assert(array:get(0, reset(0, set(0, 17, new()))) =:= undefined),
+ ?_assert(array:get(0, reset(9, set(9, 17, new()))) =:= undefined),
+ ?_assert(array:get(0, reset(11, set(11, 17, new()))) =:= undefined),
+ ?_assert(array:get(0, reset(11, set(12, 17, new()))) =:= undefined),
+ ?_assert(array:get(0, reset(1, set(12, 17, new()))) =:= undefined),
+ ?_assert(array:get(0, reset(11, new())) =:= undefined),
+ ?_assert(array:get(0, reset(0, set(0, 17, new({default,42})))) =:= 42),
+ ?_assert(array:get(0, reset(0, new({default,42}))) =:= 42)
].
to_list_test_() ->
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index c6e93a4b4b..e02bad48df 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1,2 +1,21 @@
-STDLIB_VSN = 1.16.4
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 1997-2009. All Rights Reserved.
+#
+# The contents of this file are subject to the Erlang Public License,
+# Version 1.1, (the "License"); you may not use this file except in
+# compliance with the License. You should have received a copy of the
+# Erlang Public License along with this software. If not, it can be
+# retrieved online at http://www.erlang.org/.
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+# the License for the specific language governing rights and limitations
+# under the License.
+#
+# %CopyrightEnd%
+#
+
+STDLIB_VSN = 1.16.5
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 16:17:16 +0000