From 6d44e17e465dd36d83639b5f058270b4fd436880 Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Mon, 24 Jan 2000 20:59:24 +0000 Subject: [PATCH] new way to build --- src/bpt/Makefile | 21 +++++++-- src/bpt/Makefile.Host | 20 -------- src/bpt/Makefile.Ioc | 18 ------- src/cxxTemplates/Makefile | 9 ++-- src/cxxTemplates/Makefile.Host | 13 ------ src/db/Makefile | 67 ++++++++++++++++++++++++-- src/db/Makefile.Host | 46 ------------------ src/db/Makefile.Ioc | 35 -------------- src/db/dbBkpt.c | 5 +- src/dbStatic/Makefile | 45 +++++++++++++++++- src/dbStatic/Makefile.Host | 36 -------------- src/dbStatic/Makefile.Ioc | 22 --------- src/dbtools/Makefile | 20 +++++++- src/dbtools/Makefile.Ioc | 23 --------- src/include/Makefile | 33 ++++++++++++- src/include/Makefile.Host | 39 ---------------- src/include/Makefile.Ioc | 10 ---- src/makeBaseApp/Makefile | 59 ++++++++++++++++++++++- src/makeBaseApp/Makefile.Host | 62 ------------------------ src/misc/Makefile | 5 +- src/misc/Makefile.Ioc | 12 ----- src/registry/Makefile | 26 ++++++++++- src/registry/Makefile.Ioc | 28 ----------- src/rsrv/Makefile | 11 ++++- src/rsrv/Makefile.Ioc | 16 ------- src/toolsComm/antelope/Makefile | 24 ++++++++-- src/toolsComm/antelope/Makefile.Host | 17 ------- src/toolsComm/flex/Makefile | 41 +++++++++++++++- src/toolsComm/flex/Makefile.Host | 36 -------------- src/util/Makefile | 30 +++++++++++- src/util/Makefile.Host | 30 ------------ src/util/Makefile.Ioc | 10 ---- src/util/ca_test.c | 49 ------------------- src/util/ca_test.h | 30 ++++++++++++ src/util/ca_test_main.c | 70 ++++++++++++++++++++++++++++ 35 files changed, 464 insertions(+), 554 deletions(-) delete mode 100644 src/bpt/Makefile.Host delete mode 100644 src/bpt/Makefile.Ioc delete mode 100644 src/cxxTemplates/Makefile.Host delete mode 100644 src/db/Makefile.Host delete mode 100644 src/db/Makefile.Ioc delete mode 100644 src/dbStatic/Makefile.Host delete mode 100644 src/dbStatic/Makefile.Ioc delete mode 100644 src/dbtools/Makefile.Ioc delete mode 100644 src/include/Makefile.Host delete mode 100644 src/include/Makefile.Ioc delete mode 100644 src/makeBaseApp/Makefile.Host delete mode 100644 src/misc/Makefile.Ioc delete mode 100644 src/registry/Makefile.Ioc delete mode 100644 src/rsrv/Makefile.Ioc delete mode 100644 src/toolsComm/antelope/Makefile.Host delete mode 100644 src/toolsComm/flex/Makefile.Host delete mode 100644 src/util/Makefile.Host delete mode 100644 src/util/Makefile.Ioc create mode 100644 src/util/ca_test.h create mode 100644 src/util/ca_test_main.c diff --git a/src/bpt/Makefile b/src/bpt/Makefile index f036231b2..442fcd53d 100644 --- a/src/bpt/Makefile +++ b/src/bpt/Makefile @@ -1,7 +1,22 @@ - TOP=../.. - include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES_ARCHS +INC += cvtTable.h +makeBpt_SRCS += makeBpt.c +PROD += makeBpt + +MENUS += menuConvert.h + +bptLibrary_SRCS += cvtBpt.c + +LIB_IOC = bptLibrary + +BPTS += bptTypeJdegC.dbd +BPTS += bptTypeJdegF.dbd +BPTS += bptTypeKdegC.dbd +BPTS += bptTypeKdegF.dbd + +include $(TOP)/configure/RULES + +$(BPTS): $(INSTALL_PROD) diff --git a/src/bpt/Makefile.Host b/src/bpt/Makefile.Host deleted file mode 100644 index 1a21b319d..000000000 --- a/src/bpt/Makefile.Host +++ /dev/null @@ -1,20 +0,0 @@ - -TOP=../.. -include $(TOP)/configure/CONFIG - -INC := cvtTable.h - -SRCS := makeBpt.c -PROD := makeBpt - -MENUS += menuConvert.h - -BPTS += bptTypeJdegC.dbd -BPTS += bptTypeJdegF.dbd -BPTS += bptTypeKdegC.dbd -BPTS += bptTypeKdegF.dbd - -include $(TOP)/configure/RULES_BUILD - -$(BPTS): $(INSTALL_PROD) - diff --git a/src/bpt/Makefile.Ioc b/src/bpt/Makefile.Ioc deleted file mode 100644 index bcf6680af..000000000 --- a/src/bpt/Makefile.Ioc +++ /dev/null @@ -1,18 +0,0 @@ - -TOP=../.. - -include $(TOP)/configure/CONFIG - -MENUS += menuConvert.h - -BPTS += bptTypeJdegC.dbd -BPTS += bptTypeJdegF.dbd -BPTS += bptTypeKdegC.dbd -BPTS += bptTypeKdegF.dbd - -bptLibrary_SRCS = cvtBpt.c - -LIBRARY = bptLibrary - -include $(TOP)/configure/RULES_BUILD - diff --git a/src/cxxTemplates/Makefile b/src/cxxTemplates/Makefile index f036231b2..8e151131b 100644 --- a/src/cxxTemplates/Makefile +++ b/src/cxxTemplates/Makefile @@ -1,7 +1,10 @@ - TOP=../.. - include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES_ARCHS +INC += resourceLib.h +INC += tsDLList.h +INC += tsSLList.h +INC += tsMinMax.h +INC += tsBTree.h +include $(TOP)/configure/RULES diff --git a/src/cxxTemplates/Makefile.Host b/src/cxxTemplates/Makefile.Host deleted file mode 100644 index 70b77b9a4..000000000 --- a/src/cxxTemplates/Makefile.Host +++ /dev/null @@ -1,13 +0,0 @@ - -TOP=../.. - -include $(TOP)/configure/CONFIG - -INC += resourceLib.h -INC += tsDLList.h -INC += tsSLList.h -INC += tsMinMax.h -INC += tsBTree.h - -include $(TOP)/configure/RULES_BUILD - diff --git a/src/db/Makefile b/src/db/Makefile index f036231b2..a21995f2d 100644 --- a/src/db/Makefile +++ b/src/db/Makefile @@ -1,7 +1,68 @@ - TOP=../.. - include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES_ARCHS +# includes to install from this sub-project +# +INC += callback.h +INC += dbLock.h +INC += dbAccess.h +INC += dbConvert.h +INC += dbEvent.h +INC += dbScan.h +INC += db_access.h +INC += dbAddr.h +INC += db_field_log.h +INC += initHooks.h +INC += recSup.h +INC += taskwd.h +INC += recGbl.h +INC += dbBkpt.h +MENUS += menuAlarmSevr.h +MENUS += menuAlarmStat.h +MENUS += menuArrType.h +MENUS += menuCompress.h +MENUS += menuFtype.h +MENUS += menuIvoa.h +MENUS += menuLinr.h +MENUS += menuOmsl.h +MENUS += menuPriority.h +MENUS += menuScan.h +MENUS += menuYesNo.h + +RECTYPES += dbCommon.h +USER_DBDFLAGS += -I .. + +DBDINSTALL += dbCommonRecord.dbd +DBDINSTALL += menuGlobal.dbd + +SRCS += dbLock.c +SRCS += dbAccess.c +SRCS += dbBkpt.c +SRCS += dbConvert.c +SRCS += dbFastLinkConv.c +SRCS += dbNotify.c +SRCS += iocInit.c +SRCS += dbScan.c +SRCS += dbEvent.c +SRCS += dbTest.c +SRCS += db_access.c +SRCS += db_test.c +SRCS += recGbl.c +SRCS += callback.c +SRCS += taskwd.c +SRCS += dbCa.c +SRCS += initHooks.c +SRCS += dbcar.c + + +LIBRARY = dbLib + +include $(TOP)/configure/RULES + +$(LIBOBJS_HOST): dbCommon.h + +dbCommon.h: ../dbCommonRecord.dbd ../dbCommon.dbd + $(RM) $@ + $(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH$(EXE) \ + $(USER_DBDFLAGS) $< diff --git a/src/db/Makefile.Host b/src/db/Makefile.Host deleted file mode 100644 index 0e0349431..000000000 --- a/src/db/Makefile.Host +++ /dev/null @@ -1,46 +0,0 @@ - -TOP=../.. - -include $(TOP)/configure/CONFIG - -# includes to install from this sub-project -# -INC += callback.h -INC += dbLock.h -INC += dbAccess.h -INC += dbConvert.h -INC += dbEvent.h -INC += dbScan.h -INC += db_access.h -INC += dbAddr.h -INC += db_field_log.h -INC += initHooks.h -INC += recSup.h -INC += taskwd.h -INC += recGbl.h -INC += dbBkpt.h - -MENUS += menuAlarmSevr.h -MENUS += menuAlarmStat.h -MENUS += menuArrType.h -MENUS += menuCompress.h -MENUS += menuFtype.h -MENUS += menuIvoa.h -MENUS += menuLinr.h -MENUS += menuOmsl.h -MENUS += menuPriority.h -MENUS += menuScan.h -MENUS += menuYesNo.h - -RECTYPES += dbCommon.h -USER_DBDFLAGS += -I .. - -DBDINSTALL += dbCommonRecord.dbd -DBDINSTALL += menuGlobal.dbd - -include $(TOP)/configure/RULES_BUILD - -dbCommon.h: ../dbCommonRecord.dbd ../dbCommon.dbd - $(RM) $@ - $(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH$(EXE) \ - $(USER_DBDFLAGS) $< diff --git a/src/db/Makefile.Ioc b/src/db/Makefile.Ioc deleted file mode 100644 index d3ed5768a..000000000 --- a/src/db/Makefile.Ioc +++ /dev/null @@ -1,35 +0,0 @@ - -TOP=../.. - -include $(TOP)/configure/CONFIG - - -dbLib_SRCS = \ - dbLock.c\ - dbAccess.c\ - dbBkpt.c\ - dbConvert.c\ - dbFastLinkConv.c\ - dbNotify.c \ - iocInit.c\ - dbScan.c\ - dbEvent.c\ - dbTest.c\ - db_access.c\ - db_test.c\ - recGbl.c\ - callback.c\ - taskwd.c\ - dbCa.c \ - initHooks.c \ - dbcar.c - - -LIBRARY = dbLib - -include $(TOP)/configure/RULES_BUILD - -dbCommon.h: ../dbCommonRecord.dbd ../dbCommon.dbd - $(RM) $@ - $(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH$(EXE) \ - $(USER_DBDFLAGS) $< diff --git a/src/db/dbBkpt.c b/src/db/dbBkpt.c index ede8aa64b..154cee29d 100644 --- a/src/db/dbBkpt.c +++ b/src/db/dbBkpt.c @@ -14,6 +14,9 @@ of this distribution. /* Modification Log: * ----------------- * $Log$ + * Revision 1.12 2000/01/04 20:26:16 mrk + * replace osiClock calls with tsStamp calls + * * Revision 1.11 1999/12/14 22:01:33 mrk * changes for osiSem changes * @@ -807,7 +810,7 @@ int dbBkpt(struct dbCommon *precord) */ semMutexGive(bkpt_stack_sem); dbScanUnlock(precord); - threadSuspend(pnode->taskid); + threadSuspend(0); dbScanLock(precord); semMutexMustTake(bkpt_stack_sem); } diff --git a/src/dbStatic/Makefile b/src/dbStatic/Makefile index d56852bad..487f7cddd 100644 --- a/src/dbStatic/Makefile +++ b/src/dbStatic/Makefile @@ -1,6 +1,47 @@ - TOP=../.. include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES_ARCHS +# includes to install from this sub-project +# +INC += alarm.h +INC += alarmString.h +INC += dbBase.h +INC += dbFldTypes.h +INC += dbStaticLib.h +INC += link.h +INC += special.h +INC += guigroup.h + +# Sources to compile & put into lib: +# +LIBSRCS += dbStaticLib.c +LIBSRCS += dbYacc.c +LIBSRCS += dbPvdLib.c +Db_SRCS += dbStaticNoRun.c +dbStatic_SRCS += dbStaticRun.c + + +# Library to build: +# +LIB_HOST += Db +LIB_IOC += dbStatic + +# Products to build: +# +PROD = dbReadTest dbExpand dbToMenuH dbToRecordtypeH + +# libs needed by PROD: +# +PROD_LIBS := Db Com +Db_DIR=. + +include $(TOP)/configure/RULES + +# Extra rule since dbLexRoutines.c is included in dbYacc.c +dbYacc$(OBJ): dbLex.c ../dbLexRoutines.c + +clean:: + @$(RM) dbLex.c dbYacc.c + +# EOF Makefile.Host for base/src/dbStatic diff --git a/src/dbStatic/Makefile.Host b/src/dbStatic/Makefile.Host deleted file mode 100644 index bfbe0801a..000000000 --- a/src/dbStatic/Makefile.Host +++ /dev/null @@ -1,36 +0,0 @@ - -TOP=../.. - -include $(TOP)/configure/CONFIG - -# includes to install from this sub-project -# -INC += alarm.h alarmString.h dbBase.h dbFldTypes.h -INC += dbStaticLib.h link.h special.h guigroup.h - -# Sources to compile & put into lib: -# -Db_SRCS := dbStaticLib.c dbYacc.c dbPvdLib.c dbStaticNoRun.c - -# Library to build: -# -LIBRARY := Db - -# Products to build: -# -PROD = dbReadTest dbExpand dbToMenuH dbToRecordtypeH - -# libs needed by PROD: -# -PROD_LIBS := Db Com -Db_DIR=. - -include $(TOP)/configure/RULES_BUILD - -# Extra rule since dbLexRoutines.c is included in dbYacc.c -dbYacc$(OBJ): dbLex.c ../dbLexRoutines.c - -clean:: - @$(RM) dbLex.c dbYacc.c - -# EOF Makefile.Host for base/src/dbStatic diff --git a/src/dbStatic/Makefile.Ioc b/src/dbStatic/Makefile.Ioc deleted file mode 100644 index 892b94d84..000000000 --- a/src/dbStatic/Makefile.Ioc +++ /dev/null @@ -1,22 +0,0 @@ - -TOP=../.. - -include $(TOP)/configure/CONFIG - -dbStaticLib_SRCS = \ - dbYacc.c\ - dbPvdLib.c\ - dbStaticRun.c\ - dbStaticLib.c - -LIBRARY = dbStaticLib - -include $(TOP)/configure/RULES_BUILD - -# Extra rule since dbLexRoutines.c is included in dbYacc.c -dbYacc$(OBJ): dbLex.c ../dbLexRoutines.c - -clean:: - @$(RM) dbLex.c dbYacc.c - -# EOF Makefile.Host for base/src/dbStatic diff --git a/src/dbtools/Makefile b/src/dbtools/Makefile index d56852bad..0bf7c3062 100644 --- a/src/dbtools/Makefile +++ b/src/dbtools/Makefile @@ -1,6 +1,22 @@ - TOP=../.. include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES_ARCHS +YACCOPT := -l +LEXOPT := -L + +dbSubs_SRCS += dbLoadTemplate.c + +LIBRARY = dbSubs + +include $(TOP)/configure/RULES + +# +# These lex sources are included in some C sources, +# so they have to be created in time: +# +dbLoadTemplate$(OBJ): dbLoadTemplate_lex.c + +clean:: + @$(RM) dbLoadTemplate_lex.c dbLoadTemplate.c + diff --git a/src/dbtools/Makefile.Ioc b/src/dbtools/Makefile.Ioc deleted file mode 100644 index 9f689f1df..000000000 --- a/src/dbtools/Makefile.Ioc +++ /dev/null @@ -1,23 +0,0 @@ - -TOP=../.. - -include $(TOP)/configure/CONFIG - -YACCOPT := -l -LEXOPT := -L - -dbSubs_SRCS += dbLoadTemplate.c - -LIBRARY = dbSubs - -include $(TOP)/configure/RULES_BUILD - -# -# These lex sources are included in some C sources, -# so they have to be created in time: -# -dbLoadTemplate$(OBJ): dbLoadTemplate_lex.c - -clean:: - @$(RM) dbLoadTemplate_lex.c dbLoadTemplate.c - diff --git a/src/include/Makefile b/src/include/Makefile index d56852bad..d2fe03020 100644 --- a/src/include/Makefile +++ b/src/include/Makefile @@ -1,6 +1,35 @@ - TOP=../.. include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES_ARCHS +INC += dbDefs.h +INC += epicsTypes.h +INC += epicsVersion.h +INC += gsd_sync_defs.h +INC += shareLib.h +#INC += createSoftLinks.sh +#INC += osiMutexNOOP.h +INC += unixFileName.h + +INC += devSup.h +INC += drvSup.h +INC += caeventmask.h +INC += asLib.h +INC += registryDeviceSupport.h +INC += registryDriverSupport.h +INC += registryRecordType.h +INC += cadef.h +INC += caerr.h +INC += asDbLib.h + + +INC += osiFileName.h +INC += osiSock.h + +include $(TOP)/configure/RULES + +# This seems to be handled wrong by gnumake: +# epicsVersion.h is rebuild in any case, +# no matter what date ...CONFIG_BASE_VERSION has +epicsVersion.h: $(TOP)/configure/CONFIG_BASE_VERSION + $(PERL) ../makeEpicsVersion.pl $(TOP)/configure/CONFIG_BASE_VERSION diff --git a/src/include/Makefile.Host b/src/include/Makefile.Host deleted file mode 100644 index dccc922a7..000000000 --- a/src/include/Makefile.Host +++ /dev/null @@ -1,39 +0,0 @@ - -TOP=../.. - -include $(TOP)/configure/CONFIG - -INC += dbDefs.h -INC += epicsTypes.h -INC += epicsVersion.h -INC += gsd_sync_defs.h -INC += shareLib.h -#INC += createSoftLinks.sh -#INC += osiMutexNOOP.h -INC += unixFileName.h - -INC += devSup.h -INC += drvSup.h -INC += caeventmask.h -INC += asLib.h -INC += registryDeviceSupport.h -INC += registryDriverSupport.h -INC += registryRecordType.h -INC += cadef.h -INC += caerr.h -INC += asDbLib.h - - -INC += osiFileName.h -INC += osiSock.h - -include $(TOP)/configure/RULES_BUILD - -# This seems to be handled wrong by gnumake: -# epicsVersion.h is rebuild in any case, -# no matter what date ...CONFIG_BASE_VERSION has -epicsVersion.h: $(TOP)/configure/CONFIG_BASE_VERSION - $(PERL) ../makeEpicsVersion.pl $(TOP)/configure/CONFIG_BASE_VERSION - -install: $(INSTALL_INCLUDE)/epicsVersion.h - diff --git a/src/include/Makefile.Ioc b/src/include/Makefile.Ioc deleted file mode 100644 index c94f62010..000000000 --- a/src/include/Makefile.Ioc +++ /dev/null @@ -1,10 +0,0 @@ - -TOP=../.. - -include $(TOP)/configure/CONFIG - -INC += osiFileName.h -INC += osiSock.h - -include $(TOP)/configure/RULES_BUILD - diff --git a/src/makeBaseApp/Makefile b/src/makeBaseApp/Makefile index f036231b2..3c59ed49e 100644 --- a/src/makeBaseApp/Makefile +++ b/src/makeBaseApp/Makefile @@ -1,7 +1,62 @@ - TOP=../.. include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES_ARCHS +TEMPLATES_DIR = makeBaseApp + +TEMPLATES += top/Makefile +TEMPLATES += top/configure/CONFIG +TEMPLATES += top/configure/CONFIG_APP +TEMPLATES += top/configure/RELEASE +TEMPLATES += top/configure/RULES.Db +TEMPLATES += top/configure/RULES_ARCHS +TEMPLATES += top/configure/RULES_BUILD +TEMPLATES += top/configure/RULES_DIRS +TEMPLATES += top/configure/RULES_TOP +TEMPLATES += top/configure/RULES.ioc +TEMPLATES += top/configure/RULES.iocBoot +TEMPLATES += top/configure/RULES.registerRecordDeviceDriver + +TEMPLATES += top/configure/Makefile +TEMPLATES += top/configure/makeConfigAppInclude.pl +TEMPLATES += top/configure/makeDbDepends.pl +TEMPLATES += top/configure/makeIocCdCommands.pl +TEMPLATES += top/configure/replaceVAR.pl + +TEMPLATES += top/exampleApp/Makefile +TEMPLATES += top/exampleApp/Db/Makefile +TEMPLATES += top/exampleApp/Db/Makefile.Host +TEMPLATES += top/exampleApp/Db/dbExample1.db +TEMPLATES += top/exampleApp/Db/dbExample2.db +TEMPLATES += top/exampleApp/src/Makefile +TEMPLATES += top/exampleApp/src/Makefile.Host +TEMPLATES += top/exampleApp/src/Makefile.Ioc +TEMPLATES += top/exampleApp/src/base.dbd +TEMPLATES += top/exampleApp/src/baseLIBOBJS +TEMPLATES += top/exampleApp/src/caExample.c +TEMPLATES += top/exampleApp/src/devXxxSoft.c +TEMPLATES += top/exampleApp/src/exampleInclude.dbd +TEMPLATES += top/exampleApp/src/sncExample.st +TEMPLATES += top/exampleApp/src/xxxRecord.c +TEMPLATES += top/exampleApp/src/xxxRecord.dbd + +TEMPLATES += top/exampleBoot/Makefile +TEMPLATES += top/exampleBoot/nfsCommands +TEMPLATES += top/exampleBoot/ioc/Makefile +TEMPLATES += top/exampleBoot/ioc/st.cmd + +TEMPLATES += top/simpleApp/Makefile +TEMPLATES += top/simpleApp/Db/Makefile +TEMPLATES += top/simpleApp/src/Makefile +TEMPLATES += top/simpleApp/src/Makefile.Host +TEMPLATES += top/simpleApp/src/Makefile.Ioc + +TEMPLATES += top/simpleBoot/Makefile +TEMPLATES += top/simpleBoot/nfsCommands +TEMPLATES += top/simpleBoot/ioc/Makefile +TEMPLATES += top/simpleBoot/ioc/st.cmd + +SCRIPTS += makeBaseApp.pl + +include $(TOP)/configure/RULES diff --git a/src/makeBaseApp/Makefile.Host b/src/makeBaseApp/Makefile.Host deleted file mode 100644 index 0fd007862..000000000 --- a/src/makeBaseApp/Makefile.Host +++ /dev/null @@ -1,62 +0,0 @@ -TOP=../.. - -include $(TOP)/configure/CONFIG - -TEMPLATES_DIR = makeBaseApp - -TEMPLATES += top/Makefile -TEMPLATES += top/configure/CONFIG -TEMPLATES += top/configure/CONFIG_APP -TEMPLATES += top/configure/RELEASE -TEMPLATES += top/configure/RULES.Db -TEMPLATES += top/configure/RULES_ARCHS -TEMPLATES += top/configure/RULES_BUILD -TEMPLATES += top/configure/RULES_DIRS -TEMPLATES += top/configure/RULES_TOP -TEMPLATES += top/configure/RULES.ioc -TEMPLATES += top/configure/RULES.iocBoot -TEMPLATES += top/configure/RULES.registerRecordDeviceDriver - -TEMPLATES += top/configure/Makefile -TEMPLATES += top/configure/makeConfigAppInclude.pl -TEMPLATES += top/configure/makeDbDepends.pl -TEMPLATES += top/configure/makeIocCdCommands.pl -TEMPLATES += top/configure/replaceVAR.pl - -TEMPLATES += top/exampleApp/Makefile -TEMPLATES += top/exampleApp/Db/Makefile -TEMPLATES += top/exampleApp/Db/Makefile.Host -TEMPLATES += top/exampleApp/Db/dbExample1.db -TEMPLATES += top/exampleApp/Db/dbExample2.db -TEMPLATES += top/exampleApp/src/Makefile -TEMPLATES += top/exampleApp/src/Makefile.Host -TEMPLATES += top/exampleApp/src/Makefile.Ioc -TEMPLATES += top/exampleApp/src/base.dbd -TEMPLATES += top/exampleApp/src/baseLIBOBJS -TEMPLATES += top/exampleApp/src/caExample.c -TEMPLATES += top/exampleApp/src/devXxxSoft.c -TEMPLATES += top/exampleApp/src/exampleInclude.dbd -TEMPLATES += top/exampleApp/src/sncExample.st -TEMPLATES += top/exampleApp/src/xxxRecord.c -TEMPLATES += top/exampleApp/src/xxxRecord.dbd - -TEMPLATES += top/exampleBoot/Makefile -TEMPLATES += top/exampleBoot/nfsCommands -TEMPLATES += top/exampleBoot/ioc/Makefile -TEMPLATES += top/exampleBoot/ioc/st.cmd - -TEMPLATES += top/simpleApp/Makefile -TEMPLATES += top/simpleApp/Db/Makefile -TEMPLATES += top/simpleApp/src/Makefile -TEMPLATES += top/simpleApp/src/Makefile.Host -TEMPLATES += top/simpleApp/src/Makefile.Ioc - -TEMPLATES += top/simpleBoot/Makefile -TEMPLATES += top/simpleBoot/nfsCommands -TEMPLATES += top/simpleBoot/ioc/Makefile -TEMPLATES += top/simpleBoot/ioc/st.cmd - -SCRIPTS += makeBaseApp.pl - -include $(TOP)/configure/RULES_BUILD - diff --git a/src/misc/Makefile b/src/misc/Makefile index fc69c336c..e3b41e4ad 100644 --- a/src/misc/Makefile +++ b/src/misc/Makefile @@ -1,8 +1,9 @@ TOP=../.. - include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES_ARCHS +LIBRARY = miscLib +miscLib_SRCS = epicsRelease.c +include $(TOP)/configure/RULES diff --git a/src/misc/Makefile.Ioc b/src/misc/Makefile.Ioc deleted file mode 100644 index 8ffe7c9cb..000000000 --- a/src/misc/Makefile.Ioc +++ /dev/null @@ -1,12 +0,0 @@ - -TOP=../.. - -include $(TOP)/configure/CONFIG - -LIBRARY = miscLib - -miscLib_SRCS = epicsRelease.c - -include $(TOP)/configure/RULES_BUILD - - diff --git a/src/registry/Makefile b/src/registry/Makefile index 256417b88..faa49207f 100644 --- a/src/registry/Makefile +++ b/src/registry/Makefile @@ -1,6 +1,28 @@ TOP=../.. - include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES_ARCHS +# includes to install from this sub-project +# + +INC += registry.h + +# general contents of library on all platforms +# +# system specific lines in RULES.Host figure out +# 1) what object names (.o, .obj,...) to build +# 2) where to find the sources: ., ./os/, ./os/generic, ... +# + +SCRIPTS += registerRecordDeviceDriver.pl + +registryLibrary_SRCS += registry.c +registryLibrary_SRCS += registryRecordType.c +registryLibrary_SRCS += registryDeviceSupport.c +registryLibrary_SRCS += registryDriverSupport.c + +PROD = registerRecordDeviceDriver.o + +LIBRARY = registryLibrary + +include $(TOP)/configure/RULES diff --git a/src/registry/Makefile.Ioc b/src/registry/Makefile.Ioc deleted file mode 100644 index 9ef5b017e..000000000 --- a/src/registry/Makefile.Ioc +++ /dev/null @@ -1,28 +0,0 @@ -TOP=../.. -include $(TOP)/configure/CONFIG - -# includes to install from this sub-project -# - -INC += registry.h - -# general contents of library on all platforms -# -# system specific lines in RULES.Host figure out -# 1) what object names (.o, .obj,...) to build -# 2) where to find the sources: ., ./os/, ./os/generic, ... -# - -SCRIPTS += registerRecordDeviceDriver.pl - -registryLibrary_SRCS += registry.c -registryLibrary_SRCS += registryRecordType.c -registryLibrary_SRCS += registryDeviceSupport.c -registryLibrary_SRCS += registryDriverSupport.c - -PROD = registerRecordDeviceDriver.o - -LIBRARY = registryLibrary - -include $(TOP)/configure/RULES_BUILD - diff --git a/src/rsrv/Makefile b/src/rsrv/Makefile index f036231b2..aaf18e97c 100644 --- a/src/rsrv/Makefile +++ b/src/rsrv/Makefile @@ -1,7 +1,14 @@ - TOP=../.. include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES_ARCHS +USR_INCLUDES = -I../../ca +USR_CFLAGS += -UUNIX -DiocCore +rsrvLib_SRCS = \ + caserverio.c caservertask.c camsgtask.c camessage.c \ + rsrv_init.c cast_server.c online_notify.c globalsource.c + +LIBRARY = rsrvLib + +include $(TOP)/configure/RULES diff --git a/src/rsrv/Makefile.Ioc b/src/rsrv/Makefile.Ioc deleted file mode 100644 index b146f3e46..000000000 --- a/src/rsrv/Makefile.Ioc +++ /dev/null @@ -1,16 +0,0 @@ - -TOP=../.. - -include $(TOP)/configure/CONFIG - -USR_INCLUDES = -I../../ca -USR_CFLAGS += -UUNIX -DiocCore - -rsrvLib_SRCS = \ - caserverio.c caservertask.c camsgtask.c camessage.c \ - rsrv_init.c cast_server.c online_notify.c globalsource.c - -LIBRARY = rsrvLib - -include $(TOP)/configure/RULES_BUILD - diff --git a/src/toolsComm/antelope/Makefile b/src/toolsComm/antelope/Makefile index a758b0739..9840073c5 100644 --- a/src/toolsComm/antelope/Makefile +++ b/src/toolsComm/antelope/Makefile @@ -1,6 +1,22 @@ - TOP=../../.. - include $(TOP)/configure/CONFIG - -include $(TOP)/configure/RULES_ARCHS +HOST_WARN=NO +USR_CFLAGS = -D_NO_PROTO + +SRCS += closure.c +SRCS += error.c +SRCS += lalr.c +SRCS += lr0.c +SRCS += main.c +SRCS += mkpar.c +SRCS += output.c +SRCS += reader.c +SRCS += skeleton.c +SRCS += symtab.c +SRCS += verbose.c +SRCS += warshall.c + +PROD = antelope + +include $(TOP)/configure/RULES + diff --git a/src/toolsComm/antelope/Makefile.Host b/src/toolsComm/antelope/Makefile.Host deleted file mode 100644 index 076bd1678..000000000 --- a/src/toolsComm/antelope/Makefile.Host +++ /dev/null @@ -1,17 +0,0 @@ - -TOP=../../.. - -include $(TOP)/configure/CONFIG - -HOST_WARN=NO - -USR_CFLAGS = -D_NO_PROTO - -SRCS= closure.c error.c lalr.c lr0.c main.c \ - mkpar.c output.c reader.c skeleton.c \ - symtab.c verbose.c warshall.c - -PROD = antelope - -include $(TOP)/configure/RULES_BUILD - diff --git a/src/toolsComm/flex/Makefile b/src/toolsComm/flex/Makefile index a758b0739..205bca0a6 100644 --- a/src/toolsComm/flex/Makefile +++ b/src/toolsComm/flex/Makefile @@ -1,6 +1,43 @@ - TOP=../../.. include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES_ARCHS +HOST_WARN=NO + +YACC = $(EYACC) +YACCOPT = -l -d + +SKELETON_FILE=include/flex.skel.static + +# ARCH_CLASS hp700 needs special flags, +# everything else uses DEFAULT: +# +USR_CFLAGS_DEFAULT := -DUSG +USR_CFLAGS_hp700 := -DSCO_UNIX + +# This applies to all arch.classes: +# +USR_CFLAGS = -DDEFAULT_SKELETON_FILE=\"$(SKELETON_FILE)\" + +INC += flex.skel.static + +# main.c is included in parse.c +# +SRCS += ccl.c +SRCS += dfa.c +SRCS += ecs.c +SRCS += gen.c +SRCS += misc.c +SRCS += nfa.c +SRCS += sym.c +SRCS += tblcmp.c +SRCS += parse.c + +PROD = e_flex + +include $(TOP)/configure/RULES + +clean:: + $(RM) parse.c parse.h + +# EOF Makefile.Host for base/src/toolsComm/flex diff --git a/src/toolsComm/flex/Makefile.Host b/src/toolsComm/flex/Makefile.Host deleted file mode 100644 index 9691fea90..000000000 --- a/src/toolsComm/flex/Makefile.Host +++ /dev/null @@ -1,36 +0,0 @@ - -TOP=../../.. - -include $(TOP)/configure/CONFIG - -HOST_WARN=NO - -YACC = $(EYACC) -YACCOPT = -l -d - -SKELETON_FILE=include/flex.skel.static - -# ARCH_CLASS hp700 needs special flags, -# everything else uses DEFAULT: -# -USR_CFLAGS_DEFAULT := -DUSG -USR_CFLAGS_hp700 := -DSCO_UNIX - -# This applies to all arch.classes: -# -USR_CFLAGS = -DDEFAULT_SKELETON_FILE=\"$(SKELETON_FILE)\" - -INC += flex.skel.static - -# main.c is included in parse.c -# -SRCS := ccl.c dfa.c ecs.c gen.c misc.c nfa.c sym.c tblcmp.c parse.c - -PROD = e_flex - -include $(TOP)/configure/RULES_BUILD - -clean:: - $(RM) parse.c parse.h - -# EOF Makefile.Host for base/src/toolsComm/flex diff --git a/src/util/Makefile b/src/util/Makefile index d56852bad..9e8643ccf 100644 --- a/src/util/Makefile +++ b/src/util/Makefile @@ -1,6 +1,32 @@ - TOP=../.. include $(TOP)/configure/CONFIG -include $(TOP)/configure/RULES_ARCHS +CMPLR = STRICT + +# DEFAULT Unix needs lib m, every system needs libs ca & Com: +SYS_PROD_LIBS_DEFAULT := m +SYS_PROD_LIBS_WIN32 := -nil- +PROD_LIBS := ca Com +# +# Added winmm user32 for the non-dll build +# +SRCS_Host += ca_test_main.c +SYS_PROD_LIBS_WIN32 := ws2_32 advapi32 user32 +PROD_DEFAULT = ca_test iocLogServer startCArepeater +PROD_WIN32 = ca_test iocLogServer +PRODIOC_vxWorks = ca_test.o + +ca_test_SRCS = ca_test.c +TARGETS = ca_test.o + +SCRIPTS_solaris := S99logServer S99caRepeater + +include $(TOP)/configure/RULES + +S99%: ../rc2.% + @/usr/bin/sed -e s%:EPICS:%`chdir $(TOP); /usr/bin/pwd`% \ + -e s%:INSTALL_BIN:%`chdir $(INSTALL_BIN); /usr/bin/pwd`% \ + $< >$@ + +# EOF Makefile.Host for base/src/util diff --git a/src/util/Makefile.Host b/src/util/Makefile.Host deleted file mode 100644 index e4d8ab79b..000000000 --- a/src/util/Makefile.Host +++ /dev/null @@ -1,30 +0,0 @@ - -TOP=../.. - -include $(TOP)/configure/CONFIG - -CMPLR = STRICT - -# DEFAULT Unix needs lib m, every system needs libs ca & Com: -SYS_PROD_LIBS_DEFAULT := m -SYS_PROD_LIBS_WIN32 := -nil- -PROD_LIBS := ca Com -# -# Added winmm user32 for the non-dll build -# -SYS_PROD_LIBS_WIN32 := ws2_32 advapi32 user32 -PROD_DEFAULT = ca_test iocLogServer startCArepeater -PROD_WIN32 = ca_test iocLogServer -PRODIOC_vxWorks = ca_test.o - -SCRIPTS_solaris := S99logServer S99caRepeater - -include $(TOP)/configure/RULES_BUILD - -S99%: ../rc2.% - @/usr/bin/sed -e s%:EPICS:%`chdir $(TOP); /usr/bin/pwd`% \ - -e s%:INSTALL_BIN:%`chdir $(INSTALL_BIN); /usr/bin/pwd`% \ - $< >$@ - -# EOF Makefile.Host for base/src/util - diff --git a/src/util/Makefile.Ioc b/src/util/Makefile.Ioc deleted file mode 100644 index 4d6de96c8..000000000 --- a/src/util/Makefile.Ioc +++ /dev/null @@ -1,10 +0,0 @@ - -TOP=../.. - -include $(TOP)/configure/CONFIG - -ca_test_SRCS = ca_test.c -TARGETS = ca_test.o - -include $(TOP)/configure/RULES_BUILD - diff --git a/src/util/ca_test.c b/src/util/ca_test.c index b31231936..d077e35ec 100644 --- a/src/util/ca_test.c +++ b/src/util/ca_test.c @@ -67,55 +67,6 @@ LOCAL void print_returned(chtype type, const void *pbuffer, unsigned count); static unsigned long outstanding; - -/* - * - * main - * - * parse command line arguments - */ -#ifndef vxWorks -int main( -int argc, -char **argv -) -{ - - /* - * print error and return if arguments are invalid - */ - if(argc < 2 || argc > 3){ - printf("usage: ca_test channel_name <\"put value\">\n"); - printf("the following arguments were received\n"); - while(argc>0) { - printf("%s\n",argv[0]); - argv++; argc--; - } - return ERROR; - } - - - /* - * check for supplied value - */ - if(argc == 2){ - return ca_test(argv[1], NULL); - } - else if(argc == 3){ - char *pt; - - /* strip leading and trailing quotes*/ - if(argv[2][1]=='"') argv[2]++; - if( (pt=strchr(argv[2],'"')) ) *pt = 0; - return ca_test(argv[1], argv[2]); - } - else{ - return ERROR; - } - -} -#endif - /* * ca_test diff --git a/src/util/ca_test.h b/src/util/ca_test.h new file mode 100644 index 000000000..9ce71420e --- /dev/null +++ b/src/util/ca_test.h @@ -0,0 +1,30 @@ +/* @(#)ca_test.k $Id$ + * Author: Jeff Hill + * Date: 21JAN2000 + * + * Experimental Physics and Industrial Control System (EPICS) + * + * Copyright 1991, the Regents of the University of California, + * and the University of Chicago Board of Governors. + * + * This software was produced under U.S. Government contracts: + * (W-7405-ENG-36) at the Los Alamos National Laboratory, + * and (W-31-109-ENG-38) at Argonne National Laboratory. + * + * Initial development by: + * The Controls and Automation Group (AT-8) + * Ground Test Accelerator + * Accelerator Technology Division + * Los Alamos National Laboratory + * + * Co-developed with + * The Controls and Computing Group + * Accelerator Systems Division + * Advanced Photon Source + * Argonne National Laboratory + * + * Modification Log: + * ----------------- + * .01 21JAN2000 mrk split main from ca_test.c + */ +int ca_test(char *pname, char *pvalue); diff --git a/src/util/ca_test_main.c b/src/util/ca_test_main.c new file mode 100644 index 000000000..59a264808 --- /dev/null +++ b/src/util/ca_test_main.c @@ -0,0 +1,70 @@ +/* @(#)ca_test_main.c $Id$ + * Author: Jeff Hill + * Date: 21JAN2000 + * + * Experimental Physics and Industrial Control System (EPICS) + * + * Copyright 1991, the Regents of the University of California, + * and the University of Chicago Board of Governors. + * + * This software was produced under U.S. Government contracts: + * (W-7405-ENG-36) at the Los Alamos National Laboratory, + * and (W-31-109-ENG-38) at Argonne National Laboratory. + * + * Initial development by: + * The Controls and Automation Group (AT-8) + * Ground Test Accelerator + * Accelerator Technology Division + * Los Alamos National Laboratory + * + * Co-developed with + * The Controls and Computing Group + * Accelerator Systems Division + * Advanced Photon Source + * Argonne National Laboratory + * + * Modification Log: + * ----------------- + * .01 21JAN2000 mrk split main from ca_test + */ +#include +#include + +#include "ca_test.h" + +int main(int argc, char **argv) +{ + + /* + * print error and return if arguments are invalid + */ + if(argc < 2 || argc > 3){ + printf("usage: ca_test channel_name <\"put value\">\n"); + printf("the following arguments were received\n"); + while(argc>0) { + printf("%s\n",argv[0]); + argv++; argc--; + } + return ERROR; + } + + + /* + * check for supplied value + */ + if(argc == 2){ + return ca_test(argv[1], NULL); + } + else if(argc == 3){ + char *pt; + + /* strip leading and trailing quotes*/ + if(argv[2][1]=='"') argv[2]++; + if( (pt=strchr(argv[2],'"')) ) *pt = 0; + return ca_test(argv[1], argv[2]); + } + else{ + return ERROR; + } + +}