Commit Graph

15011 Commits

Author SHA1 Message Date
Andrew Johnson 5cd98a0356 Submodule cleanup updates
Unify .gitignore files
Use 'make test-results' in travis-build scripts
2017-11-30 14:17:03 -06:00
Andrew Johnson ca8942ecb5 Housekeeping in .ci
Cleanup of make-tar.sh script
Added new checkout-modules.sh script
2017-11-30 14:14:20 -06:00
Andrew Johnson 6b0e4d5d2b Merged PR for libcom from Bruce Hill 2017-11-29 17:52:30 -06:00
Andrew Johnson bf7d4f5c96 Submodule updates. 2017-11-29 17:23:52 -06:00
Andrew Johnson 09328e42c9 Allow for a modules/Makefile.local
This permits other submodules to be integrated into a build
without having to edit the Makefile itself.
2017-11-29 17:22:48 -06:00
Andrew Johnson f3d0ce0fb9 Merge 3.16 into core/master and submodules 2017-11-18 13:55:24 -06:00
Andrew Johnson 2d1f1ed2fa Merge 3.15 into 3.16 2017-11-18 13:30:06 -06:00
Andrew Johnson db005ac3fe RULES_TARGET: Define $(lib)_DIR before it is needed
TESTLIBRARY products were being installed, because an executable
that was linked to one added a dependency assuming it would be in
the INSTALL_LIB directory. The $(lib)_DIR was being set too late
for test libraries, so the fallback location was used instead.
This fix sets $(lib)_DIR for test libraries before any rules use it.
2017-11-17 14:55:50 -06:00
Michael Davidsaver ba8bbbd098 update make-tar.sh 2017-11-16 18:27:57 -06:00
Andrew Johnson df4c8b4935 Set snapshot to -pre1-DEV, post-tag
This seems illogical, shouldn't it now be -rc1-DEV now?
2017-11-16 12:03:51 -06:00
Andrew Johnson e785d8748f Set version 7.0.1-pre1 in CONFIG_BASE_VERSION R7.0.1-pre1 2017-11-16 11:55:09 -06:00
Andrew Johnson 8c074d0ecf Final submodule update before 7.0.1-pre1 2017-11-16 11:49:05 -06:00
Andrew Johnson 7afb789b41 Module updates 2017-11-15 23:35:56 -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 e64fe15abc Update submodule 2017-11-15 10:30:54 -06:00
Andrew Johnson 260d43b9bc Adjust RELEASE.local generation for Windows
On Windows, neither the shell nor echo will strip double-quote
characters from the command-line, so just leave them out.
2017-11-15 10:30:14 -06:00
Andrew Johnson b690e5abbd Move tool configs into module cfg/CONFIG* files 2017-11-14 23:41:20 -06:00
Andrew Johnson ba2ff4993f Submodule updates 2017-11-14 21:39:32 -06:00
Andrew Johnson 33852b1e90 Adjust pvAccess dependencies 2017-11-14 21:36:40 -06:00
Andrew Johnson 202fbe4ffb Submodule build configuration fixes
Remove modules/RELEASE.local from repository,
create it at run-time instead of RELEASE.base.
2017-11-14 20:49:54 -06:00
Michael Davidsaver 7b71cbee7a modules/pva2pva: enable string array and fit put 2017-11-14 14:25:39 -06:00
Michael Davidsaver a1f633fe27 add make-tar.sh 2017-11-14 13:29:00 -06:00
Andrew Johnson 75cdab3c17 Update modules 2017-11-12 00:29:12 -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
Andrew Johnson 2462e09319 Update modules 2017-11-10 15:29:36 -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 716d297c85 Merge development branches into core/master 2017-11-07 21:28:01 -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 52a117c35a Merge changes from 3.16 and below into core/master 2017-11-01 16:11:04 -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