Merged remove-keywords-3.15 branch
This commit is contained in:
@@ -7,7 +7,6 @@
|
||||
* in file LICENSE that is included with this distribution.
|
||||
\*************************************************************************/
|
||||
/* Alarm definitions, must match menuAlarmSevr.dbd and menuAlarmStat.dbd */
|
||||
/* $Revision-Id$ */
|
||||
|
||||
/*
|
||||
* Authors: Bob Dalesio and Marty Kraimer
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
* EPICS BASE is distributed subject to a Software License Agreement found
|
||||
* in file LICENSE that is included with this distribution.
|
||||
\*************************************************************************/
|
||||
/* $Revision-Id$ */
|
||||
|
||||
/* String names for alarm status and severity values */
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
* EPICS BASE is distributed subject to a Software License Agreement found
|
||||
* in file LICENSE that is included with this distribution.
|
||||
\*************************************************************************/
|
||||
/* $Revision-Id$ */
|
||||
|
||||
/*
|
||||
* This file is deprecated, use alarm.h instead.
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
* and higher are distributed subject to a Software License Agreement found
|
||||
* in file LICENSE that is included with this distribution.
|
||||
\*************************************************************************/
|
||||
/* $Revision-Id$ */
|
||||
|
||||
/* Author: Marty Kraimer Date: 04JAN99 */
|
||||
|
||||
|
||||
@@ -6,8 +6,7 @@
|
||||
* EPICS BASE is distributed subject to a Software License Agreement found
|
||||
* in file LICENSE that is included with this distribution.
|
||||
\*************************************************************************/
|
||||
/* $Revision-Id$
|
||||
*
|
||||
/*
|
||||
* Author: Marty Kraimer
|
||||
* Date: 6-1-90
|
||||
*/
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
* EPICS BASE is distributed subject to a Software License Agreement found
|
||||
* in file LICENSE that is included with this distribution.
|
||||
\*************************************************************************/
|
||||
/* $Revision-Id$ */
|
||||
/* Authors: Eric Norum & Andrew Johnson */
|
||||
|
||||
#include <ctype.h>
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
* EPICS BASE is distributed subject to a Software License Agreement found
|
||||
* in file LICENSE that is included with this distribution.
|
||||
\*************************************************************************/
|
||||
/* $Revision-Id$ */
|
||||
|
||||
/* Authors: Jun-ichi Odagiri, Marty Kraimer, Eric Norum,
|
||||
* Mark Rivers, Andrew Johnson, Ralph Lange
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
* EPICS BASE is distributed subject to a Software License Agreement found
|
||||
* in file LICENSE that is included with this distribution.
|
||||
\*************************************************************************/
|
||||
/* $Revision-Id$ */
|
||||
|
||||
/* Authors: Jun-ichi Odagiri, Marty Kraimer, Eric Norum,
|
||||
* Mark Rivers, Andrew Johnson, Ralph Lange
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
* EPICS BASE is distributed subject to a Software License Agreement found
|
||||
* in file LICENSE that is included with this distribution.
|
||||
\*************************************************************************/
|
||||
/* $Revision-Id$ */
|
||||
|
||||
/*
|
||||
* Author: Jeff Hill
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
* in file LICENSE that is included with this distribution.
|
||||
\*************************************************************************/
|
||||
|
||||
/* $Revision-Id$
|
||||
/*
|
||||
* Author: Andrew Johnson
|
||||
*
|
||||
* Unit test module which generates output in the Test Anything Protocol
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
* in file LICENSE that is included with this distribution.
|
||||
\*************************************************************************/
|
||||
|
||||
/* $Revision-Id$
|
||||
/*
|
||||
* Author: Andrew Johnson
|
||||
*/
|
||||
|
||||
|
||||
@@ -9,15 +9,6 @@
|
||||
\*************************************************************************/
|
||||
|
||||
/*
|
||||
*
|
||||
*
|
||||
* L O S A L A M O S
|
||||
* Los Alamos National Laboratory
|
||||
* Los Alamos, New Mexico 87545
|
||||
*
|
||||
* Copyright, 1986, The Regents of the University of California.
|
||||
*
|
||||
*
|
||||
* Author Jeffrey O. Hill
|
||||
* johill@lanl.gov
|
||||
*/
|
||||
|
||||
@@ -9,16 +9,6 @@
|
||||
\*************************************************************************/
|
||||
|
||||
/*
|
||||
* $Revision-Id$
|
||||
*
|
||||
*
|
||||
* L O S A L A M O S
|
||||
* Los Alamos National Laboratory
|
||||
* Los Alamos, New Mexico 87545
|
||||
*
|
||||
* Copyright, 1986, The Regents of the University of California.
|
||||
*
|
||||
*
|
||||
* Author Jeffrey O. Hill
|
||||
* johill@lanl.gov
|
||||
*/
|
||||
|
||||
@@ -8,8 +8,6 @@
|
||||
* in file LICENSE that is included with this distribution.
|
||||
\*************************************************************************/
|
||||
|
||||
//
|
||||
// $Revision-Id$
|
||||
//
|
||||
// Author: Jeff Hill
|
||||
//
|
||||
|
||||
@@ -30,7 +30,7 @@ print "Building $opt_o from $infile\n" unless $opt_q;
|
||||
open my $VARS, '<', $infile
|
||||
or die "$tool: Can't open $infile: $!\n";
|
||||
|
||||
my ($ver, $rev, $mod, $patch, $snapshot, $commit_date);
|
||||
my ($ver, $rev, $mod, $patch, $snapshot);
|
||||
while (<$VARS>) {
|
||||
chomp;
|
||||
next if m/^\s*#/; # Skip comments
|
||||
@@ -39,15 +39,12 @@ while (<$VARS>) {
|
||||
if (m/^EPICS_MODIFICATION\s*=\s*(\d+)/) { $mod = $1; }
|
||||
if (m/^EPICS_PATCH_LEVEL\s*=\s*(\d+)/) { $patch = $1; }
|
||||
if (m/^EPICS_DEV_SNAPSHOT\s*=\s*([-\w]*)/) { $snapshot = $1; }
|
||||
if (m/^COMMIT_DATE\s*=\s*"\\(.*)"/) { $commit_date = $1; }
|
||||
}
|
||||
close $VARS;
|
||||
|
||||
map {
|
||||
die "$tool: Variable missing from $infile" unless defined $_;
|
||||
} $ver, $rev, $mod, $patch, $snapshot, $commit_date;
|
||||
|
||||
$commit_date =~ s/^\$\$Date$\$$/\1/;
|
||||
} $ver, $rev, $mod, $patch, $snapshot;
|
||||
|
||||
my $ver_str = "$ver.$rev.$mod";
|
||||
$ver_str .= ".$patch" if $patch > 0;
|
||||
@@ -78,7 +75,7 @@ print $OUT <<"END";
|
||||
#define EPICS_VERSION_SHORT "$ver_short"
|
||||
#define EPICS_VERSION_FULL "$ver_str"
|
||||
#define EPICS_VERSION_STRING "EPICS $ver_str"
|
||||
#define epicsReleaseVersion "EPICS R$ver_str $commit_date"
|
||||
#define epicsReleaseVersion "EPICS R$ver_str"
|
||||
|
||||
#ifndef VERSION_INT
|
||||
# define VERSION_INT(V,R,M,P) ( ((V)<<24) | ((R)<<16) | ((M)<<8) | (P))
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
* EPICS BASE is distributed subject to a Software License Agreement found
|
||||
* in file LICENSE that is included with this distribution.
|
||||
\*************************************************************************/
|
||||
/* $Revision-Id$ */
|
||||
|
||||
#ifndef INC_testMain_H
|
||||
#define INC_testMain_H
|
||||
|
||||
@@ -10,8 +10,6 @@
|
||||
/*
|
||||
* unixFileName.h
|
||||
* Author: Jeff Hill
|
||||
*
|
||||
*
|
||||
*/
|
||||
#ifndef unixFileNameH
|
||||
#define unixFileNameH
|
||||
|
||||
Reference in New Issue
Block a user