diff --git a/src/ioc/db/Makefile b/src/ioc/db/Makefile index 5431c33c1..1f918484b 100644 --- a/src/ioc/db/Makefile +++ b/src/ioc/db/Makefile @@ -44,21 +44,21 @@ INC += dbUnitTest.h 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 += menuPost.dbd menuGlobal_DBD += menuPriority.dbd -menuGlobal_DBD += menuScan.dbd menuGlobal_DBD += menuYesNo.dbd menuGlobal_DBD += menuSimm.dbd DBDINC += $(basename $(menuGlobal_DBD)) +DBDINC += menuScan.dbd DBDINC += dbCommon -HTMLS += $(patsubst %.dbd.pod,%.html,$(notdir $(wildcard ../db/menu*.dbd.pod))) +dbMenusPod = $(notdir $(wildcard ../db/menu*.dbd.pod)) +HTMLS += $(patsubst %.dbd.pod,%.html,$(menusPod)) dbCore_SRCS += dbLock.c dbCore_SRCS += dbAccess.c diff --git a/src/ioc/db/RULES b/src/ioc/db/RULES index b89e2711c..8a358d5e6 100644 --- a/src/ioc/db/RULES +++ b/src/ioc/db/RULES @@ -11,12 +11,14 @@ # This is a Makefile fragment, see src/ioc/Makefile. +# Ensure menu.dbd files have been generated from .dbd.pod files +menuGlobal.dbd$(DEP): $(patsubst %.pod,$(COMMON_DIR)/%,$(dbMenusPod)) + dbCommon.h$(DEP): $(IOCDIR)/db/dbCommonRecord.dbd $(IOCDIR)/db/RULES @$(RM) $@ @$(DBTORECORDTYPEH) -D -I ../db -o $(COMMONDEP_TARGET) $< > $@ - @echo "$(COMMONDEP_TARGET): ../Makefile" >> $@ -$(COMMON_DIR)/dbCommon.h: $(IOCDIR)/db/dbCommonRecord.dbd +$(COMMON_DIR)/dbCommon.h: $(IOCDIR)/db/dbCommonRecord.dbd $(IOCDIR)/db/RULES @$(RM) $(notdir $@) $(DBTORECORDTYPEH) -I ../db -o $(notdir $@) $< @$(MV) $(notdir $@) $@ diff --git a/src/ioc/db/menuCompress.dbd b/src/ioc/db/menuCompress.dbd deleted file mode 100644 index 68b68e2a2..000000000 --- a/src/ioc/db/menuCompress.dbd +++ /dev/null @@ -1,15 +0,0 @@ -#************************************************************************* -# Copyright (c) 2002 The University of Chicago, 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 Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found -# in file LICENSE that is included with this distribution. -#************************************************************************* -menu(menuCompress) { - choice(menuCompressN_to_1_First_Value,"N to 1 First Value") - choice(menuCompressN_to_1_Low_Value,"N to 1 Low Value") - choice(menuCompressN_to_1_High_Value,"N to 1 High Value") - choice(menuCompressN_to_1_Average,"N to 1 Average") -} diff --git a/src/std/softIoc/base.dbd b/src/std/softIoc/base.dbd index afa852c05..5c5632550 100644 --- a/src/std/softIoc/base.dbd +++ b/src/std/softIoc/base.dbd @@ -1,11 +1,14 @@ # $Revision-Id$ # -# This file defines the standard record types and device support +# This file includes the standard record types and device support # provided by Base and (usually) loaded into all IOCs. -# Menus +# Fixed menus include "menuGlobal.dbd" + +# Modifyable menus include "menuConvert.dbd" +include "menuScan.dbd" # Record types include "stdRecords.dbd" @@ -13,7 +16,7 @@ include "stdRecords.dbd" # Channel filters & plugins include "filters.dbd" -# "Soft Channel", "Raw Soft Channel", and "Async Soft Channel" device support +# Standard device support include "devSoft.dbd" # Access security subroutines