Commit Graph

16347 Commits

Author SHA1 Message Date
88cdffddb6 Merge branch '7.0' release 7.4.0.1 into PSI-7.0
Conflicts:
	.gitmodules
	modules/database/src/ioc/db/Makefile
	modules/libcom/test/epicsAtomicTest.cpp
	modules/pvAccess
	modules/pvData
	modules/pvDatabase
	modules/pva2pva
2020-06-03 10:46:07 +02:00
Andrew Johnson
1fec685eed Merge new stuff after the 7.0.4 release work 2020-05-28 21:23:44 -05:00
Andrew Johnson
0bfe0eda0c Update the things to skip in make-tar.sh 2020-05-28 21:18:28 -05:00
Michael Davidsaver
6188d3fdaf update doc comments 2020-05-28 16:26:56 -07:00
Andrew Johnson
cd07888149 Set next development versions 2020-05-28 18:25:32 -05:00
Andrew Johnson
745d2755f9 Update version numbers for release
With both libcom and database having minor version bumps I
concluded that this couldn't be 7.0.3.2 and should really
be numbered 7.0.4
R7.0.4
2020-05-28 18:12:51 -05:00
Michael Davidsaver
688bc3247c missing include 2020-05-28 16:07:50 -07:00
Andrew Johnson
f0d814d5c7 Final Release Notes update, added bug links 2020-05-28 17:55:27 -05:00
Andrew Johnson
005580556c Add and document the macro IOCSHFUNCDEF_HAS_USAGE 2020-05-28 17:33:18 -05:00
Andrew Johnson
591e1f22dd Update submodules to tagged versions for 7.0.3.2 2020-05-28 16:34:28 -05:00
Andrew Johnson
75a3442669 Move RTEMS test-skip to just the failing test 2020-05-27 01:50:23 -05:00
Andrew Johnson
c3cb72a2ca Rename .tests-failed to match a .gitignore pattern
This is simpler than trying to add that file to the
.gitignore files in all of the submodules.
2020-05-27 01:46:14 -05:00
Andrew Johnson
d41b3979fb Collect submodule test failures into the parent
Instead of displaying the failures from each submodule at the end
of testing that submodule, RULES_TOP suppresses the output when
it detects a parent module, and RULES_MODULES adds the children's
failure lists into the parent's list so they all get shown at the
end of the tests/results.
2020-05-27 01:43:40 -05:00
Andrew Johnson
a6f85ffd1a Decorate the output from epicsProve.pl
Adds the CWD at the top, plus top & bottom separators
2020-05-27 00:13:56 -05:00
Andrew Johnson
c56311424c Add TOUCH command 2020-05-27 00:11:59 -05:00
Andrew Johnson
7ba12f600c Perl: Close and delete output files when dying 2020-05-26 22:09:24 -05:00
Andrew Johnson
808cf80579 Fix Makefiles to use RULES_DIRS instead of _TOP 2020-05-26 22:09:24 -05:00
Andrew Johnson
dd1b65f32c Many edits to record reference docs
Add documentation for aSub from wiki.
Fix incorrect document structures.
Remove inclusion of menu.dbd files.
Fix links to common doc's, remove some links to nowhere.
Adjust podToHtml.pl and the rule that calls it.
2020-05-26 21:49:35 -05:00
Michael Davidsaver
1f4e812223 update ci-scripts 2020-05-26 10:24:39 -07:00
Ralph Lange
ee39b05839 travis-ci: remove declarative DIST settings
Travis started showing the distribution setting on the web UI
2020-05-26 11:08:43 +02:00
Ralph Lange
9ff6c4bb36 Update .ci to ci-scripts bb9b591 (bugfix) 2020-05-26 11:04:32 +02:00
Andrew Johnson
ab281f0f53 Excuse RTEMS for failing tests... 2020-05-25 21:05:18 -05:00
Andrew Johnson
f89ef1f12f Re-enable RTEMS tests in Travis builds 2020-05-25 20:45:14 -05:00
Andrew Johnson
290f2d7e7d Skip appveyor builds when only .travis.yml changes 2020-05-25 20:42:35 -05:00
Andrew Johnson
88d34c2d38 Merge changes from 3.15 branch into 7.0 2020-05-24 23:17:33 -05:00
Andrew Johnson
b2fb83179a Remove duplicate MBA template files 2020-05-24 21:37:11 -05:00
Michael Davidsaver
04dd52c79a update release notes 2020-05-24 11:05:46 -07:00
Michael Davidsaver
2f2c023a51 update submodules 2020-05-22 10:18:48 -07:00
hir12111
0f88c67473 Add a getter function for field_type 2020-05-21 12:06:56 -07:00
Michael Davidsaver
4eeb205374 Remove ANSI-C OS prototypes from flexdef.h
Use osiUnistd.h instead.
Add io.h to osiUnistd.h on Windows

# Conflicts:
#	modules/libcom/src/flex/flexdef.h
#	modules/libcom/src/osi/os/WIN32/osiUnistd.h
2020-05-21 11:49:27 -07:00
Michael Davidsaver
4c192e7bba Merge remote-tracking branch 'githubrl/doc-sim-mode' into 7.0
* githubrl/doc-sim-mode:
  doc: update simulation parameters sections in dbds
  doc: add description of improved simulation mode

# Conflicts:
#	modules/database/src/std/rec/mbboRecord.dbd.pod
2020-05-21 11:42:24 -07:00
Ralph Lange
96f9f355c9 doc: update simulation parameters sections in dbds
- refer to appropriate sections in dbCommonInput/dbCommonOutput
2020-05-21 13:41:11 +02:00
36a8b51d8e CleanupWhitespace
removed spaces at end of line

replaced tabs with spaces
2020-05-20 14:48:09 -07:00
Michael Davidsaver
055223dbe4 fix epicsTempFile in antelope+e_flex 2020-05-20 14:48:09 -07:00
Michael Davidsaver
799e72b1e3 libCom: actually use libComAPI.h in libCom 2020-05-20 14:47:51 -07:00
Michael Davidsaver
b2750bbe93 Merge remote-tracking branch 'github/7.0' into 7.0
* github/7.0:
  Unify doxygen keywords to use '\' not '@'
  Applied all doxy-libcom changes to latest headers

# Conflicts:
#	modules/libcom/src/yajl/yajl_common.h
2020-05-20 13:33:36 -07:00
Ralph Lange
b0cd3518e4 doc: add description of improved simulation mode
- improve sections in dbCommonInput/dbCommonOutput
2020-05-20 19:48:22 +02:00
Andrew Johnson
4b848ef344 Merge the doxy-libcom branch into 7.0 2020-05-19 18:12:29 -05:00
Andrew Johnson
9142eca878 Unify doxygen keywords to use '\' not '@' 2020-05-19 18:04:26 -05:00
Andrew Johnson
e923790c41 Update versions after tagging 2020-05-15 13:55:29 -05:00
Andrew Johnson
c7e42fab3c Set version number to 3.15.8, clear snapshot R3.15.8 2020-05-15 12:00:23 -05:00
Andrew Johnson
2f28ce94f4 Release Notes changes for 3.15.8 2020-05-15 11:36:45 -05:00
Andrew Johnson
732f8b19be Merge branch 'defaultMessageQueue' into 3.15 2020-05-14 10:41:52 -05:00
Andrew Johnson
b03e2f376b eMQTest: Start each test with a new (empty) queue
If fastReceiver() took more than 0.01 seconds to exit,
sleepySender() might have pushed a second message onto
the queue after setting recvExit, so there would be an
extra message in the queue for the next test, which I
was seeing on Appveyor. That's my current theory...
2020-05-13 16:11:31 -05:00
Andrew Johnson
59c68807b6 Heinz Junkes' fix for lp: #1812084 Build failure on RTEMS
I reduced some of the code duplication from his original.
2020-05-13 15:26:34 -05:00
Andrew Johnson
a09b1c8569 Applied all doxy-libcom changes to latest headers 2020-05-13 00:34:33 -05:00
Andrew Johnson
2e7ed02a60 Allow/expect MinGW to fail epicsStackTraceTest #5 2020-05-07 13:13:26 -05:00
Andrew Johnson
089954aaab MessageQueue Tests: Extend Mark's sleep tests 2020-05-07 13:12:12 -05:00
Andrew Johnson
34e0b2f305 osdMessageQueue: Undo change to -ve timeout handling
The internal mySend() and myReceive() routines do expect a timeout
of -1 to mean wait forever, see the epicsMessageQueueSend() and
epicsMessageQueueReceive() API routines.
2020-05-04 11:56:14 -05:00
Andrew Johnson
ceb13797a6 Cosmetic 2020-05-01 00:13:02 -05:00