epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

ioc/db: Generate menuGlobal.dbd

Browse Source 
The source just duplicates what's in the Makefile anyway.
This commit is contained in:
Andrew Johnson
2011-11-14 17:38:36 -06:00
parent 4d0c0f4b51
commit 1b345481ba
4 changed files with 21 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/ioc/db/Makefile
View File

@@ -30,24 +30,25 @@ INC += db_field_log.h
INC += initHooks.h
INC += recGbl.h
INC += dbIocRegister.h
# The following go away what old database access goes away
INC += db_access_routines.h
INC += db_convert.h
DBDINC += menuAlarmSevr
DBDINC += menuAlarmStat
DBDINC += menuCompress
DBDINC += menuFtype
DBDINC += menuIvoa
DBDINC += menuOmsl
DBDINC += menuPini
DBDINC += menuPriority
DBDINC += menuScan
DBDINC += menuYesNo
DBDINC += menuSimm
# Generate menuGlobal.dbd automatically
DBD += menuGlobal.dbd
menuGlobal_DBD += menuAlarmSevr.dbd
menuGlobal_DBD += menuAlarmStat.dbd
menuGlobal_DBD += menuCompress.dbd
menuGlobal_DBD += menuFtype.dbd
menuGlobal_DBD += menuIvoa.dbd
menuGlobal_DBD += menuOmsl.dbd
menuGlobal_DBD += menuPini.dbd
menuGlobal_DBD += menuPriority.dbd
menuGlobal_DBD += menuScan.dbd
menuGlobal_DBD += menuYesNo.dbd
menuGlobal_DBD += menuSimm.dbd
DBDINC += $(basename $(menuGlobal_DBD))
DBDINC += dbCommon
DBD+= menuGlobal.dbd
dbCore_SRCS += dbLock.c
dbCore_SRCS += dbAccess.c

9
src/ioc/db/RULES
View File

@@ -11,15 +11,16 @@
# This is a Makefile fragment, see src/ioc/Makefile.
$(filter-out $(STATIC_SRCS),$(dbCore_SRCS)) : $(COMMON_DIR)/dbCommon.h
# $(filter-out $(STATIC_SRCS),$(dbCore_SRCS)) : $(COMMON_DIR)/dbCommon.h
dbCommon.h$(DEP): $(IOCDIR)/db/dbCommonRecord.dbd $(IOCDIR)/db/dbCommon.dbd
@$(RM) $@
@-$(MKMF) -m $@ ../db $(COMMON_DIR)/dbCommon.h $<
@$(MKMF) -m $@ ../db $(COMMON_DIR)/dbCommon.h $<
$(COMMON_DIR)/dbCommon.h: $(IOCDIR)/db/dbCommonRecord.dbd $(IOCDIR)/db/dbCommon.dbd
$(RM) $@
$(DBTORECORDTYPEH) -I ../db $< $@
@$(RM) $(notdir $@)
$(DBTORECORDTYPEH) -I ../db $< $(notdir $@)
@$(MV) $(notdir $@) $@
$(COMMON_DIR)/dbCommon.h: $(DBTORECORDTYPEH)

19
src/ioc/db/menuGlobal.dbd
View File

@@ -1,19 +0,0 @@
#*************************************************************************
# Copyright (c) 2009 UChicago Argonne LLC, as Operator of Argonne
# National Laboratory.
# Copyright (c) 2002 The Regents of the University of California, as
# Operator of Los Alamos National Laboratory.
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#*************************************************************************
include "menuAlarmSevr.dbd"
include "menuAlarmStat.dbd"
include "menuCompress.dbd"
include "menuFtype.dbd"
include "menuIvoa.dbd"
include "menuOmsl.dbd"
include "menuPini.dbd"
include "menuPriority.dbd"
include "menuScan.dbd"
include "menuSimm.dbd"
include "menuYesNo.dbd"

4
src/ioc/dbStatic/dbStaticLib.c
View File

@@ -904,9 +904,9 @@ long epicsShareAPI dbWriteRecordFP(
if(!precordTypename) {
status = dbFirstRecordType(pdbentry);
if(status) {
fprintf(stderr,"dbWriteRecordFP: No record descriptions\n");
/* No record descriptions, so no record instances */
dbFinishEntry(pdbentry);
return(status);
return(0);
}
} else {
status = dbFindRecordType(pdbentry,precordTypename);