epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merged changes from 3.15 branch up to Revno 12686

Browse Source
This commit is contained in:
Andrew Johnson
2015-06-05 13:48:57 -05:00
parent 7947807e09 fbd2d4dd31
commit 961dc450c4
11 changed files with 67 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure/os/CONFIG.Common.linux-x86_64
View File

@ -12,9 +12,11 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon
ARCH_CLASS = x86_64
ARCH_DEP_CFLAGS = $(GNU_TUNE_CFLAGS)
ARCH_DEP_CPPFLAGS += -D_X86_64_
ARCH_DEP_CFLAGS += -m64
ARCH_DEP_LDFLAGS += -m64
OP_SYS_CFLAGS += -m64
OP_SYS_LDFLAGS += -m64
# If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,
# e.g. x86_64-redhat-linux-gcc, put a GNU_TARGET definition in

8
configure/os/CONFIG_SITE.Common.cygwin-x86_64
View File

@ -12,3 +12,11 @@
# Uncomment the following line if readline has problems
#LDLIBS_READLINE = -lreadline -lcurses
# It makes sense to include debugging symbols even in optimized builds
# in case you want to attach gdb to the process or examine a core-dump.
# This does cost disk space, but not memory as debug symbols are not
# loaded into RAM when the binary is loaded.
OPT_CFLAGS_YES += -g
OPT_CXXFLAGS_YES += -g

11
configure/os/CONFIG_SITE.Common.linux-x86
View File

@ -12,7 +12,7 @@
# a) LD_LIBRARY_PATH must include the full absolute pathname to
# $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) when invoking base
# executables.
# b) Add the runtime path to SHRLIB_DEPLIB_DIRS and PROD_DEPLIB_DIRS, which
# b) Add the runtime path to SHRLIB_DEPLIB_DIRS and PROD_DEPLIB_DIRS, which
# will add the named directory to the list contained in the executables.
# c) Add the runtime path to /etc/ld.so.conf and run ldconfig
# to inform the system of the shared library location.
@ -33,6 +33,10 @@ COMMANDLINE_LIBRARY = READLINE
#COMMANDLINE_LIBRARY = READLINE_CURSES
# Permit access to 64-bit file-systems
OP_SYS_CFLAGS += -D_FILE_OFFSET_BITS=64
# Uncomment the followings lines to build with CLANG instead of GCC.
#
#GNU = NO
@ -49,7 +53,6 @@ OPT_CFLAGS_YES += -g
OPT_CXXFLAGS_YES += -g
# Tune GNU compiler output for a specific cpu-type
# (e.g. generic, i386, i486, i586, or i686)
# Tune GNU compiler output for a specific 32-bit cpu-type
# (e.g. generic, native, i386, i686, pentium2/3/4, prescott, k6, athlon etc.)
GNU_TUNE_CFLAGS = -mtune=generic

5
configure/os/CONFIG_SITE.Common.linux-x86_64
View File

@ -47,3 +47,8 @@ COMMANDLINE_LIBRARY = READLINE
# loaded into RAM when the binary is loaded.
OPT_CFLAGS_YES += -g
OPT_CXXFLAGS_YES += -g
# Tune GNU compiler output for a specific 64-bit cpu-type
# (e.g. generic, native, core2, nocona, k8, opteron, athlon64, barcelona etc.)
GNU_TUNE_CFLAGS = -mtune=generic

15
documentation/KnownProblems.html
View File

@ -4,17 +4,17 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>Known Problems in R3.15.1</title>
<title>Known Problems in R3.16.0</title>
</head>
<body>
<h1 style="text-align: center">EPICS Base R3.15.1: Known Problems</h1>
<h1 style="text-align: center">EPICS Base R3.16.0: Known Problems</h1>
<p>Any patch files linked below should be applied at the root of the
base-3.15.1 tree. Download them, then use the GNU Patch program as
base-3.16.0 tree. Download them, then use the GNU Patch program as
follows:</p>
<blockquote><pre>% <b>cd <i>/path/to/</i>base-3.15.1</b>
<blockquote><pre>% <b>cd <i>/path/to/</i>base-3.16.0</b>
% <b>patch -p0 &lt; <i>/path/to/</i>file.patch</b></pre></blockquote>
<p>The following significant problems have been reported with this
@ -22,9 +22,10 @@ version of EPICS Base:</p>
<ul>
<li>64-bit Windows builds of the CAS library may not work with some compilers.
The code in <tt>src/legacy/gdd</tt> is currently incompatible with the LLP64
model that Windows uses for its 64-bit ABI.</li>
<!--
<li>YYYY-MM-DD: Description of problem
...</li>
-->
</ul>

2
documentation/README.1st
View File

@ -1,6 +1,6 @@
Installation Instructions
EPICS Base Release 3.15.2
EPICS Base Release 3.16.0
--------------------------------------------------------------------------

2
documentation/README.html
View File

@ -9,7 +9,7 @@
<BODY>
<CENTER>
<H1>Installation Instructions</H1>
<H2>EPICS Base Release 3.15.2</H2><BR>
<H2>EPICS Base Release 3.16.0</H2><BR>
</CENTER>
<HR>
<H3> Table of Contents</H3>

68
documentation/ReleaseChecklist.html
View File

@ -60,11 +60,8 @@ responsible for these tasks in the past and are expected to continue in the
relevent roles unless the Release Manager designates otherwise:</p>
<dl>
<dt><strong>Release Manager</strong> (Andrew Johnson)</dt>
<dd>Responsible for the release</dd>
<dt><strong>Configuration Manager</strong> (Janet Anderson)</dt>
<dd>Responsible for committing version number updates and for
creating tarfiles</dd>
<dt><strong>Release Manager</strong> (Ralph Lange)</dt>
<dd>Responsible for managing and tagging the release</dd>
<dt><strong>Platform Developers</strong></dt>
<dd>Responsible for individual operating system platforms</dd>
<dt><strong>Application Developers</strong></dt>
@ -134,42 +131,42 @@ relevent roles unless the Release Manager designates otherwise:</p>
</tr>
<tr>
<td>&nbsp;</td>
<td>Configuration Manager</td>
<td>Release Manager</td>
<td>Edit and commit changes to the EPICS version number file
configure/CONFIG_BASE_VERSION.</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>Configuration Manager</td>
<td>Release Manager</td>
<td>Tag the module in Bazaar, using these tag conventions:
<ul>
<li>
<tt>R3.15.1-pre<i>n</i></tt>
<tt>R3.16.0-pre<i>n</i></tt>
&mdash; pre-release tag
</li>
<li>
<tt>R3.15.1-rc<i>n</i></tt>
<tt>R3.16.0-rc<i>n</i></tt>
&mdash; release candidate tag, note the <tt>rc</tt> is now
lower-case</li>
</ul>
<blockquote><tt>
cd ~/base/mirror-3.15<br />
bzr tag R3.15.1-rc<i>n</i>
cd ~/base/mirror-3.16<br />
bzr tag R3.16.0-rc<i>n</i>
</tt></blockquote>
</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>Configuration Manager</td>
<td>Release Manager</td>
<td>Export the tagged version into a tarfile. Note that this command
generates a gzipped tarfile directly from the repository:
<blockquote><tt>
cd ~/base<br />
bzr export --keywords=publish
--root=base-3.15.1-rc<i>n</i>
-r tag:R3.15.1-rc<i>n</i>
baseR3.15.1-rc<i>n</i>.tar.gz
mirror-3.15
--root=base-3.16.0-rc<i>n</i>
-r tag:R3.16.0-rc<i>n</i>
base-3.16.0-rc<i>n</i>.tar.gz
mirror-3.16
</tt></blockquote>
This requires that the Bazaar keywords plugin is installed and
configured properly.
@ -177,14 +174,15 @@ relevent roles unless the Release Manager designates otherwise:</p>
</tr>
<tr>
<td>&nbsp;</td>
<td>Configuration Manager</td>
<td>Release Manager</td>
<td>Test the tarfile by extracting its contents and building it on at
least one supported platform.</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>Configuration Manager</td>
<td>Copy the tar file to the Base download area of the website.</td>
<td>Website Manager</td>
<td>If necessary recreate the tarfile following the instructions above.
Copy the tar file to the Base download area of the website</td>
</tr>
<tr>
<td>&nbsp;</td>
@ -223,13 +221,6 @@ relevent roles unless the Release Manager designates otherwise:</p>
<td>Run the CA client side regression tests on all available host
platforms.</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>Platform Developers</td>
<td>Build and run the
<a href="https://launchpad.net/epics-base-tests">epics-base-tests</a>
suite on all available platforms.</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>Platform Developers</td>
@ -279,32 +270,32 @@ relevent roles unless the Release Manager designates otherwise:</p>
</tr>
<tr>
<td>&nbsp;</td>
<td>Configuration Manager</td>
<td>Release Manager</td>
<td>Edit and commit changes to the EPICS version number file
configure/CONFIG_BASE_VERSION.</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>Configuration Manager</td>
<td>Release Manager</td>
<td>Tag the module in Bazaar:
<blockquote><tt>
cd ~/base/mirror-3.15<br />
bzr tag R3.15.1</i>
cd ~/base/mirror-3.16<br />
bzr tag R3.16.0</i>
</tt></blockquote>
</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>Configuration Manager</td>
<td>Release Manager</td>
<td>Export the tagged version into a tarfile. Note that this command
generates a gzipped tarfile directly from the repository:
<blockquote><tt>
cd ~/base<br />
bzr export --keywords=publish
--root=base-3.15.1
-r tag:R3.15.1
baseR3.15.1.tar.gz
mirror-3.15
--root=base-3.16.0
-r tag:R3.16.0
base-3.16.0.tar.gz
mirror-3.16
</tt></blockquote>
This requires that the Bazaar keywords plugin is installed and
configured properly.
@ -312,7 +303,7 @@ relevent roles unless the Release Manager designates otherwise:</p>
</tr>
<tr>
<td>&nbsp;</td>
<td>Configuration Manager</td>
<td>Release Manager</td>
<td>Test the tar file by extracting its contents and building it on at
least one supported platform</td>
</tr>
@ -321,8 +312,9 @@ relevent roles unless the Release Manager designates otherwise:</p>
</tr>
<tr>
<td>&nbsp;</td>
<td>Configuration Manager</td>
<td>Copy the tar file to the Base download area of the website</td>
<td>Website Manager</td>
<td>If necessary recreate the tarfile following the instructions above.
Copy the tar file to the Base download area of the website</td>
</tr>
<tr>
<td>&nbsp;</td>

2
src/ioc/dbStatic/dbStaticLib.c
View File

@ -49,7 +49,7 @@
int dbStaticDebug = 0;
static char *pNullString = "";
#define messagesize 100
#define messagesize 276
#define RPCL_LEN INFIX_TO_POSTFIX_SIZE(80)
static char *ppstring[5]={"NPP","PP","CA","CP","CPP"};

1
src/libCom/osi/os/cygwin32/osdSock.h
View File

@ -19,6 +19,7 @@
#include <sys/types.h>
#include <sys/param.h> /* for MAXHOSTNAMELEN */
#include <sys/ioctl.h>
#include <sys/select.h>
#include <sys/time.h>
#include <netinet/in.h>
#include <arpa/inet.h>

2
src/libCom/osi/os/cygwin32/systemCallIntMech.cpp
View File

@ -19,7 +19,7 @@
enum epicsSocketSystemCallInterruptMechanismQueryInfo
epicsSocketSystemCallInterruptMechanismQuery ()
{
#if (CYGWIN_VERSION_DLL_MAJOR >= 1007) && (CYGWIN_VERSION_DLL_MINOR < 15)
#if (CYGWIN_VERSION_DLL_MAJOR == 1007) && (CYGWIN_VERSION_DLL_MINOR < 15)
// Behaviour changed in early Cygwin 1.7 releases, reverted later.
return esscimqi_socketCloseRequired;
#else