Merge std/*

Combine recIoc and softDevIoc libraries into dbRecStd

Move base.dbd from ioc/misc/ to std/softIoc/

Generate stdRecords.dbd from the std/rec/Makefile list of record
types instead of hard-coding it in base.dbd

configure/CONFIG_BASE

@@ -21,8 +21,7 @@ endif
 #---------------------------------------------------------------
 # Epics base Ioc libraries 
 
-EPICS_BASE_IOC_LIBS += recIoc softDevIoc
+EPICS_BASE_IOC_LIBS += dbRecStd dbCore ca Com 
-EPICS_BASE_IOC_LIBS += dbCore ca Com 
 
 #---------------------------------------------------------------
 # Epics base Host libraries 

configure/RULES.Db

@@ -263,7 +263,7 @@ $(COMMON_DIR)/%.dbd: $(COMMON_DIR)/%Include.dbd
 	$(ECHO) "$<:../Makefile" >> $(notdir $@)$(DEP)
 	$(ECHO) "Expanding dbd"
 	@$(RM) $@
-	@$(DBEXPAND) $(DBDFLAGS) -o $@ $<
+	$(DBEXPAND) $(DBDFLAGS) -o $@ $<
 
 $(COMMON_DIR)/%.dbd: %Include.dbd 
 	@$(RM) $(notdir $@)$(DEP)

src/Makefile

@@ -63,14 +63,8 @@ ioc/db/test_DEPEND_DIRS = ioc libCom/RTEMS
 
 # PDB Standard Record Definitions
 
-DIRS += std/rec
+DIRS += std
-std/rec_DEPEND_DIRS = ioc
+std_DEPEND_DIRS = ioc libCom/RTEMS
-
-DIRS += std/dev
-std/dev_DEPEND_DIRS = std/rec ioc
-
-DIRS += std/softIoc
-std/softIoc_DEPEND_DIRS = std/dev ioc libCom/RTEMS
 
 
 include $(TOP)/configure/RULES_DIRS

src/ioc/Makefile

@@ -13,7 +13,7 @@ include $(TOP)/configure/CONFIG
 SRC = $(TOP)/src
 IOCDIR = $(SRC)/ioc
 
-LIBRARY += dbCore
+LIBRARY_IOC += dbCore
 dbCore_LIBS += ca Com
 dbCore_SYS_LIBS_WIN32 += ws2_32
 

src/ioc/misc/Makefile

@@ -11,7 +11,6 @@
 
 SRC_DIRS += $(IOCDIR)/misc
 
-DBD += base.dbd
 DBD += system.dbd
 DBD += dlload.dbd
 DBD += dbCore.dbd

src/ioc/misc/base.dbd

@@ -1,48 +0,0 @@
-# $Revision-Id$
-#
-# This file defines the standard record types and device support
-# provided by Base and (usually) loaded into all IOCs.
-
-# Menus
-include "menuGlobal.dbd"
-include "menuConvert.dbd"
-
-# Record types
-include "aaiRecord.dbd"
-include "aaoRecord.dbd"
-include "aiRecord.dbd"
-include "aoRecord.dbd"
-include "aSubRecord.dbd"
-include "biRecord.dbd"
-include "boRecord.dbd"
-include "calcRecord.dbd"
-include "calcoutRecord.dbd"
-include "compressRecord.dbd"
-include "dfanoutRecord.dbd"
-include "eventRecord.dbd"
-include "fanoutRecord.dbd"
-include "histogramRecord.dbd"
-include "longinRecord.dbd"
-include "longoutRecord.dbd"
-include "mbbiRecord.dbd"
-include "mbbiDirectRecord.dbd"
-include "mbboRecord.dbd"
-include "mbboDirectRecord.dbd"
-include "permissiveRecord.dbd"
-include "selRecord.dbd"
-include "seqRecord.dbd"
-include "stateRecord.dbd"
-include "stringinRecord.dbd"
-include "stringoutRecord.dbd"
-include "subRecord.dbd"
-include "subArrayRecord.dbd"
-include "waveformRecord.dbd"
-
-# "Soft Channel", "Raw Soft Channel", and "Async Soft Channel" device support
-include "devSoft.dbd"
-
-# Access security subroutines
-registrar(asSub)
-
-include "dbCore.dbd"
-

src/std/Makefile

@@ -0,0 +1,30 @@
+#*************************************************************************
+# Copyright (c) 2007 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. 
+#*************************************************************************
+TOP=../..
+
+include $(TOP)/configure/CONFIG
+
+STDDIR=$(TOP)/src/std
+
+USR_DBDFLAGS += -I ../rec -I ../dev -I ../softIoc
+
+LIBRARY_IOC += dbRecStd
+dbRecStd_LIBS = dbCore ca Com
+
+dbRecStd_RCS += dbRecStd.rc
+
+include $(STDDIR)/dev/Makefile
+include $(STDDIR)/rec/Makefile
+include $(STDDIR)/softIoc/Makefile
+
+include $(TOP)/configure/RULES
+
+include $(STDDIR)/rec/RULES
+include $(STDDIR)/softIoc/RULES
+

src/std/dbRecStd.rc

@@ -18,13 +18,13 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "Comments","Record Support Library for EPICS\0"
+            VALUE "Comments","Record and Soft Device Support Library for EPICS\0"
             VALUE "CompanyName", "The EPICS collaboration\0"
-            VALUE "FileDescription", "Record Support Library\0"
+            VALUE "FileDescription", "Record and Soft Device Support Library\0"
             VALUE "FileVersion", EPICS_VERSION_STRING "\0"
-            VALUE "InternalName", "rec\0"
+            VALUE "InternalName", "dbRecStd\0"
             VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
-            VALUE "OriginalFilename", "rec.dll\0"
+            VALUE "OriginalFilename", "dbRecStd.dll\0"
             VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
             VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
         END

src/std/dev/Makefile

@@ -1,63 +1,57 @@
 #*************************************************************************
-# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
+# Copyright (c) 2011 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. 
 #*************************************************************************
-TOP=../../..
 
-include $(TOP)/configure/CONFIG
+# This is a Makefile fragment, see src/std/Makefile.
+
+SRC_DIRS += $(STDDIR)/dev
 
 DBD += devSoft.dbd
 
-LIBSRCS += devAaiSoft.c
+dbRecStd_SRCS += devAaiSoft.c
-LIBSRCS += devAaoSoft.c
+dbRecStd_SRCS += devAaoSoft.c
-LIBSRCS += devAiSoft.c
+dbRecStd_SRCS += devAiSoft.c
-LIBSRCS += devAiSoftRaw.c
+dbRecStd_SRCS += devAiSoftRaw.c
-LIBSRCS += devAoSoft.c
+dbRecStd_SRCS += devAoSoft.c
-LIBSRCS += devAoSoftRaw.c
+dbRecStd_SRCS += devAoSoftRaw.c
-LIBSRCS += devBiSoft.c
+dbRecStd_SRCS += devBiSoft.c
-LIBSRCS += devBiSoftRaw.c
+dbRecStd_SRCS += devBiSoftRaw.c
-LIBSRCS += devBoSoft.c
+dbRecStd_SRCS += devBoSoft.c
-LIBSRCS += devBoSoftRaw.c
+dbRecStd_SRCS += devBoSoftRaw.c
-LIBSRCS += devCalcoutSoft.c
+dbRecStd_SRCS += devCalcoutSoft.c
-LIBSRCS += devEventSoft.c
+dbRecStd_SRCS += devEventSoft.c
-LIBSRCS += devHistogramSoft.c
+dbRecStd_SRCS += devHistogramSoft.c
-LIBSRCS += devLiSoft.c
+dbRecStd_SRCS += devLiSoft.c
-LIBSRCS += devLoSoft.c
+dbRecStd_SRCS += devLoSoft.c
-LIBSRCS += devMbbiDirectSoft.c
+dbRecStd_SRCS += devMbbiDirectSoft.c
-LIBSRCS += devMbbiDirectSoftRaw.c
+dbRecStd_SRCS += devMbbiDirectSoftRaw.c
-LIBSRCS += devMbbiSoft.c
+dbRecStd_SRCS += devMbbiSoft.c
-LIBSRCS += devMbbiSoftRaw.c
+dbRecStd_SRCS += devMbbiSoftRaw.c
-LIBSRCS += devMbboDirectSoft.c
+dbRecStd_SRCS += devMbboDirectSoft.c
-LIBSRCS += devMbboDirectSoftRaw.c
+dbRecStd_SRCS += devMbboDirectSoftRaw.c
-LIBSRCS += devMbboSoft.c
+dbRecStd_SRCS += devMbboSoft.c
-LIBSRCS += devMbboSoftRaw.c
+dbRecStd_SRCS += devMbboSoftRaw.c
-LIBSRCS += devSASoft.c
+dbRecStd_SRCS += devSASoft.c
-LIBSRCS += devSiSoft.c
+dbRecStd_SRCS += devSiSoft.c
-LIBSRCS += devSoSoft.c
+dbRecStd_SRCS += devSoSoft.c
-LIBSRCS += devWfSoft.c
+dbRecStd_SRCS += devWfSoft.c
-LIBSRCS += devGeneralTime.c
+dbRecStd_SRCS += devGeneralTime.c
 
-LIBSRCS += devAoSoftCallback.c
+dbRecStd_SRCS += devAoSoftCallback.c
-LIBSRCS += devBoSoftCallback.c
+dbRecStd_SRCS += devBoSoftCallback.c
-LIBSRCS += devCalcoutSoftCallback.c
+dbRecStd_SRCS += devCalcoutSoftCallback.c
-LIBSRCS += devLoSoftCallback.c
+dbRecStd_SRCS += devLoSoftCallback.c
-LIBSRCS += devMbboSoftCallback.c
+dbRecStd_SRCS += devMbboSoftCallback.c
-LIBSRCS += devMbboDirectSoftCallback.c
+dbRecStd_SRCS += devMbboDirectSoftCallback.c
-LIBSRCS += devSoSoftCallback.c
+dbRecStd_SRCS += devSoSoftCallback.c
 
-LIBSRCS += devTimestamp.c
+dbRecStd_SRCS += devTimestamp.c
-LIBSRCS += devSoStdio.c
+dbRecStd_SRCS += devSoStdio.c
-
-LIB_SRCS += asSubRecordFunctions.c
-
-LIBRARY_IOC += softDevIoc
-softDevIoc_LIBS += dbCore ca Com
-softDevIoc_RCS = softDevIoc.rc
-
-include $(TOP)/configure/RULES
 
+dbRecStd_SRCS += asSubRecordFunctions.c
 

src/std/rec/Makefile

@@ -1,13 +1,15 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2011 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 is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-TOP=../../..
+
-include $(TOP)/configure/CONFIG
+# This is a Makefile fragment, see src/std/Makefile.
+
+SRC_DIRS += $(STDDIR)/rec
 
 DBDINC += aaiRecord
 DBDINC += aaoRecord
@@ -39,40 +41,37 @@ DBDINC += subRecord
 DBDINC += subArrayRecord
 DBDINC += waveformRecord
 
-LIBSRCS += aaiRecord.c
+DBD += stdRecords.dbd
-LIBSRCS += aaoRecord.c
-LIBSRCS += aiRecord.c
-LIBSRCS += aoRecord.c
-LIBSRCS += aSubRecord.c
-LIBSRCS += biRecord.c
-LIBSRCS += boRecord.c
-LIBSRCS += calcRecord.c
-LIBSRCS += calcoutRecord.c
-LIBSRCS += compressRecord.c
-LIBSRCS += dfanoutRecord.c
-LIBSRCS += eventRecord.c
-LIBSRCS += fanoutRecord.c
-LIBSRCS += histogramRecord.c
-LIBSRCS += longinRecord.c
-LIBSRCS += longoutRecord.c
-LIBSRCS += mbbiRecord.c
-LIBSRCS += mbbiDirectRecord.c
-LIBSRCS += mbboRecord.c
-LIBSRCS += mbboDirectRecord.c
-LIBSRCS += permissiveRecord.c
-LIBSRCS += selRecord.c
-LIBSRCS += seqRecord.c
-LIBSRCS += stateRecord.c
-LIBSRCS += stringinRecord.c
-LIBSRCS += stringoutRecord.c
-LIBSRCS += subRecord.c
-LIBSRCS += subArrayRecord.c
-LIBSRCS += waveformRecord.c
 
-LIBRARY_IOC += recIoc
+stdRecords_DBD = $(patsubst %,%.dbd,$(DBDINC))
 
-recIoc_LIBS = dbCore ca Com
+dbRecStd_SRCS += aaiRecord.c
-recIoc_RCS = recIoc.rc
+dbRecStd_SRCS += aaoRecord.c
-
+dbRecStd_SRCS += aiRecord.c
-include $(TOP)/configure/RULES
+dbRecStd_SRCS += aoRecord.c
+dbRecStd_SRCS += aSubRecord.c
+dbRecStd_SRCS += biRecord.c
+dbRecStd_SRCS += boRecord.c
+dbRecStd_SRCS += calcRecord.c
+dbRecStd_SRCS += calcoutRecord.c
+dbRecStd_SRCS += compressRecord.c
+dbRecStd_SRCS += dfanoutRecord.c
+dbRecStd_SRCS += eventRecord.c
+dbRecStd_SRCS += fanoutRecord.c
+dbRecStd_SRCS += histogramRecord.c
+dbRecStd_SRCS += longinRecord.c
+dbRecStd_SRCS += longoutRecord.c
+dbRecStd_SRCS += mbbiRecord.c
+dbRecStd_SRCS += mbbiDirectRecord.c
+dbRecStd_SRCS += mbboRecord.c
+dbRecStd_SRCS += mbboDirectRecord.c
+dbRecStd_SRCS += permissiveRecord.c
+dbRecStd_SRCS += selRecord.c
+dbRecStd_SRCS += seqRecord.c
+dbRecStd_SRCS += stateRecord.c
+dbRecStd_SRCS += stringinRecord.c
+dbRecStd_SRCS += stringoutRecord.c
+dbRecStd_SRCS += subRecord.c
+dbRecStd_SRCS += subArrayRecord.c
+dbRecStd_SRCS += waveformRecord.c
 

src/std/rec/RULES

@@ -0,0 +1,15 @@
+#*************************************************************************
+# Copyright (c) 2011 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 is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# This is a Makefile fragment, see src/std/Makefile.
+
+$(COMMON_DIR)/stdRecords.dbd:
+	$(RM) $@
+	$(PERL) $(TOOLS)/makeIncludeDbd.pl $(stdRecords_DBD) $@
+

src/std/softIoc/Makefile

@@ -1,17 +1,19 @@
 ##########################################################################
-# Copyright (c) 2009 UChicago Argonne LLC, as Operator of Argonne
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution.
 ##########################################################################
 
-TOP=../../..
+# This is a Makefile fragment, see src/ioc/Makefile.
 
-include $(TOP)/configure/CONFIG
+SRC_DIRS += $(STDDIR)/softIoc
 
 PROD_IOC = softIoc
 
+DBD += base.dbd
 DBD += softIoc.dbd
+
 softIoc_DBD += base.dbd
 softIoc_DBD += dlload.dbd
 softIoc_DBD += system.dbd
@@ -26,14 +28,3 @@ DB += softIocExit.db
 
 FINAL_LOCATION ?= $(shell $(PERL) $(TOOLS)/fullPathName.pl $(INSTALL_LOCATION))
 
-include $(TOP)/configure/RULES
-
-softMain$(OBJ) : epicsInstallDir.h
-
-epicsInstallDir.h:
-	$(ECHO) "FINAL_LOCATION=$(FINAL_LOCATION)"
-	$(PERL) ../makeInstallDir.pl '$(FINAL_LOCATION)' > $@
-
-clean::
-	@$(RM) epicsInstallDir.h
-

src/std/softIoc/RULES

@@ -0,0 +1,20 @@
+##########################################################################
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
+##########################################################################
+
+# This is a Makefile fragment, see src/ioc/Makefile.
+
+$(COMMON_DIR)/softIoc.dbd: $(INSTALL_DBD)/stdRecords.dbd
+
+softMain$(OBJ): epicsInstallDir.h
+
+epicsInstallDir.h:
+	$(ECHO) "FINAL_LOCATION=$(FINAL_LOCATION)"
+	$(PERL) $(STDDIR)/softIoc/makeInstallDir.pl '$(FINAL_LOCATION)' > $@
+
+clean::
+	@$(RM) epicsInstallDir.h
+

src/std/softIoc/base.dbd

@@ -0,0 +1,20 @@
+# $Revision-Id$
+#
+# This file defines the standard record types and device support
+# provided by Base and (usually) loaded into all IOCs.
+
+# Menus
+include "menuGlobal.dbd"
+include "menuConvert.dbd"
+
+# Record types
+include "stdRecords.dbd"
+
+# "Soft Channel", "Raw Soft Channel", and "Async Soft Channel" device support
+include "devSoft.dbd"
+
+# Access security subroutines
+registrar(asSub)
+
+include "dbCore.dbd"
+