Andrew Johnson
d550b9d55c
Merge 3.16 into core/master and related master branches
2018-02-05 13:59:12 -06:00
Andrew Johnson
cd8fd8a08f
Merge 3.15 into 3.16
2018-02-05 12:06:37 -06:00
Andrew Johnson
61296b8cff
Merge 3.14 into 3.15
...
Fix for LP: #1743076
2018-02-05 12:03:28 -06:00
Andrew Johnson
de442e9584
Fix for LP: #1743076
...
Never zero the CA client context private ID.
2018-02-05 12:02:13 -06:00
Andrew Johnson
ac367398b3
Merge fix for lp: #1747091 from 3.14 into 3.15
2018-02-02 17:49:00 -06:00
Andrew Johnson
713c2d5080
Fix for lp: #1747091
...
generalTimeGetEvent()
2018-02-02 17:47:35 -06:00
Andrew Johnson
eef6f3afbb
Merge 3.15 branch into 3.16
2018-02-01 15:05:44 -06:00
Andrew Johnson
af07016464
Merge 3.14 branch into 3.15
...
Actually a different fix to Michael's 3.14 commit due to divergent code.
2018-02-01 14:20:47 -06:00
Michael Davidsaver
734d16291f
rsrv: buffer for IP too small
...
An IPv4 address and port number
has 21 characters max.
2018-02-01 09:42:51 -08:00
Andrew Johnson
506be838af
Merge 3.15 into 3.16
2018-01-21 00:45:38 -06:00
Andrew Johnson
ddbdcf9462
rec/test: Add missing filename to DBDDEPENDS_FILES
2018-01-21 00:44:10 -06:00
Andrew Johnson
729e6fda4d
tools: Add some context to the 'Undefined macro' warning
...
Mark Rivers saw this warning when he forgot to configure and build a
dependent module properly. The additional information given by this
change would have helped him track down the problem faster.
2018-01-19 13:14:13 -06:00
Andrew Johnson
0315e90e6e
Revert "tools: Use Carp"
...
This reverts commit f207b00b05 .
None of these warn/die messages request a stack dump since they all
end with \n, but carp & croak ignore that.
2018-01-19 11:06:23 -06:00
Andrew Johnson
00f30ac53a
Merge URL updates from 3.15 branch into 3.16
2018-01-18 23:52:18 -06:00
Andrew Johnson
66c6aaa44f
Merge URL updates from 3.14 branch into 3.15
2018-01-18 23:46:42 -06:00
Andrew Johnson
c830a3a4ee
Updated links to new EPICS website at Argonne
...
Only done for documents that are still present in EPICS 7.
2018-01-18 23:35:09 -06:00
Andrew Johnson
1daab5fb35
Add soft-channel tests for local dbCa links, both input and output
...
Update test descriptions.
Renamed records to match their group number.
103 more tests, but some could fail on a busy system...
2018-01-18 23:16:42 -06:00
Andrew Johnson
f527e5939e
Cleanup epicsReadline.c
...
No real code changes, just reformatting and variable renames.
2018-01-08 11:58:20 -06:00
Andrew Johnson
d41f2e6806
Configure command-line interface for VxWorks
...
Add new LEDLIB and OTHER configuration options.
Fix typo in vxWorks/osdReadline.c
Use LEDLIB on VxWorks.
Fixes LP: #1741578
2018-01-08 11:56:37 -06:00
Andrew Johnson
692b971e06
Merge branch '3.15' into 3.16
2018-01-04 14:48:25 -06:00
Andrew Johnson
8766ce05aa
Fix slow callback test failures.
...
Slow callbacks no longer cause test failures, now they just emit a
diagnostic. Jenkins on MacOS frequently failed those tests.
We should never test for something that we can't fix.
2018-01-04 11:41:38 -06:00
Ralph Lange
88be36002a
Merge changes from 3.16 into core/master
2018-01-04 09:11:08 +01:00
Andrew Johnson
5c97e54cf7
Drop seconds from genVersionHeader's build date/time
...
On Windows a build can loop forever if seconds are included.
2017-12-28 11:28:41 -06:00
Andrew Johnson
6bf0b5247c
Merge bug-fix from 3.16 branch into core/master
2017-12-15 11:47:56 -06:00
Andrew Johnson
008ac76313
Fixes for sharing a build tree between Windows + Unix
...
Rename modules/RELEASE.local to RELEASE.<host>.local
Modify all submodule configure/RELEASE files to include that, and
update the template configure/RELEASE file to match.
Install Perl *ModuleDirs.pm files into bin/<host> since they contain
absolute paths which may be different on different host arch's.
Scripts that need a ModuleDirs module have been adjusted to look in
their bin/<host> directory for it.
Some additional submodule updates were also incorporated.
2017-12-06 23:27:38 -06:00
Andrew Johnson
8e2b782b7c
Merge Release.pm fix from 3.15 into 3.16
2017-12-06 16:52:04 -06:00
Andrew Johnson
3b0f34e0be
Fix recursive check in Release.pm
2017-12-06 16:29:31 -06:00
Andrew Johnson
c28a360357
Merge changes from 3.15 branch into 3.16
2017-11-15 22:20:42 -06:00
Andrew Johnson
0f0deb8903
Merge fixups/db_close_events into 3.15
2017-11-15 21:23:28 -06:00
Andrew Johnson
baf997193e
Merge aSubRecord fixes from 3.14 into 3.15
2017-11-15 21:15:51 -06:00
Andrew Johnson
5278799575
aSubRecord: Copy the right amount of data
...
Initialize OVLx from VALx with NEVx elements, size from FTVx
2017-11-15 20:59:06 -06:00
Andrew Johnson
5b66efb0e4
Merge installEpics.pl change into core/master
2017-11-11 18:42:37 -06:00
Andrew Johnson
f36ce8ca3d
Merge 3.16 into 3.17
2017-11-11 18:17:54 -06:00
Andrew Johnson
aebfe587d8
Merge installEpics.pl fix from 3.15 into 3.16
2017-11-11 18:04:46 -06:00
Andrew Johnson
031e755303
installEpics.pl: Make temporary install filename more different
...
A parallel build was seen matching the temporary name in a wildcard.
Now the temporary name both starts and ends differently.
2017-11-11 18:00:57 -06:00
Michael Davidsaver
e794639e31
ioc/db: avoid possible race in db_close_events()
...
lp:1730982
2017-11-08 14:42:08 -06:00
Michael Davidsaver
2af98c33c9
std/rec: aSub handle INAM changing outputs
...
Allow EFLG="On Change" to work with INAM.
2017-11-08 14:29:30 -06:00
Andrew Johnson
5e5e56b39a
Restore dbVerify() to dbStaticLib
2017-11-07 17:54:50 -06:00
Andrew Johnson
94628f59f2
Merge branch 'monotonictime' into 3.17
2017-11-02 17:32:46 -05:00
Andrew Johnson
924e11a8bc
rsrv: Fix include list for Windows builds
...
For some reason epicsExport.h doesn't work here, we have to
explicitly define epicsExportSharedSymbols and them pull in
epicsExport.h separately later. Must be something to do with
the #undef and redef that goes on in server.h
2017-11-02 17:08:42 -05:00
Andrew Johnson
2237061c85
Merge branch 'impr-sim-mode-2' into 3.17
2017-11-02 16:37:42 -05:00
Andrew Johnson
7fc6639bfa
Merged branch 'rsrv-register' into 3.17
2017-11-02 14:45:05 -05:00
Andrew Johnson
52a117c35a
Merge changes from 3.16 and below into core/master
2017-11-01 16:11:04 -05:00
Andrew Johnson
e25f95be50
Source formatting in dbFastLinkConv
2017-10-31 12:54:41 -05:00
Andrew Johnson
9a0eacd67e
More tests in rec/test/softTest
2017-10-31 12:54:03 -05:00
Andrew Johnson
c94c1b47d8
More debug printf()s in lnkConst
2017-10-31 12:52:46 -05:00
Andrew Johnson
a2b963b2d9
Fix bug in fast-convert from int64 to enum
...
Discovered on Solaris-sparc (big-endian).
2017-10-31 12:50:53 -05:00
Andrew Johnson
f76d453a7a
ringPointerTest: Prevent warnings
2017-10-30 19:54:09 -05:00
Andrew Johnson
71675fc7a4
Disable yajlTest: Duh!
2017-10-30 18:15:37 -05:00
Andrew Johnson
fbcbd58c30
libCom/test: Disable yajlTest on WIN32
...
Works OK on Cygwin; Perl's IPC::Open3 is likely the problem.
2017-10-30 17:56:04 -05:00