lp:~jlmuir/epics-base/iocsh-comment-fix-3.14
- Get this branch:
- bzr branch lp:~jlmuir/epics-base/iocsh-comment-fix-3.14
Branch merges
- Andrew Johnson: Approve
-
Diff: 16 lines (+6/-0)1 file modifiedsrc/libCom/iocsh/iocsh.cpp (+6/-0)
Branch information
Recent revisions
- 12316. By J. Lewis Muir
-
libCom/iocsh: Ignore comment lines after macro expansion
The handling of comment lines is only performed before macro
expansion, thus lines with macros that expand to comment lines will
not be correctly handled as comment lines.By chance this kind of worked sometimes because a "#" command that
does nothing is internally added to the command registry to make it
show up in the help output. Relying on this is broken. Furthermore,
if the line starts with '#' followed by a non-separator character
(e.g. "##", "#whatever", etc.) it will not work (i.e. it will produce
a command-not-found error).This fix checks to see if the first character of the line after macro
expansion is '#'. If it is, it considers the line to be a comment. - 12308. By Andrew Johnson
-
cap5: Load libCap5.so from lib/perl/
<perl-version> /<perl- archname> This allows the same version of Base to be used from both RHEL5 and RHEL6
for example; they use different Perl versions which are not compatible at
the ABI level. - 12307. By Andrew Johnson
-
configure/linux: Move -g option to OPT_CFLAGS_YES
We were adding it to OP_SYS_CFLAGS but if HOST_OPT=NO
you then get two -g options on the gcc command line.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~epics-core/epics-base/3.15