From 6e5ab5a213551b81ce27709f3af0b64bce185d84 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Fri, 2 Jun 2000 15:00:18 +0000 Subject: [PATCH] The exampleApp now has one src directory. --- src/makeBaseApp/Makefile | 28 +++----- src/makeBaseApp/top/exampleApp/Makefile | 6 +- src/makeBaseApp/top/exampleApp/src/Makefile | 65 ++++++++++++++----- .../top/exampleApp/src/baseLIBOBJS | 6 +- .../top/exampleApp/src/caExample.c | 1 + src/makeBaseApp/top/exampleBoot/ioc/st.cmd | 2 +- 6 files changed, 66 insertions(+), 42 deletions(-) diff --git a/src/makeBaseApp/Makefile b/src/makeBaseApp/Makefile index b1af12576..c6caaf6dd 100644 --- a/src/makeBaseApp/Makefile +++ b/src/makeBaseApp/Makefile @@ -23,24 +23,16 @@ TEMPLATES += top/exampleApp/Makefile TEMPLATES += top/exampleApp/Db/Makefile TEMPLATES += top/exampleApp/Db/dbExample1.db TEMPLATES += top/exampleApp/Db/dbExample2.db -TEMPLATES += top/exampleApp/hostSrc/Makefile -TEMPLATES += top/exampleApp/hostSrc/base.dbd -TEMPLATES += top/exampleApp/hostSrc/caExample.c -TEMPLATES += top/exampleApp/hostSrc/exampleInclude.dbd -TEMPLATES += top/exampleApp/hostSrc/xxxRecord.dbd -TEMPLATES += top/exampleApp/iocHostSrc/Makefile -TEMPLATES += top/exampleApp/iocHostSrc/baseLIBOBJS -TEMPLATES += top/exampleApp/iocHostSrc/caExample.c -TEMPLATES += top/exampleApp/iocHostSrc/devXxxSoft.c -TEMPLATES += top/exampleApp/iocHostSrc/exampleMain.c -TEMPLATES += top/exampleApp/iocHostSrc/sncExample.st -TEMPLATES += top/exampleApp/iocHostSrc/xxxRecord.c -TEMPLATES += top/exampleApp/iocSrc/Makefile -TEMPLATES += top/exampleApp/iocSrc/baseLIBOBJS -TEMPLATES += top/exampleApp/iocSrc/caExample.c -TEMPLATES += top/exampleApp/iocSrc/devXxxSoft.c -TEMPLATES += top/exampleApp/iocSrc/sncExample.st -TEMPLATES += top/exampleApp/iocSrc/xxxRecord.c +TEMPLATES += top/exampleApp/src/Makefile +TEMPLATES += top/exampleApp/src/base.dbd +TEMPLATES += top/exampleApp/src/baseLIBOBJS +TEMPLATES += top/exampleApp/src/devXxxSoft.c +TEMPLATES += top/exampleApp/src/xxxRecord.c +TEMPLATES += top/exampleApp/src/caExample.c +TEMPLATES += top/exampleApp/src/exampleInclude.dbd +TEMPLATES += top/exampleApp/src/sncExample.st +TEMPLATES += top/exampleApp/src/xxxRecord.dbd +TEMPLATES += top/exampleApp/src/exampleMain.c TEMPLATES += top/exampleBoot/Makefile TEMPLATES += top/exampleBoot/nfsCommands diff --git a/src/makeBaseApp/top/exampleApp/Makefile b/src/makeBaseApp/top/exampleApp/Makefile index 971654a92..f17aa9d47 100644 --- a/src/makeBaseApp/top/exampleApp/Makefile +++ b/src/makeBaseApp/top/exampleApp/Makefile @@ -1,8 +1,8 @@ TOP = .. include $(TOP)/configure/CONFIG -DIRS += hostSrc -DIRS += iocHostSrc -DIRS += iocSrc +DIRS += $(wildcard *src*) +DIRS += $(wildcard *Src*) DIRS += $(wildcard *db*) DIRS += $(wildcard *Db*) include $(TOP)/configure/RULES_DIRS + diff --git a/src/makeBaseApp/top/exampleApp/src/Makefile b/src/makeBaseApp/top/exampleApp/src/Makefile index 38837e158..03a89a4b7 100644 --- a/src/makeBaseApp/top/exampleApp/src/Makefile +++ b/src/makeBaseApp/top/exampleApp/src/Makefile @@ -3,41 +3,72 @@ TOP=../.. include $(TOP)/configure/CONFIG #---------------------------------------- # ADD MACRO DEFINITIONS AFTER THIS LINE +#============================= #USR_CFLAGS += -PROD_LIBS += ca -PROD_LIBS += dbStaticHost -PROD_LIBS += Com -ca_DIR = $(EPICS_BASE_LIB) -Db_DIR = $(EPICS_BASE_LIB) -Com_DIR = $(EPICS_BASE_LIB) PROD += caExample -#USR_CFLAGS += +caExample_LIBS += ca +caExample_LIBS += Com + +ca_DIR = $(EPICS_BASE_LIB) +Com_DIR = $(EPICS_BASE_LIB) + +#============================= RECTYPES += xxxRecord.h DBDEXPAND = exampleInclude.dbd DBDNAME = exampleApp.dbd +#============================= + +LIBRARY_vxWorks = example +PROD_RTEMS = example +PROD += example + +example_LIBS += iocsh +example_LIBS += miscIoc +example_LIBS += rsrvIoc +example_LIBS += dbtoolsIoc +example_LIBS += asIoc +example_LIBS += dbIoc +example_LIBS += registryIoc +example_LIBS += dbStaticIoc +example_LIBS += ca +example_LIBS += Com + +iocsh_DIR = $(EPICS_BASE_LIB) +miscIoc_DIR = $(EPICS_BASE_LIB) +rsrvIoc_DIR = $(EPICS_BASE_LIB) +dbtoolsIoc_DIR = $(EPICS_BASE_LIB) +asIoc_DIR = $(EPICS_BASE_LIB) +dbIoc_DIR = $(EPICS_BASE_LIB) +registryIoc_DIR = $(EPICS_BASE_LIB) +dbStaticIoc_DIR = $(EPICS_BASE_LIB) +ca_DIR = $(EPICS_BASE_LIB) +Com_DIR = $(EPICS_BASE_LIB) + example_SRCS += xxxRecord.c example_SRCS += devXxxSoft.c -#example_SRCS += sncExample.c -#example_SRCS += registerRecordDeviceDriver.c +example_SRCS_DEFAULT += registerRecordDeviceDriver.c +example_SRCS_DEFAULT += exampleMain.c +example_SRCS_vxWorks += -nil- +#example_SRCS_vxWorks += sncExample.c +example_SRCS_RTEMS += registerRecordDeviceDriver.c -example_OBJS += $(EPICS_BASE_BIN)/registerRecordDeviceDriver.o - -example_OBJS += $(EPICS_BASE_BIN)/iocCoreLibrary.o -example_OBJS += $(EPICS_BASE_BIN)/iocInit.o -#example_OBJS += $(EPICS_BASE_BIN)/seq.o +example_OBJS_DEFAULT += $(EPICS_BASE_BIN)/registerRecordDeviceDriverRegister +example_OBJS_vxWorks += $(EPICS_BASE_BIN)/registerRecordDeviceDriver +example_OBJS_vxWorks += $(EPICS_BASE_BIN)/iocCoreLibrary +#example_OBJS_vxWorks += $(EPICS_BASE_BIN)/seq -include ../baseLIBOBJS example_OBJS += $(LIBOBJS) -#Note that the command line that builds the -#library $(LIBRARY_IOC) may be HUGE (>3kB) -# +#=========================== + include $(TOP)/configure/RULES #---------------------------------------- # ADD RULES AFTER THIS LINE + diff --git a/src/makeBaseApp/top/exampleApp/src/baseLIBOBJS b/src/makeBaseApp/top/exampleApp/src/baseLIBOBJS index 643e2c597..6de04158a 100644 --- a/src/makeBaseApp/top/exampleApp/src/baseLIBOBJS +++ b/src/makeBaseApp/top/exampleApp/src/baseLIBOBJS @@ -67,6 +67,6 @@ LIBOBJS += $(EPICS_BASE_BIN)/devWfTestAsyn.o # # Driver support ANSI # -LIBOBJS += $(EPICS_BASE_BIN)/drvEpvxi.o -LIBOBJS += $(EPICS_BASE_BIN)/drvEpvxiMsg.o -LIBOBJS += $(EPICS_BASE_BIN)/drvHp1404a.o +LIBOBJS_vxWorks += $(EPICS_BASE_BIN)/drvEpvxi.o +LIBOBJS_vxWorks += $(EPICS_BASE_BIN)/drvEpvxiMsg.o +LIBOBJS_vxWorks += $(EPICS_BASE_BIN)/drvHp1404a.o diff --git a/src/makeBaseApp/top/exampleApp/src/caExample.c b/src/makeBaseApp/top/exampleApp/src/caExample.c index 04e57197e..dfeef568b 100644 --- a/src/makeBaseApp/top/exampleApp/src/caExample.c +++ b/src/makeBaseApp/top/exampleApp/src/caExample.c @@ -15,6 +15,7 @@ main(int argc,char **argv) fprintf(stderr,"usage: caExample pvname\n"); exit(1); } + threadInit(); SEVCHK(ca_task_initialize(),"ca_task_initialize"); SEVCHK(ca_search(argv[1],&mychid),"ca_search failure"); SEVCHK(ca_pend_io(5.0),"ca_pend_io failure"); diff --git a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd index 2960a7e04..9be83e34f 100644 --- a/src/makeBaseApp/top/exampleBoot/ioc/st.cmd +++ b/src/makeBaseApp/top/exampleBoot/ioc/st.cmd @@ -13,7 +13,7 @@ threadInit() cd top dbLoadDatabase("dbd/exampleApp.dbd") -registerRecordDeviceDriverBase(pdbbase) +registerRecordDeviceDriver(pdbbase) dbLoadRecords("db/dbExample1.db","user=_USER_") dbLoadRecords("db/dbExample2.db","user=_USER_,no=1,scan=1 second") dbLoadRecords("db/dbExample2.db","user=_USER_,no=2,scan=2 second")