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
Andrew Johnson
2462e09319
Update modules
2017-11-10 15:29:36 -06:00
Andrew Johnson
491ab52c98
Remove spurious files from configure
2017-11-10 15:28:20 -06:00
Andrew Johnson
9ac5f7fbc1
Remove spurious files from configure
2017-11-10 15:27:59 -06:00
Andrew Johnson
269b072cec
Remove spurious files from configure
2017-11-10 15:27:11 -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
1d732b3a92
Update modules
2017-11-07 22:44:04 -06:00
Andrew Johnson
cb7b77b63d
Copy Darwin version of osdMonitonic.c to iOS
2017-11-07 22:41:23 -06:00
Andrew Johnson
716d297c85
Merge development branches into core/master
2017-11-07 21:28:01 -06:00
Andrew Johnson
c528ca5ae4
Merge development branches into database/master
2017-11-07 21:26:10 -06:00
Andrew Johnson
7b7abaea05
Merge development branches into libcom/master
2017-11-07 21:24:06 -06:00
Andrew Johnson
c4c7bff625
Update PVA modules
2017-11-07 20:20:35 -06:00
Andrew Johnson
5e5e56b39a
Restore dbVerify() to dbStaticLib
2017-11-07 17:54:50 -06:00
Michael Davidsaver
ed43284bce
update PVD, PVA, and P2P
...
PVA fixes server issue with async getField() and lots of cleanup.
P2P fixes lock order issue with PDB monitor lists
2017-11-06 18:29:58 -06:00
Andrew Johnson
782b15ff4f
Update modules pvData and pva2pva
2017-11-03 11:03:44 -05:00
Andrew Johnson
e569730acc
modules/Makefile fix: Replace spaces with tab character
...
Also adds modules/RELEASE.base to .gitignore
2017-11-03 11:00:49 -05:00
Ralph Lange
75479e1a10
modules: fix creation of absolute EPICS_BASE ( d7cda55d)
2017-11-03 09:26:28 +01: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
2abb168e23
Removed modules/example from .gitmodules for now
...
Jenkins can't build Base-7.0 with the example in this Zombie state.
2017-11-02 09:48:41 -05:00
Andrew Johnson
82efcc3969
Update modules to latest
...
This combination builds for Linux, RTEMS 4.10 and VxWorks 6.9
2017-11-01 16:23:55 -05:00
Andrew Johnson
d5fc85a451
Merge changes from 3.16 branch and below into database/master
...
Also removes some extraneous template files
2017-11-01 16:16:07 -05:00
Andrew Johnson
2ebd193681
Merge changes from 3.16 branch and below into ca/master
2017-11-01 16:14:53 -05:00
Andrew Johnson
222162bcb6
Add vxWorks directory with Boost smart_ptr headers
...
This is the minimal set of files needed, copied from pvCommonCPP.
2017-11-01 16:14:00 -05:00
Andrew Johnson
824c91d70c
Merge changes from 3.16 and below into libcom/master
2017-11-01 16:11:58 -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
a50dddbd7b
Move base.plt into test/tools and adjust lib path
2017-11-01 11:30:15 -05:00
Andrew Johnson
75ae143361
Update pva2pva module
2017-10-31 15:31:24 -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
Andrew Johnson
5f1435c775
Merge yajl-2.1.0 branch into 3.16
2017-10-30 16:14:35 -05:00
Andrew Johnson
0b5577205c
Merge fix-tsel branch into 3.16
2017-10-30 14:16:50 -05:00
Andrew Johnson
49d638be97
VxWorks osdMonotonic implementation
...
PowerPC time-base frequencies are 32-bit.
Adjust when warnings are printed.
Use long double to calculate time from time-base.
2017-10-27 15:17:38 -05:00
Andrew Johnson
05d4d7431e
Merge changes from 3.15 branch into 3.16
2017-10-27 12:32:14 -05:00
Andrew Johnson
e38252eecc
Fix osiSockOptMcastLoop_t for solaris
2017-10-26 16:29:03 -05:00
Andrew Johnson
31c7d91884
libCom/test/Makefile: Clean up SYS_LIBS var's
...
Add PROD_SYS_LIBS_solaris global setting
Remove settings for individual tests
2017-10-26 16:28:24 -05:00
Andrew Johnson
42d37eb19a
Merge branch 'osiSockTest' into 3.15
2017-10-26 14:30:38 -05:00
Andrew Johnson
77de87cfb0
dbServer: Only call client() and report() methods when running
...
Also adjusts the tests to confirm that behaviour.
2017-10-26 13:02:20 -05:00
Andrew Johnson
48ea653ba9
Clean up taskwdTest
...
Ensure other threads don't interfere with test results,
let only test threads generate pass/fail outputs.
2017-10-24 21:10:00 -05:00
Michael Davidsaver
d0378adc91
ioc/db/test: check TSEL to .TIME
2017-10-24 09:30:38 -05:00
