lp:~anj/epics-base/alarm-strings

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~epics-core/epics-base/3.15 at revision 12507

Ralph Lange: Approve on 2014-07-31

Diff: 238 lines (+77/-52) (has conflicts)

7 files modified

documentation/RELEASE_NOTES.html (+12/-0)
src/ca/client/perl/Cap5.xs (+0/-1)
src/ca/client/tools/tool_lib.c (+0/-2)
src/libCom/misc/Makefile (+1/-0)
src/libCom/misc/alarm.h (+5/-8)
src/libCom/misc/alarmString.c (+51/-0)
src/libCom/misc/alarmString.h (+8/-41)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1250023: alarmString.h implements alarm strings in header.

Wishlist

Fix Released

Link a bug report

Related blueprints

12442. By Andrew Johnson on 2014-07-30

Document changes.

12441. By Andrew Johnson on 2013-11-12

Move the string array declarations into alarm.h

This also removes all internal use of alarmString.h which
is now deprecated again (see 3.14.5, Jan 2004).

12440. By Andrew Johnson on 2013-08-20

Move alarm string arrays into libCom

Using idea from Peter Heesterman:
 * Instanciate the alarm strings once in libCom
 * Remove the epicsAlarmGlobal macro
 * Make sure the decorations are right

12439. By Janet B. Anderson on 2013-07-26

Stopped install of test libraries and removed version number in test library name.

12438. By Janet B. Anderson on 2013-07-25

Added OPT_CXXFLAGS_YES += -g

12437. By Andrew Johnson on 2013-07-10

Merged changes from 3.14 branch.

12436. By Janet B. Anderson on 2013-07-08

Remove .. from vpath. Add rules with .. prerequisite.

12435. By Andrew Johnson on 2013-06-28

libCom: Replaced errlogRemoveListener()

New version errlogRemoveListeners() is safer.

12434. By Andrew Johnson on 2013-06-18

std: Don't try and use removed RULES file...

12433. By Andrew Johnson on 2013-06-18

rec: Remove now unnecessary RULES file