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
This commit is contained in:
committed by
Andrew Johnson
parent
e463793bc3
commit
f242a27dea
@@ -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
|
||||
|
||||
|
||||
20
src/std/softIoc/RULES
Normal file
20
src/std/softIoc/RULES
Normal file
@@ -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
|
||||
|
||||
20
src/std/softIoc/base.dbd
Normal file
20
src/std/softIoc/base.dbd
Normal file
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user