|
Subject: |
[Merge] lp:~mdavidsaver/epics-base/reorg-src into lp:epics-base |
|
From: |
mdavidsaver <[email protected]> |
|
To: |
[email protected] |
|
Date: |
Mon, 20 Dec 2010 22:34:09 -0000 |
mdavidsaver has proposed merging lp:~mdavidsaver/epics-base/reorg-src into lp:epics-base.
Requested reviews:
EPICS Core Developers (epics-core)
Major reorganization of code and build system. This change tries to group code by function. The only user visible change is that the number of libraries build shrinks 16 to 7. However, the definition of EPICS_BASE_IOC_LIBS changes accordingly.
The groups are now:
src/tools - Build system infrastructure
src/libCom - Everything unrelated to CA and IOCs
src/ca - CA components which can be used outside an IOC
src/ioc - The IOC core processing mechanisms
src/std - The standard record and dset definitions
src/template - home to makeBaseApp and makeBaseExt
Dependencies are now strictly
tools:
template:
libCom: tools
ca: libCom
ioc: libCom
std: ioc
--
https://code.launchpad.net/~mdavidsaver/epics-base/reorg-src/+merge/44296
Your team EPICS Core Developers is requested to review the proposed merge of lp:~mdavidsaver/epics-base/reorg-src into lp:epics-base.
=== modified file 'configure/CONFIG_BASE'
--- configure/CONFIG_BASE 2008-08-29 21:07:04 +0000
+++ configure/CONFIG_BASE 2010-12-20 22:33:53 +0000
@@ -21,14 +21,12 @@
#---------------------------------------------------------------
# Epics base Ioc libraries
-EPICS_BASE_IOC_LIBS += recIoc softDevIoc
-EPICS_BASE_IOC_LIBS += miscIoc rsrvIoc dbtoolsIoc asIoc
-EPICS_BASE_IOC_LIBS += dbIoc registryIoc dbStaticIoc ca Com
+EPICS_BASE_IOC_LIBS += dbRecStd dbCore ca Com
#---------------------------------------------------------------
# Epics base Host libraries
-EPICS_BASE_HOST_LIBS += cas gdd asHost dbStaticHost registryIoc
+EPICS_BASE_HOST_LIBS += cas gdd dbStaticHost
EPICS_BASE_HOST_LIBS += ca Com
#---------------------------------------------------------------
=== modified file 'configure/RULES_BUILD'
--- configure/RULES_BUILD 2010-10-12 16:26:00 +0000
+++ configure/RULES_BUILD 2010-12-20 22:33:53 +0000
@@ -221,23 +221,21 @@
@$(RM) $@
$(BAFCMD) $<
+YACCOPT ?= $($*_YACCOPT)
#
# rename the y.tab.h file only if we
# are creating it
#
-ifeq ($(findstring -d, $(YACCOPT)),-d)
-%.h %.c: %.y
- $(RM) $*.c y.tab.c
- $(RM) $*.h y.tab.h
- $(YACC) $(YACCOPT) $<
- $(MV) y.tab.c $*.c
- $(MV) y.tab.h $*.h
-else
%.c: %.y
- $(RM) $*.c y.tab.c
- $(YACC) $(YACCOPT) $<
- $(MV) y.tab.c $*.c
-endif
+ $(RM) $*.tab.c
+ $(RM) $*.tab.h
+ $(YACC) -b$* $(YACCOPT) $<
+ $(MV) $*.tab.c $*.c
+ $(if $(findstring -d, $(YACCOPT)),$(MV) $*.tab.h $*.h,)
+
+# must be a seperate rule since when not using '-d' the
+# prefix for .h will be different then .c
+%.h : %.c %.y
%.c: %.l
@$(RM) lex.yy.c
=== modified file 'src/Makefile'
--- src/Makefile 2010-10-12 16:27:17 +0000
+++ src/Makefile 2010-12-20 22:33:53 +0000
@@ -15,80 +15,56 @@
DIRS += tools
-DIRS += makeBaseApp
-makeBaseApp_DEPEND_DIRS = tools
-
-DIRS += makeBaseExt
-makeBaseExt_DEPEND_DIRS = tools
+DIRS += template/base
+template/base_DEPEND_DIRS = tools
+
+DIRS += template/ext
+template/ext_DEPEND_DIRS = tools
+
+# Common
DIRS += libCom
libCom_DEPEND_DIRS = tools
-DIRS += toolsComm
-toolsComm_DEPEND_DIRS = libCom
-
-DIRS += ca
-ca_DEPEND_DIRS = libCom
-
-DIRS += dbStatic
-dbStatic_DEPEND_DIRS = toolsComm
-
-DIRS += registry
-registry_DEPEND_DIRS = dbStatic
-
-DIRS += bpt
-bpt_DEPEND_DIRS = dbStatic
-
-DIRS += db
-db_DEPEND_DIRS = bpt ca
-
-DIRS += as
-as_DEPEND_DIRS = db
-
-DIRS += util
-util_DEPEND_DIRS = ca
-
-DIRS += dbtools
-dbtools_DEPEND_DIRS = db
-
-DIRS += catools
-catools_DEPEND_DIRS = ca dbStatic
-
-DIRS += rsrv
-rsrv_DEPEND_DIRS = as
-
-DIRS += rec
-rec_DEPEND_DIRS = as registry
-
-DIRS += misc
-misc_DEPEND_DIRS = dbtools rsrv rec
-
-DIRS += dev
-dev_DEPEND_DIRS = rec misc
-
-DIRS += RTEMS
-RTEMS_DEPEND_DIRS = libCom
+DIRS += libCom/RTEMS
+libCom/RTEMS_DEPEND_DIRS = libCom
DIRS += libCom/test
-libCom/test_DEPEND_DIRS = ca RTEMS
-
-DIRS += db/test
-db/test_DEPEND_DIRS = db RTEMS
-
-DIRS += softIoc
-softIoc_DEPEND_DIRS = dev dbtools RTEMS
-
-DIRS += gdd
-gdd_DEPEND_DIRS = ca
-
-DIRS += cas
-cas_DEPEND_DIRS = gdd dbStatic
-
-DIRS += excas
-excas_DEPEND_DIRS = cas as registry
-
-DIRS += cap5
-cap5_DEPEND_DIRS = ca dbStatic
+libCom/test_DEPEND_DIRS = libCom/RTEMS
+
+# Channel Access
+
+DIRS += ca/client
+ca/client_DEPEND_DIRS = libCom
+
+DIRS += ca/client/tools
+ca/client/tools_DEPEND_DIRS = ca/client
+
+DIRS += ca/legacy/gdd
+ca/legacy/gdd_DEPEND_DIRS = ca/client
+
+DIRS += ca/legacy/pcas
+ca/legacy/pcas_DEPEND_DIRS = ca/legacy/gdd
+
+DIRS += ca/legacy/pcas/ex
+# needs ioc for dbStaticHost
+ca/legacy/pcas/ex_DEPEND_DIRS = ca/legacy/pcas libCom ioc
+
+DIRS += ca/client/perl
+ca/client/perl_DEPEND_DIRS = ca/client
+
+# PDB Core
+
+DIRS += ioc
+ioc_DEPEND_DIRS = libCom ca/client
+
+DIRS += ioc/db/test
+ioc/db/test_DEPEND_DIRS = ioc libCom/RTEMS
+
+# PDB Standard Record Definitions
+
+DIRS += std
+std_DEPEND_DIRS = ioc libCom/RTEMS
include $(TOP)/configure/RULES_DIRS
=== removed file 'src/as/Makefile'
--- src/as/Makefile 2010-10-12 16:27:17 +0000
+++ src/as/Makefile 1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-#*************************************************************************
-# 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
-
-INC += asLib.h
-INC += asDbLib.h
-INC += asCa.h
-INC += asTrapWrite.h
-INC += asIocRegister.h
-
-LIB_SRCS += asLib.c
-LIB_SRCS += asTrapWrite.c
-
-asIoc_SRCS += asDbLib.c
-asIoc_SRCS += asCa.c
-asIoc_SRCS += asIocRegister.c
-
-LIBRARY_HOST = asHost
-LIBRARY_IOC = asIoc
-
-asHost_LIBS = dbStaticHost ca Com
-asIoc_LIBS = dbIoc dbStaticIoc ca Com
-
-asHost_RCS = asHost.rc
-asIoc_RCS = asIoc.rc
-
-PROD_HOST = ascheck
-ascheck_SRCS = ascheck.c
-PROD_LIBS = asHost dbStaticHost ca Com
-
-include $(TOP)/configure/RULES
-
-# Extra rule since asLib_lex.c is included by asLib.c
-asLib$(OBJ): asLib_lex.c
-
-clean::
- @$(RM) asLib.c asLib_lex.c
-
=== removed file 'src/bpt/Makefile'
--- src/bpt/Makefile 2010-10-12 16:27:17 +0000
+++ src/bpt/Makefile 1970-01-01 00:00:00 +0000
@@ -1,29 +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 is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution.
-#*************************************************************************
-TOP=../..
-include $(TOP)/configure/CONFIG
-
-INC += cvtTable.h
-
-DBD += menuConvert.dbd
-INC += menuConvert.h
-
-DBD += bptTypeJdegC.dbd
-DBD += bptTypeJdegF.dbd
-DBD += bptTypeKdegC.dbd
-DBD += bptTypeKdegF.dbd
-
-PROD_LIBS = Com
-PROD_HOST += makeBpt
-makeBpt_SRCS=makeBpt
-
-include $(TOP)/configure/RULES
-
-$(COMMON_DBDS): $(TOOLS)/makeBpt$(HOSTEXE)
-
=== added directory 'src/ca'
=== renamed directory 'src/ca' => 'src/ca/client'
=== modified file 'src/ca/client/Makefile'
--- src/ca/Makefile 2010-10-12 16:27:17 +0000
+++ src/ca/client/Makefile 2010-12-20 22:33:53 +0000
@@ -7,7 +7,7 @@
# in file LICENSE that is included with this distribution.
#*************************************************************************
-TOP=../..
+TOP=../../..
include $(TOP)/configure/CONFIG
@@ -95,5 +95,18 @@
casw_SYS_LIBS_solaris = socket
+SCRIPTS_solaris := S99caRepeater
+SCRIPTS_Linux := S99caRepeater
+
+SRC_DIRS += $(TOP)/src/ca/client/test
+PROD_HOST += ca_test
+ca_test_SRCS = ca_test_main.c ca_test.c
+ca_test_LIBS = ca Com
+ca_test_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
+
+OBJS_vxWorks += ca_test
+
include $(TOP)/configure/RULES
+S99%: ../rc2.%
+ sed -e s%:INSTALL_BIN:%`cd $(INSTALL_BIN); pwd`% $< >$@
=== renamed directory 'src/cap5' => 'src/ca/client/perl'
=== modified file 'src/ca/client/perl/Makefile'
--- src/cap5/Makefile 2010-05-25 20:44:38 +0000
+++ src/ca/client/perl/Makefile 2010-12-20 22:33:53 +0000
@@ -5,7 +5,7 @@
# in file LICENSE that is included with this distribution.
#*************************************************************************
-TOP=../..
+TOP=../../../..
include $(TOP)/configure/CONFIG
=== renamed file 'src/util/rc2.caRepeater' => 'src/ca/client/rc2.caRepeater'
=== added directory 'src/ca/client/test'
=== renamed file 'src/util/ca_test.c' => 'src/ca/client/test/ca_test.c'
=== renamed file 'src/util/ca_test.h' => 'src/ca/client/test/ca_test.h'
=== renamed file 'src/util/ca_test_main.c' => 'src/ca/client/test/ca_test_main.c'
=== renamed directory 'src/catools' => 'src/ca/client/tools'
=== modified file 'src/ca/client/tools/Makefile'
--- src/catools/Makefile 2010-10-27 15:30:41 +0000
+++ src/ca/client/tools/Makefile 2010-12-20 22:33:53 +0000
@@ -8,7 +8,7 @@
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#*************************************************************************
-TOP=../..
+TOP=../../../..
include $(TOP)/configure/CONFIG
=== added directory 'src/ca/legacy'
=== renamed directory 'src/gdd' => 'src/ca/legacy/gdd'
=== modified file 'src/ca/legacy/gdd/Makefile'
--- src/gdd/Makefile 2010-10-12 16:27:17 +0000
+++ src/ca/legacy/gdd/Makefile 2010-12-20 22:33:53 +0000
@@ -7,7 +7,7 @@
# in file LICENSE that is included with this distribution.
#*************************************************************************
-TOP=../..
+TOP=../../../..
include $(TOP)/configure/CONFIG
=== renamed directory 'src/cas' => 'src/ca/legacy/pcas'
=== modified file 'src/ca/legacy/pcas/Makefile'
--- src/cas/Makefile 2010-10-12 16:27:17 +0000
+++ src/ca/legacy/pcas/Makefile 2010-12-20 22:33:53 +0000
@@ -7,7 +7,7 @@
# in file LICENSE that is included with this distribution.
#*************************************************************************
-TOP=../..
+TOP=../../../..
include $(TOP)/configure/CONFIG
=== modified file 'src/ca/legacy/pcas/build/Makefile'
--- src/cas/build/Makefile 2010-10-29 17:15:48 +0000
+++ src/ca/legacy/pcas/build/Makefile 2010-12-20 22:33:53 +0000
@@ -7,10 +7,10 @@
# and higher are distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#*************************************************************************
-TOP := ../../..
-CAS := $(TOP)/src/cas
+TOP := ../../../../..
+CAS := $(TOP)/src/ca/legacy/pcas
SRC := $(CAS)/generic
-CA := $(CAS)/../ca
+CA := $(TOP)/src/ca/client
IOSRC := $(CAS)/io/bsdSocket
STSRC := $(SRC)/st
=== renamed directory 'src/excas' => 'src/ca/legacy/pcas/ex'
=== modified file 'src/ca/legacy/pcas/ex/Makefile'
--- src/excas/Makefile 2010-10-12 16:27:17 +0000
+++ src/ca/legacy/pcas/ex/Makefile 2010-12-20 22:33:53 +0000
@@ -7,13 +7,13 @@
# in file LICENSE that is included with this distribution.
#*************************************************************************
-TOP=../..
+TOP=../../../../..
include $(TOP)/configure/CONFIG
PROD_LIBS += $(EPICS_BASE_HOST_LIBS)
-SRC_DIRS += $(TOP)/src/makeBaseApp/top/caServerApp
+SRC_DIRS += $(TOP)/src/template/base/top/caServerApp
#
# Added ws2_32 winmm user32 for the non-dll build
=== modified file 'src/ca/legacy/pcas/example/Makefile'
--- src/cas/example/Makefile 2003-04-01 19:59:46 +0000
+++ src/ca/legacy/pcas/example/Makefile 2010-12-20 22:33:53 +0000
@@ -8,7 +8,7 @@
# in file LICENSE that is included with this distribution.
#*************************************************************************
-TOP=../../..
+TOP=../../../../..
include $(TOP)/configure/CONFIG
=== modified file 'src/ca/legacy/pcas/example/directoryService/Makefile'
--- src/cas/example/directoryService/Makefile 2008-06-11 20:50:17 +0000
+++ src/ca/legacy/pcas/example/directoryService/Makefile 2010-12-20 22:33:53 +0000
@@ -8,7 +8,7 @@
# in file LICENSE that is included with this distribution.
#*************************************************************************
-TOP=../../../..
+TOP=../../../../../..
include $(TOP)/configure/CONFIG
=== removed file 'src/db/Makefile'
--- src/db/Makefile 2010-10-12 16:27:17 +0000
+++ src/db/Makefile 1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-#*************************************************************************
-# 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
-
-# includes to install from this sub-project
-#
-INC += callback.h
-INC += dbAccess.h
-INC += dbAccessDefs.h
-INC += dbCa.h
-INC += dbAddr.h
-INC += dbBkpt.h
-INC += dbConvert.h
-INC += dbConvertFast.h
-INC += dbEvent.h
-INC += dbLock.h
-INC += dbNotify.h
-INC += dbScan.h
-INC += dbTest.h
-INC += dbCaTest.h
-INC += db_test.h
-INC += db_field_log.h
-INC += initHooks.h
-INC += recGbl.h
-INC += dbIocRegister.h
-# The following go away what old database access goes away
-INC += db_access_routines.h
-INC += db_convert.h
-
-DBDINC += menuAlarmSevr
-DBDINC += menuAlarmStat
-DBDINC += menuCompress
-DBDINC += menuFtype
-DBDINC += menuIvoa
-DBDINC += menuOmsl
-DBDINC += menuPini
-DBDINC += menuPriority
-DBDINC += menuScan
-DBDINC += menuYesNo
-DBDINC += menuSimm
-
-DBDINC += dbCommon
-DBD+= menuGlobal.dbd
-
-LIB_SRCS += dbLock.c
-LIB_SRCS += dbAccess.c
-LIB_SRCS += dbBkpt.c
-LIB_SRCS += dbConvert.c
-LIB_SRCS += dbFastLinkConv.c
-LIB_SRCS += dbNotify.c
-LIB_SRCS += dbScan.c
-LIB_SRCS += dbEvent.c
-LIB_SRCS += dbTest.c
-LIB_SRCS += db_access.c
-LIB_SRCS += db_test.c
-LIB_SRCS += recGbl.c
-LIB_SRCS += callback.c
-LIB_SRCS += dbCa.c
-LIB_SRCS += dbCaTest.c
-LIB_SRCS += initHooks.c
-LIB_SRCS += cvtBpt.c
-LIB_SRCS += dbContext.cpp
-LIB_SRCS += dbChannelIO.cpp
-LIB_SRCS += dbSubscriptionIO.cpp
-LIB_SRCS += dbPutNotifyBlocker.cpp
-LIB_SRCS += dbContextReadNotifyCache.cpp
-LIB_SRCS += templateInstances.cpp
-LIB_SRCS += dbIocRegister.c
-
-LIBRARY_IOC = dbIoc
-dbIoc_LIBS = dbStaticIoc ca Com
-
-dbIoc_RCS = dbIoc.rc
-
-include $(TOP)/configure/RULES
-
-dbCommon.h$(DEP): ../dbCommonRecord.dbd ../dbCommon.dbd
- @$(RM) $@
- @-$(MKMF) -m $@ .. $(COMMON_DIR)/dbCommon.h $<
-
-$(COMMON_DIR)/dbCommon.h: ../dbCommonRecord.dbd ../dbCommon.dbd
- $(RM) $@
- $(DBTORECORDTYPEH) -I .. $< $@
-
=== removed file 'src/dbStatic/Makefile'
--- src/dbStatic/Makefile 2010-10-12 16:27:17 +0000
+++ src/dbStatic/Makefile 1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-#*************************************************************************
-# 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
-
-INC += alarm.h
-INC += alarmString.h
-INC += dbBase.h
-INC += dbFldTypes.h
-INC += dbStaticLib.h
-INC += dbStaticPvt.h
-INC += link.h
-INC += special.h
-INC += guigroup.h
-INC += devSup.h
-INC += drvSup.h
-INC += recSup.h
-INC += dbStaticIocRegister.h
-
-LIBSRCS += dbStaticLib.c
-LIBSRCS += dbYacc.c
-LIBSRCS += dbPvdLib.c
-
-dbStaticHost_SRCS += dbStaticNoRun.c
-dbStaticIoc_SRCS += dbStaticRun.c
-dbStaticIoc_SRCS += dbStaticIocRegister.c
-
-LIBRARY_HOST += dbStaticHost
-LIBRARY_IOC += dbStaticIoc
-
-dbStaticHost_LIBS = Com
-dbStaticIoc_LIBS = Com
-
-dbStaticHost_RCS = dbStaticHost.rc
-dbStaticIoc_RCS = dbStaticIoc.rc
-
-PROD_LIBS := dbStaticHost Com
-PROD_HOST = dbReadTest dbExpand dbToMenuH dbToRecordtypeH
-
-dbReadTest_SRCS = dbReadTest.c
-dbExpand_SRCS = dbExpand.c
-dbToMenuH_SRCS = dbToMenuH.c
-dbToRecordtypeH_SRCS = dbToRecordtypeH.c
-
-include $(TOP)/configure/RULES
-
-# Extra rule since dbLexRoutines.c is included in dbYacc.c
-dbYacc.c: dbLex.c ../dbLexRoutines.c
-
-clean::
- @$(RM) dbLex.c dbYacc.c
=== removed file 'src/dbtools/Makefile'
--- src/dbtools/Makefile 2010-10-12 16:27:17 +0000
+++ src/dbtools/Makefile 1970-01-01 00:00:00 +0000
@@ -1,37 +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 is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution.
-#*************************************************************************
-TOP=../..
-
-include $(TOP)/configure/CONFIG
-
-INC += dbLoadTemplate.h
-INC += dbtoolsIocRegister.h
-
-LIB_SRCS += dbLoadTemplate.c
-LIB_SRCS += dbtoolsIocRegister.c
-
-LIBRARY_IOC = dbtoolsIoc
-
-dbtoolsIoc_LIBS = dbIoc dbStaticIoc Com
-
-dbtoolsIoc_RCS = dbtoolsIoc.rc
-
-HTMLS += dbLoadTemplate.html
-
-include $(TOP)/configure/RULES
-
-#
-# These lex sources are included in some C sources,
-# so they have to be created in time:
-#
-dbLoadTemplate.c: dbLoadTemplate_lex.c ../dbLoadTemplate.h
-
-clean::
- @$(RM) dbLoadTemplate_lex.c dbLoadTemplate.c
-
=== removed directory 'src/dev'
=== removed file 'src/dev/Makefile'
--- src/dev/Makefile 2010-10-12 16:27:17 +0000
+++ src/dev/Makefile 1970-01-01 00:00:00 +0000
@@ -1,18 +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 is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution.
-#*************************************************************************
-
-TOP=../..
-
-include $(TOP)/configure/CONFIG
-
-DIRS += softDev
-DIRS += testDev
-
-include $(TOP)/configure/RULES_DIRS
-
=== removed file 'src/dev/softDev/Makefile'
--- src/dev/softDev/Makefile 2010-10-12 16:27:17 +0000
+++ src/dev/softDev/Makefile 1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-#*************************************************************************
-# Copyright (c) 2006 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
-
-DBD += devSoft.dbd
-
-LIBSRCS += devAaiSoft.c
-LIBSRCS += devAaoSoft.c
-LIBSRCS += devAiSoft.c
-LIBSRCS += devAiSoftRaw.c
-LIBSRCS += devAoSoft.c
-LIBSRCS += devAoSoftRaw.c
-LIBSRCS += devBiSoft.c
-LIBSRCS += devBiSoftRaw.c
-LIBSRCS += devBoSoft.c
-LIBSRCS += devBoSoftRaw.c
-LIBSRCS += devCalcoutSoft.c
-LIBSRCS += devEventSoft.c
-LIBSRCS += devHistogramSoft.c
-LIBSRCS += devLiSoft.c
-LIBSRCS += devLoSoft.c
-LIBSRCS += devMbbiDirectSoft.c
-LIBSRCS += devMbbiDirectSoftRaw.c
-LIBSRCS += devMbbiSoft.c
-LIBSRCS += devMbbiSoftRaw.c
-LIBSRCS += devMbboDirectSoft.c
-LIBSRCS += devMbboDirectSoftRaw.c
-LIBSRCS += devMbboSoft.c
-LIBSRCS += devMbboSoftRaw.c
-LIBSRCS += devSASoft.c
-LIBSRCS += devSiSoft.c
-LIBSRCS += devSoSoft.c
-LIBSRCS += devWfSoft.c
-LIBSRCS += devGeneralTime.c
-
-LIBSRCS += devAoSoftCallback.c
-LIBSRCS += devBoSoftCallback.c
-LIBSRCS += devCalcoutSoftCallback.c
-LIBSRCS += devLoSoftCallback.c
-LIBSRCS += devMbboSoftCallback.c
-LIBSRCS += devMbboDirectSoftCallback.c
-LIBSRCS += devSoSoftCallback.c
-
-LIBSRCS += devTimestamp.c
-LIBSRCS += devSoStdio.c
-
-LIBRARY_IOC += softDevIoc
-softDevIoc_LIBS += miscIoc recIoc asIoc dbIoc registryIoc dbStaticIoc ca Com
-softDevIoc_RCS = softDevIoc.rc
-
-include $(TOP)/configure/RULES
-
-
=== added directory 'src/ioc'
=== added file 'src/ioc/Makefile'
--- src/ioc/Makefile 1970-01-01 00:00:00 +0000
+++ src/ioc/Makefile 2010-12-20 22:33:53 +0000
@@ -0,0 +1,266 @@
+#*************************************************************************
+# 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
+
+IOCDIR=$(TOP)/src/ioc
+
+# needed to access private headers from libca (eg. net_convert.h)
+USR_INCLUDES = -I../../ca/client
+
+LIBRARY_IOC += dbCore
+dbCore_LIBS += ca Com
+dbCore_SYS_LIBS_WIN32 += ws2_32
+
+dbCore_RCS += dbStaticIoc.rc
+dbCore_RCS += registryIoc.rc
+dbCore_RCS += dbIoc.rc
+dbCore_RCS += asIoc.rc
+dbCore_RCS += dbtoolsIoc.rc
+dbCore_RCS += rsrvIoc.rc
+dbCore_RCS += miscIoc.rc
+
+SRC_DIRS += $(IOCDIR)/dbStatic
+INC += dbBase.h
+INC += dbFldTypes.h
+INC += dbStaticLib.h
+INC += dbStaticPvt.h
+INC += link.h
+INC += special.h
+INC += guigroup.h
+INC += devSup.h
+INC += drvSup.h
+INC += recSup.h
+INC += dbStaticIocRegister.h
+
+STATIC_SRCS += dbStaticLib.c
+STATIC_SRCS += dbYacc.c
+STATIC_SRCS += dbPvdLib.c
+
+dbCore_SRCS += $(STATIC_SRCS)
+dbCore_SRCS += dbStaticRun.c
+dbCore_SRCS += dbStaticIocRegister.c
+
+LIBRARY_HOST += dbStaticHost
+dbStaticHost_SRCS += dbStaticNoRun.c $(STATIC_SRCS)
+dbStaticHost_LIBS += Com
+
+dbStaticHost_RCS = dbStaticHost.rc
+
+PROD_HOST += dbReadTest dbExpand dbToMenuH dbToRecordtypeH
+
+# Include dbStaticHost objects directly in executables
+# because of a Circular dependency induced by a rule
+# $(INSTALL_LIBS): $(INSTALL_SHRLIBS)
+# in RULES_BUILD
+dbReadTest_SRCS = dbReadTest.c $(dbStaticHost_SRCS)
+dbReadTest_LIBS += Com
+dbExpand_SRCS = dbExpand.c $(dbStaticHost_SRCS)
+dbExpand_LIBS += Com
+dbToMenuH_SRCS = dbToMenuH.c $(dbStaticHost_SRCS)
+dbToMenuH_LIBS += Com
+dbToRecordtypeH_SRCS = dbToRecordtypeH.c $(dbStaticHost_SRCS)
+dbToRecordtypeH_LIBS += Com
+
+
+
+SRC_DIRS += $(IOCDIR)/registry
+INC += registryRecordType.h
+INC += registryDeviceSupport.h
+INC += registryDriverSupport.h
+INC += registryFunction.h
+INC += registryCommon.h
+INC += registryIocRegister.h
+
+SCRIPTS_HOST += registry/registerRecordDeviceDriver.pl
+
+dbCore_SRCS += registryRecordType.c
+dbCore_SRCS += registryDeviceSupport.c
+dbCore_SRCS += registryDriverSupport.c
+dbCore_SRCS += registryFunction.c
+dbCore_SRCS += registryCommon.c
+dbCore_SRCS += registryIocRegister.c
+
+
+SRC_DIRS += $(IOCDIR)/bpt
+INC += cvtTable.h
+
+DBD += menuConvert.dbd
+INC += menuConvert.h
+
+BPT_DBD += bptTypeJdegC.dbd
+BPT_DBD += bptTypeJdegF.dbd
+BPT_DBD += bptTypeKdegC.dbd
+BPT_DBD += bptTypeKdegF.dbd
+DBD += $(BPT_DBD)
+
+PROD_HOST += makeBpt
+makeBpt_SRCS=makeBpt
+makeBpt_LIB+=Com
+
+
+SRC_DIRS += $(IOCDIR)/db
+INC += callback.h
+INC += dbAccess.h
+INC += dbAccessDefs.h
+INC += dbCa.h
+INC += dbAddr.h
+INC += dbBkpt.h
+INC += dbConvert.h
+INC += dbConvertFast.h
+INC += dbEvent.h
+INC += dbLock.h
+INC += dbNotify.h
+INC += dbScan.h
+INC += dbTest.h
+INC += dbCaTest.h
+INC += db_test.h
+INC += db_field_log.h
+INC += initHooks.h
+INC += recGbl.h
+INC += dbIocRegister.h
+# The following go away when old database access goes away
+INC += db_access_routines.h
+INC += db_convert.h
+
+DBDINC += menuAlarmSevr
+DBDINC += menuAlarmStat
+DBDINC += menuCompress
+DBDINC += menuFtype
+DBDINC += menuIvoa
+DBDINC += menuOmsl
+DBDINC += menuPini
+DBDINC += menuPriority
+DBDINC += menuScan
+DBDINC += menuYesNo
+DBDINC += menuSimm
+
+DBDINC += dbCommon
+DBD+= menuGlobal.dbd
+
+dbCore_SRCS += dbLock.c
+dbCore_SRCS += dbAccess.c
+dbCore_SRCS += dbBkpt.c
+dbCore_SRCS += dbConvert.c
+dbCore_SRCS += dbFastLinkConv.c
+dbCore_SRCS += dbNotify.c
+dbCore_SRCS += dbScan.c
+dbCore_SRCS += dbEvent.c
+dbCore_SRCS += dbTest.c
+dbCore_SRCS += db_access.c
+dbCore_SRCS += db_test.c
+dbCore_SRCS += recGbl.c
+dbCore_SRCS += callback.c
+dbCore_SRCS += dbCa.c
+dbCore_SRCS += dbCaTest.c
+dbCore_SRCS += initHooks.c
+dbCore_SRCS += cvtBpt.c
+dbCore_SRCS += dbContext.cpp
+dbCore_SRCS += dbChannelIO.cpp
+dbCore_SRCS += dbSubscriptionIO.cpp
+dbCore_SRCS += dbPutNotifyBlocker.cpp
+dbCore_SRCS += dbContextReadNotifyCache.cpp
+dbCore_SRCS += templateInstances.cpp
+dbCore_SRCS += dbIocRegister.c
+
+
+SRC_DIRS += $(IOCDIR)/as
+INC += asDbLib.h
+INC += asCa.h
+INC += asIocRegister.h
+
+dbCore_SRCS += asDbLib.c
+dbCore_SRCS += asCa.c
+dbCore_SRCS += asIocRegister.c
+
+PROD_HOST += ascheck
+ascheck_SRCS = ascheck.c
+ascheck_LIBS = dbStaticHost Com
+
+
+SRC_DIRS += $(IOCDIR)/dbtemplate
+INC += dbLoadTemplate.h
+INC += dbtoolsIocRegister.h
+
+dbCore_SRCS += dbLoadTemplate.c
+dbCore_SRCS += dbtoolsIocRegister.c
+
+HTMLS += dbtemplate/dbLoadTemplate.html
+
+
+SRC_DIRS += $(IOCDIR)/rsrv
+
+INC += rsrv.h
+INC += rsrvIocRegister.h
+
+dbCore_SRCS += caserverio.c
+dbCore_SRCS += caservertask.c
+dbCore_SRCS += camsgtask.c
+dbCore_SRCS += camessage.c
+dbCore_SRCS += cast_server.c
+dbCore_SRCS += online_notify.c
+dbCore_SRCS += rsrvIocRegister.c
+
+
+SRC_DIRS += $(IOCDIR)/misc
+DBD += system.dbd
+DBD += dlload.dbd
+
+INC += epicsRelease.h
+INC += iocInit.h
+INC += miscIocRegister.h
+INC += iocshRegisterCommon.h
+
+dbCore_SRCS += epicsRelease.c
+dbCore_SRCS += iocInit.c
+dbCore_SRCS += miscIocRegister.c
+dbCore_SRCS += dlload.c
+dbCore_SRCS += iocshRegisterCommon.c
+
+include $(TOP)/configure/RULES
+
+# rules for dbStatic
+
+# Extra rule since dbLexRoutines.c is included in dbYacc.c
+dbYacc.c: dbLex.c $(IOCDIR)/dbStatic/dbLexRoutines.c
+
+# rules for bpt
+
+$(patsubst %,$(COMMON_DIR)/%,$(BPT_DBD)) : \
+$(COMMON_DIR)/bpt%.dbd : $(call PATH_FILTER, $(TOOLS)/makeBpt$(HOSTEXE))
+
+# rules for db
+
+$(filter-out $(STATIC_SRCS),$(dbCore_SRCS)) : $(COMMON_DIR)/dbCommon.h
+
+dbCommon.h$(DEP): $(IOCDIR)/db/dbCommonRecord.dbd $(IOCDIR)/db/dbCommon.dbd
+ @$(RM) $@
+ @-$(MKMF) -m $@ ../db $(COMMON_DIR)/dbCommon.h $<
+
+$(COMMON_DIR)/dbCommon.h: $(IOCDIR)/db/dbCommonRecord.dbd $(IOCDIR)/db/dbCommon.dbd
+ $(RM) $@
+ $(DBTORECORDTYPEH) -I ../db $< $@
+
+$(COMMON_DIR)/dbCommon.h: $(DBTORECORDTYPEH)
+
+$(patsubst %,$(COMMON_DIR)/%.h,$(DBDINC) menuConvert menuGlobal) : \
+$(COMMON_DIR)/%.h : $(DBTOMENUH)
+
+# rules for dbtemplate
+#
+# These lex sources are included in some C sources,
+# so they have to be created in time:
+#
+dbLoadTemplate.c: dbLoadTemplate_lex.c ../dbtemplate/dbLoadTemplate.h
+
+
+clean::
+ @$(RM) dbLex.c dbYacc.c
+ @$(RM) dbLoadTemplate_lex.c dbLoadTemplate.c
=== renamed directory 'src/as' => 'src/ioc/as'
=== renamed directory 'src/bpt' => 'src/ioc/bpt'
=== renamed directory 'src/db' => 'src/ioc/db'
=== modified file 'src/ioc/db/test/Makefile'
--- src/db/test/Makefile 2010-09-29 21:00:46 +0000
+++ src/ioc/db/test/Makefile 2010-12-20 22:33:53 +0000
@@ -6,11 +6,11 @@
# EPICS BASE is distributed subject to a Software License Agreement found
# in the file LICENSE that is included with this distribution.
#*************************************************************************
-TOP=../../..
+TOP=../../../..
include $(TOP)/configure/CONFIG
-callbackTest_LIBS = dbIoc
+callbackTest_LIBS = dbCore
callbackTest_LIBS_DEFAULT = dbStaticHost
callbackTest_LIBS_vxWorks = dbStaticIoc
callbackTest_LIBS_RTEMS = dbStaticIoc
=== renamed directory 'src/dbStatic' => 'src/ioc/dbStatic'
=== renamed directory 'src/dbtools' => 'src/ioc/dbtemplate'
=== renamed directory 'src/misc' => 'src/ioc/misc'
=== renamed directory 'src/registry' => 'src/ioc/registry'
=== renamed directory 'src/rsrv' => 'src/ioc/rsrv'
=== modified file 'src/libCom/Makefile'
--- src/libCom/Makefile 2010-10-12 16:27:17 +0000
+++ src/libCom/Makefile 2010-12-20 22:33:53 +0000
@@ -19,28 +19,31 @@
THREAD_CPPFLAGS_NO += -DDONT_USE_POSIX_THREAD_PRIORITY_SCHEDULING
osdThread_CPPFLAGS += $(THREAD_CPPFLAGS_$(USE_POSIX_THREAD_PRIORITY_SCHEDULING))
+# for building e_flex
+SKELETON_FILE = include/flex.skel.static
+
#epicsVersion is created by this Makefile
INC += epicsVersion.h
SRC_DIRS += $(LIBCOM)/bucketLib
INC += bucketLib.h
-SRCS += bucketLib.c
+Com_SRCS += bucketLib.c
SRC_DIRS += $(LIBCOM)/ring
#following needed for locating epicsRingPointer.h and epicsRingBytes.h
INC += epicsRingPointer.h
INC += epicsRingBytes.h
-SRCS += epicsRingPointer.cpp
-SRCS += epicsRingBytes.c
+Com_SRCS += epicsRingPointer.cpp
+Com_SRCS += epicsRingBytes.c
SRC_DIRS += $(LIBCOM)/calc
INC += postfix.h
-SRCS += postfix.c
-SRCS += calcPerform.c
+Com_SRCS += postfix.c
+Com_SRCS += calcPerform.c
SRC_DIRS += $(LIBCOM)/cvtFast
INC += cvtFast.h
-SRCS += cvtFast.c
+Com_SRCS += cvtFast.c
# From cppStd
SRC_DIRS += $(LIBCOM)/cppStd
@@ -59,22 +62,22 @@
INC += epicsSingleton.h
INC += epicsGuard.h
INC += epicsOnce.h
-SRCS += resourceLib.cpp
-SRCS += epicsOnce.cpp
-SRCS += epicsSingletonMutex.cpp
+Com_SRCS += resourceLib.cpp
+Com_SRCS += epicsOnce.cpp
+Com_SRCS += epicsSingletonMutex.cpp
SRC_DIRS += $(LIBCOM)/dbmf
INC += dbmf.h
-SRCS += dbmf.c
+Com_SRCS += dbmf.c
SRC_DIRS += $(LIBCOM)/ellLib
INC += ellLib.h
-SRCS += ellLib.c
+Com_SRCS += ellLib.c
SRC_DIRS += $(LIBCOM)/env
INC += envDefs.h
-SRCS += envSubr.c
-SRCS += envData.c
+Com_SRCS += envSubr.c
+Com_SRCS += envData.c
SRC_DIRS += $(LIBCOM)/error
INC += epicsPrint.h
@@ -82,47 +85,60 @@
INC += errSymTbl.h
INC += errlog.h
INC += error.h
-SRCS += errlog.c
-SRCS += errSymLib.c
-SRCS += errSymTbl.c
+Com_SRCS += errlog.c
+Com_SRCS += errSymLib.c
+Com_SRCS += errSymTbl.c
SRC_DIRS += $(LIBCOM)/fdmgr
INC += fdManager.h
INC += fdmgr.h
-SRCS += fdmgr.cpp
-SRCS += fdManager.cpp
+Com_SRCS += fdmgr.cpp
+Com_SRCS += fdManager.cpp
SRC_DIRS += $(LIBCOM)/freeList
INC += freeList.h
-SRCS += freeListLib.c
+Com_SRCS += freeListLib.c
HTMLS += freeList/freeList.html
SRC_DIRS += $(LIBCOM)/gpHash
INC += gpHash.h
-SRCS += gpHashLib.c
+Com_SRCS += gpHashLib.c
HTMLS += gpHash/gpHash.html
SRC_DIRS += $(LIBCOM)/iocsh
INC += iocsh.h
INC += registry.h
INC += libComRegister.h
-SRCS += iocsh.cpp
-SRCS += registry.c
-SRCS += libComRegister.c
+Com_SRCS += iocsh.cpp
+Com_SRCS += registry.c
+Com_SRCS += libComRegister.c
-SRC_DIRS += $(LIBCOM)/logClient
+SRC_DIRS += $(LIBCOM)/log
INC += iocLog.h
INC += logClient.h
-SRCS += iocLog.c
-SRCS += logClient.c
+Com_SRCS += iocLog.c
+Com_SRCS += logClient.c
+
+PROD_HOST += iocLogServer
+
+iocLogServer_SYS_LIBS_solaris += socket
+iocLogServer_SYS_LIBS_WIN32 += user32
+
+iocLogServer_SRCS = iocLogServer.c
+iocLogServer_LIBS = Com
+
+SCRIPTS_solaris := S99logServer
+SCRIPTS_Linux := S99logServer
SRC_DIRS += $(LIBCOM)/macLib
INC += macLib.h
-SRCS += macCore.c
-SRCS += macEnv.c
-SRCS += macUtil.c
+Com_SRCS += macCore.c
+Com_SRCS += macEnv.c
+Com_SRCS += macUtil.c
SRC_DIRS += $(LIBCOM)/misc
+INC += alarm.h
+INC += alarmString.h
INC += adjustment.h
INC += cantProceed.h
INC += dbDefs.h
@@ -139,16 +155,16 @@
INC += compilerDependencies.h
INC += epicsUnitTest.h
INC += testMain.h
-SRCS += aToIPAddr.c
-SRCS += adjustment.c
-SRCS += cantProceed.c
-SRCS += epicsConvert.c
-SRCS += epicsExit.c
-SRCS += epicsStdlib.c
-SRCS += epicsString.c
-SRCS += truncateFile.c
-SRCS += ipAddrToAsciiAsynchronous.cpp
-SRCS += epicsUnitTest.c
+Com_SRCS += aToIPAddr.c
+Com_SRCS += adjustment.c
+Com_SRCS += cantProceed.c
+Com_SRCS += epicsConvert.c
+Com_SRCS += epicsExit.c
+Com_SRCS += epicsStdlib.c
+Com_SRCS += epicsString.c
+Com_SRCS += truncateFile.c
+Com_SRCS += ipAddrToAsciiAsynchronous.cpp
+Com_SRCS += epicsUnitTest.c
# From osi
SRC_DIRS += $(LIBCOM)/osi
@@ -196,87 +212,126 @@
INC += devLibVMEImpl.h
INC += osdVME.h
-SRCS += epicsThread.cpp
-SRCS += epicsMutex.cpp
-SRCS += epicsEvent.cpp
-SRCS += epicsTime.cpp
-SRCS += epicsMessageQueue.cpp
-SRCS += epicsMath.cpp
-
-SRCS += epicsGeneralTime.c
-SRCS += osiClockTime.c
-
-SRCS += osdSock.c
-SRCS += osdSockAddrReuse.cpp
-SRCS += osiSock.c
-SRCS += systemCallIntMech.cpp
-SRCS += epicsSocketConvertErrnoToString.cpp
-SRCS += osdAssert.c
-SRCS += osdFindSymbol.c
-SRCS += osdInterrupt.c
-SRCS += osdPoolStatus.c
-SRCS += osdSignal.cpp
-SRCS += osdEnv.c
-SRCS += epicsReadline.c
-SRCS += epicsTempFile.cpp
-SRCS += epicsStdio.c
-SRCS += osdStdio.c
+Com_SRCS += epicsThread.cpp
+Com_SRCS += epicsMutex.cpp
+Com_SRCS += epicsEvent.cpp
+Com_SRCS += epicsTime.cpp
+Com_SRCS += epicsMessageQueue.cpp
+Com_SRCS += epicsMath.cpp
+
+Com_SRCS += epicsGeneralTime.c
+Com_SRCS += osiClockTime.c
+
+Com_SRCS += osdSock.c
+Com_SRCS += osdSockAddrReuse.cpp
+Com_SRCS += osiSock.c
+Com_SRCS += systemCallIntMech.cpp
+Com_SRCS += epicsSocketConvertErrnoToString.cpp
+Com_SRCS += osdAssert.c
+Com_SRCS += osdFindSymbol.c
+Com_SRCS += osdInterrupt.c
+Com_SRCS += osdPoolStatus.c
+Com_SRCS += osdSignal.cpp
+Com_SRCS += osdEnv.c
+Com_SRCS += epicsReadline.c
+Com_SRCS += epicsTempFile.cpp
+Com_SRCS += epicsStdio.c
+Com_SRCS += osdStdio.c
osdEnv_CFLAGS_WIN32= -U__STDC__
-SRCS += osdThread.c
-SRCS += osdMutex.c
-SRCS += osdEvent.c
-SRCS += osdTime.cpp
-SRCS += osdProcess.c
-SRCS += osdNetIntf.c
-SRCS += osdMessageQueue.c
-
-SRCS += devLibVME.c
-SRCS += devLibVMEOSD.c
+Com_SRCS += osdThread.c
+Com_SRCS += osdMutex.c
+Com_SRCS += osdEvent.c
+Com_SRCS += osdTime.cpp
+Com_SRCS += osdProcess.c
+Com_SRCS += osdNetIntf.c
+Com_SRCS += osdMessageQueue.c
+
+Com_SRCS += devLibVME.c
+Com_SRCS += devLibVMEOSD.c
+
+SRC_DIRS += $(LIBCOM)/tools/antelope
+PROD_HOST += antelope
+antelope_SRCS += closure.c
+antelope_SRCS += error.c
+antelope_SRCS += lalr.c
+antelope_SRCS += lr0.c
+antelope_SRCS += main.c
+antelope_SRCS += mkpar.c
+antelope_SRCS += output.c
+antelope_SRCS += reader.c
+antelope_SRCS += skeleton.c
+antelope_SRCS += symtab.c
+antelope_SRCS += verbose.c
+antelope_SRCS += warshall.c
+antelope_OBJS += epicsTempFile$(OBJ)
+
+SRC_DIRS += $(LIBCOM)/tools/flex
+INC += flex.skel.static
+PROD_HOST += e_flex
+parse_YACCOPT = -l -d
+# main.c is included in parse.c
+parse_CPPFLAGS = -DDEFAULT_SKELETON_FILE=$(SKELETON_FILE)
+e_flex_SRCS += ccl.c
+e_flex_SRCS += dfa.c
+e_flex_SRCS += ecs.c
+e_flex_SRCS += gen.c
+e_flex_SRCS += misc.c
+e_flex_SRCS += nfa.c
+e_flex_SRCS += sym.c
+e_flex_SRCS += tblcmp.c
+e_flex_SRCS += parse.c
+e_flex_OBJS += epicsTempFile$(OBJ)
+
+SRC_DIRS += $(LIBCOM)/as
+INC += asLib.h
+INC += asTrapWrite.h
+Com_SRCS += asLib.c
+Com_SRCS += asTrapWrite.c
SRC_DIRS += $(LIBCOM)/taskwd
INC += taskwd.h
-SRCS += taskwd.c
+Com_SRCS += taskwd.c
SRC_DIRS += $(LIBCOM)/timer
INC += epicsTimer.h
-SRCS += epicsTimer.cpp
-SRCS += timer.cpp
-SRCS += timerQueue.cpp
-SRCS += timerQueueActive.cpp
-SRCS += timerQueueActiveMgr.cpp
-SRCS += timerQueuePassive.cpp
+Com_SRCS += epicsTimer.cpp
+Com_SRCS += timer.cpp
+Com_SRCS += timerQueue.cpp
+Com_SRCS += timerQueueActive.cpp
+Com_SRCS += timerQueueActiveMgr.cpp
+Com_SRCS += timerQueuePassive.cpp
#tsDefs contains R3.13 compatibility tsStamp code
SRC_DIRS += $(LIBCOM)/tsDefs
INC += tsDefs.h
-SRCS += tsDefs.c
+Com_SRCS += tsDefs.c
# Time providers, in osi
-SRCS_vxWorks += osiNTPTime.c
-SRCS_RTEMS += osiNTPTime.c
+Com_SRCS_vxWorks += osiNTPTime.c
+Com_SRCS_RTEMS += osiNTPTime.c
# These files are in osi/os/vxWorks
# Special reboot hook
-SRCS_vxWorks += atReboot.cpp
+Com_SRCS_vxWorks += atReboot.cpp
# For old vxWorks applications
INC_vxWorks += camacLib.h
INC_vxWorks += epicsDynLink.h
INC_vxWorks += module_types.h
INC_vxWorks += task_params.h
-SRCS_vxWorks += epicsDynLink.c
-SRCS_vxWorks += veclist.c
-SRCS_vxWorks += logMsgToErrlog.cpp
+Com_SRCS_vxWorks += epicsDynLink.c
+Com_SRCS_vxWorks += veclist.c
+Com_SRCS_vxWorks += logMsgToErrlog.cpp
#This forces the vxWorks compatibility stuff to be loaded
OBJS_vxWorks = vxComLibrary
# These files are in osi/os/WIN32
-SRCS_WIN32 += epicsGetopt.c
-SRCS_WIN32 += setThreadName.cpp
+Com_SRCS_WIN32 += epicsGetopt.c
+Com_SRCS_WIN32 += setThreadName.cpp
#SRCS_WIN32 += dllmain.cpp
-SRCS_WIN32 += forceBadAllocException.cpp
+Com_SRCS_WIN32 += forceBadAllocException.cpp
# Library to build:
# lib$(LIBRARY).a or ..dll/..exp/..lib
@@ -285,24 +340,23 @@
Com_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
-Com_RCS = Com.rc
+Com_RCS = Com.rc asHost.rc
# libs needed for PROD and TESTPRODUCT
-PROD_LIBS = Com
PROD_SYS_LIBS_WIN32 = ws2_32 advapi32
# for bldErrSymTbl:
#
ERR_S_FILES += $(TOP)/src/libCom/osi/devLib.h
-ERR_S_FILES += $(TOP)/src/as/asLib.h
-ERR_S_FILES += $(TOP)/src/db/dbAccessDefs.h
-ERR_S_FILES += $(TOP)/src/dbStatic/devSup.h
-ERR_S_FILES += $(TOP)/src/dbStatic/drvSup.h
-ERR_S_FILES += $(TOP)/src/dbStatic/recSup.h
-ERR_S_FILES += $(TOP)/src/dbStatic/dbStaticLib.h
+ERR_S_FILES += $(TOP)/src/libCom/as/asLib.h
+ERR_S_FILES += $(TOP)/src/ioc/db/dbAccessDefs.h
+ERR_S_FILES += $(TOP)/src/ioc/dbStatic/devSup.h
+ERR_S_FILES += $(TOP)/src/ioc/dbStatic/drvSup.h
+ERR_S_FILES += $(TOP)/src/ioc/dbStatic/recSup.h
+ERR_S_FILES += $(TOP)/src/ioc/dbStatic/dbStaticLib.h
ERR_S_FILES += $(LIBCOM)/error/errMdef.h
-ERR_S_FILES += $(TOP)/src/cas/generic/casdef.h
-ERR_S_FILES += $(TOP)/src/gdd/gddAppFuncTable.h
+ERR_S_FILES += $(TOP)/src/ca/legacy/pcas/generic/casdef.h
+ERR_S_FILES += $(TOP)/src/ca/legacy/gdd/gddAppFuncTable.h
include $(TOP)/configure/RULES
@@ -321,6 +375,16 @@
$(COMMON_DIR)/epicsVersion.h: $(CONFIG)/CONFIG_BASE_VERSION $(CONFIG)/CONFIG_SITE
$(PERL) $(LIBCOM)/misc/makeEpicsVersion.pl $(CONFIG)/CONFIG_BASE_VERSION $(@D) $(EPICS_SITE_VERSION)
+S99%: ../log/rc2.%
+ sed -e s%:INSTALL_BIN:%`cd $(INSTALL_BIN); pwd`% $< >$@
+
+# Extra rule since asLib_lex.c is included by asLib.c
+asLib$(OBJ): asLib_lex.c
+
+# ensure that lexer and parser are built before they are needed
+asLib.c parse.c: $(call PATH_FILTER, $(TOOLS)/antelope$(HOSTEXE))
+asLib_lex.c: $(call PATH_FILTER, $(TOOLS)/e_flex$(HOSTEXE))
+
clean::
- @$(RM) errSymTbl.c envData.c
+ @$(RM) errSymTbl.c envData.c asLib.c asLib_lex.c parse.c
=== renamed directory 'src/RTEMS' => 'src/libCom/RTEMS'
=== modified file 'src/libCom/RTEMS/Makefile'
--- src/RTEMS/Makefile 2010-11-17 22:55:22 +0000
+++ src/libCom/RTEMS/Makefile 2010-12-20 22:33:53 +0000
@@ -6,7 +6,7 @@
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#*************************************************************************
-TOP=../..
+TOP=../../..
include $(TOP)/configure/CONFIG
INC += epicsRtemsInitHooks.h
=== added directory 'src/libCom/as'
=== renamed file 'src/as/asHost.rc' => 'src/libCom/as/asHost.rc'
=== renamed file 'src/as/asLib.h' => 'src/libCom/as/asLib.h'
=== renamed file 'src/as/asLib.y' => 'src/libCom/as/asLib.y'
=== renamed file 'src/as/asLibRoutines.c' => 'src/libCom/as/asLibRoutines.c'
=== renamed file 'src/as/asLib_lex.l' => 'src/libCom/as/asLib_lex.l'
=== renamed file 'src/as/asTrapWrite.c' => 'src/libCom/as/asTrapWrite.c'
=== renamed file 'src/as/asTrapWrite.h' => 'src/libCom/as/asTrapWrite.h'
=== renamed directory 'src/libCom/logClient' => 'src/libCom/log'
=== renamed file 'src/util/iocLogServer.c' => 'src/libCom/log/iocLogServer.c'
=== renamed file 'src/util/rc2.logServer' => 'src/libCom/log/rc2.logServer'
=== renamed file 'src/dbStatic/alarm.h' => 'src/libCom/misc/alarm.h'
=== renamed file 'src/dbStatic/alarmString.h' => 'src/libCom/misc/alarmString.h'
=== renamed directory 'src/toolsComm' => 'src/libCom/tools'
=== modified file 'src/libCom/tools/flex/parse.y'
--- src/toolsComm/flex/parse.y 2010-10-05 19:27:37 +0000
+++ src/libCom/tools/flex/parse.y 2010-12-20 22:33:53 +0000
@@ -703,5 +703,5 @@
#include "scan.c"
#include "yylex.c"
-#include "main.c"
+#include "tools/flex/main.c"
=== removed file 'src/misc/Makefile'
--- src/misc/Makefile 2010-10-12 16:27:17 +0000
+++ src/misc/Makefile 1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-#*************************************************************************
-# Copyright (c) 2009 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
-
-DBD += base.dbd
-DBD += system.dbd
-DBD += dlload.dbd
-
-INC += epicsRelease.h
-INC += iocInit.h
-INC += miscIocRegister.h
-INC += iocshRegisterCommon.h
-
-LIB_SRCS += epicsRelease.c
-LIB_SRCS += iocInit.c
-LIB_SRCS += asSubRecordFunctions.c
-LIB_SRCS += miscIocRegister.c
-LIB_SRCS += dlload.c
-LIB_SRCS += iocshRegisterCommon.c
-
-
-LIBRARY_IOC = miscIoc
-
-miscIoc_RCS = miscIoc.rc
-miscIoc_LIBS = rsrvIoc asIoc dbtoolsIoc dbIoc registryIoc dbStaticIoc ca Com
-
-include $(TOP)/configure/RULES
-
=== removed file 'src/rec/Makefile'
--- src/rec/Makefile 2010-10-12 16:27:17 +0000
+++ src/rec/Makefile 1970-01-01 00:00:00 +0000
@@ -1,78 +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 is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution.
-#*************************************************************************
-TOP=../..
-include $(TOP)/configure/CONFIG
-
-DBDINC += aaiRecord
-DBDINC += aaoRecord
-DBDINC += aiRecord
-DBDINC += aoRecord
-DBDINC += aSubRecord
-DBDINC += biRecord
-DBDINC += boRecord
-DBDINC += calcRecord
-DBDINC += calcoutRecord
-DBDINC += compressRecord
-DBDINC += dfanoutRecord
-DBDINC += eventRecord
-DBDINC += fanoutRecord
-DBDINC += histogramRecord
-DBDINC += longinRecord
-DBDINC += longoutRecord
-DBDINC += mbbiRecord
-DBDINC += mbbiDirectRecord
-DBDINC += mbboRecord
-DBDINC += mbboDirectRecord
-DBDINC += permissiveRecord
-DBDINC += selRecord
-DBDINC += seqRecord
-DBDINC += stateRecord
-DBDINC += stringinRecord
-DBDINC += stringoutRecord
-DBDINC += subRecord
-DBDINC += subArrayRecord
-DBDINC += waveformRecord
-
-LIBSRCS += aaiRecord.c
-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
-
-recIoc_LIBS = asIoc dbIoc registryIoc dbStaticIoc ca Com
-recIoc_RCS = recIoc.rc
-
-include $(TOP)/configure/RULES
-
=== removed file 'src/registry/Makefile'
--- src/registry/Makefile 2010-10-12 16:27:17 +0000
+++ src/registry/Makefile 1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-#*************************************************************************
-# 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
-
-INC += registryRecordType.h
-INC += registryDeviceSupport.h
-INC += registryDriverSupport.h
-INC += registryFunction.h
-INC += registryCommon.h
-INC += registryIocRegister.h
-
-SCRIPTS_HOST += registerRecordDeviceDriver.pl
-
-LIB_SRCS += registryRecordType.c
-LIB_SRCS += registryDeviceSupport.c
-LIB_SRCS += registryDriverSupport.c
-LIB_SRCS += registryFunction.c
-LIB_SRCS += registryCommon.c
-LIB_SRCS += registryIocRegister.c
-
-LIBRARY_IOC = registryIoc
-registryIoc_LIBS = dbStaticIoc Com
-
-registryIoc_RCS = registryIoc.rc
-
-include $(TOP)/configure/RULES
-
=== removed file 'src/rsrv/Makefile'
--- src/rsrv/Makefile 2010-10-12 16:27:17 +0000
+++ src/rsrv/Makefile 1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-#*************************************************************************
-# 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
-
-USR_INCLUDES = -I../../ca
-
-INC += rsrv.h
-INC += rsrvIocRegister.h
-
-LIB_SRCS += caserverio.c
-LIB_SRCS += caservertask.c
-LIB_SRCS += camsgtask.c
-LIB_SRCS += camessage.c
-LIB_SRCS += cast_server.c
-LIB_SRCS += online_notify.c
-LIB_SRCS += rsrvIocRegister.c
-
-LIBRARY_IOC = rsrvIoc
-
-rsrvIoc_LIBS = asIoc dbIoc ca Com
-
-rsrvIoc_SYS_LIBS_WIN32 := ws2_32
-rsrvIoc_RCS = rsrvIoc.rc
-
-include $(TOP)/configure/RULES
=== removed file 'src/softIoc/Makefile'
--- src/softIoc/Makefile 2010-10-22 22:02:40 +0000
+++ src/softIoc/Makefile 1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-##########################################################################
-# Copyright (c) 2009 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=../..
-
-include $(TOP)/configure/CONFIG
-
-PROD_IOC = softIoc
-
-DBD += softIoc.dbd
-softIoc_DBD += base.dbd
-softIoc_DBD += dlload.dbd
-softIoc_DBD += system.dbd
-
-softIoc_SRCS += softIoc_registerRecordDeviceDriver.cpp
-softIoc_SRCS_DEFAULT += softMain.cpp
-softIoc_SRCS_vxWorks = -nil-
-
-softIoc_LIBS = $(EPICS_BASE_IOC_LIBS)
-
-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
-
=== added directory 'src/std'
=== added file 'src/std/Makefile'
--- src/std/Makefile 1970-01-01 00:00:00 +0000
+++ src/std/Makefile 2010-12-20 22:33:53 +0000
@@ -0,0 +1,160 @@
+#*************************************************************************
+# 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 += recIoc.rc
+dbRecStd_RCS += softDevIoc.rc
+
+SRC_DIRS += $(STDDIR)/rec
+DBDINC += aaiRecord
+DBDINC += aaoRecord
+DBDINC += aiRecord
+DBDINC += aoRecord
+DBDINC += aSubRecord
+DBDINC += biRecord
+DBDINC += boRecord
+DBDINC += calcRecord
+DBDINC += calcoutRecord
+DBDINC += compressRecord
+DBDINC += dfanoutRecord
+DBDINC += eventRecord
+DBDINC += fanoutRecord
+DBDINC += histogramRecord
+DBDINC += longinRecord
+DBDINC += longoutRecord
+DBDINC += mbbiRecord
+DBDINC += mbbiDirectRecord
+DBDINC += mbboRecord
+DBDINC += mbboDirectRecord
+DBDINC += permissiveRecord
+DBDINC += selRecord
+DBDINC += seqRecord
+DBDINC += stateRecord
+DBDINC += stringinRecord
+DBDINC += stringoutRecord
+DBDINC += subRecord
+DBDINC += subArrayRecord
+DBDINC += waveformRecord
+
+dbRecStd_SRCS += aaiRecord.c
+dbRecStd_SRCS += aaoRecord.c
+dbRecStd_SRCS += aiRecord.c
+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_DIRS += $(STDDIR)/dev
+DBD += devSoft.dbd
+
+dbRecStd_SRCS += devAaiSoft.c
+dbRecStd_SRCS += devAaoSoft.c
+dbRecStd_SRCS += devAiSoft.c
+dbRecStd_SRCS += devAiSoftRaw.c
+dbRecStd_SRCS += devAoSoft.c
+dbRecStd_SRCS += devAoSoftRaw.c
+dbRecStd_SRCS += devBiSoft.c
+dbRecStd_SRCS += devBiSoftRaw.c
+dbRecStd_SRCS += devBoSoft.c
+dbRecStd_SRCS += devBoSoftRaw.c
+dbRecStd_SRCS += devCalcoutSoft.c
+dbRecStd_SRCS += devEventSoft.c
+dbRecStd_SRCS += devHistogramSoft.c
+dbRecStd_SRCS += devLiSoft.c
+dbRecStd_SRCS += devLoSoft.c
+dbRecStd_SRCS += devMbbiDirectSoft.c
+dbRecStd_SRCS += devMbbiDirectSoftRaw.c
+dbRecStd_SRCS += devMbbiSoft.c
+dbRecStd_SRCS += devMbbiSoftRaw.c
+dbRecStd_SRCS += devMbboDirectSoft.c
+dbRecStd_SRCS += devMbboDirectSoftRaw.c
+dbRecStd_SRCS += devMbboSoft.c
+dbRecStd_SRCS += devMbboSoftRaw.c
+dbRecStd_SRCS += devSASoft.c
+dbRecStd_SRCS += devSiSoft.c
+dbRecStd_SRCS += devSoSoft.c
+dbRecStd_SRCS += devWfSoft.c
+dbRecStd_SRCS += devGeneralTime.c
+
+dbRecStd_SRCS += devAoSoftCallback.c
+dbRecStd_SRCS += devBoSoftCallback.c
+dbRecStd_SRCS += devCalcoutSoftCallback.c
+dbRecStd_SRCS += devLoSoftCallback.c
+dbRecStd_SRCS += devMbboSoftCallback.c
+dbRecStd_SRCS += devMbboDirectSoftCallback.c
+dbRecStd_SRCS += devSoSoftCallback.c
+
+dbRecStd_SRCS += devTimestamp.c
+dbRecStd_SRCS += devSoStdio.c
+
+dbRecStd_SRCS += asSubRecordFunctions.c
+
+SRC_DIRS += $(STDDIR)/softIoc
+
+PROD_IOC = softIoc
+
+DBD += softIoc.dbd
+softIoc_DBD += base.dbd
+
+DBD += base.dbd
+
+softIoc_SRCS += softIoc_registerRecordDeviceDriver.cpp
+softIoc_SRCS_DEFAULT += softMain.cpp
+softIoc_SRCS_vxWorks = -nil-
+
+softIoc_LIBS = $(EPICS_BASE_IOC_LIBS)
+
+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) ../softIoc/makeInstallDir.pl '$(FINAL_LOCATION)' > $@
+
+$(COMMON_DIR)/softIoc.dbd : $(patsubst %,%.dbd,$(DBDINC))
+
+clean::
+ @$(RM) epicsInstallDir.h
=== renamed directory 'src/dev/softDev' => 'src/std/dev'
=== renamed file 'src/misc/asSubRecordFunctions.c' => 'src/std/dev/asSubRecordFunctions.c'
=== renamed directory 'src/rec' => 'src/std/rec'
=== renamed directory 'src/softIoc' => 'src/std/softIoc'
=== renamed file 'src/misc/base.dbd' => 'src/std/softIoc/base.dbd'
=== renamed directory 'src/dev/testDev' => 'src/std/test'
=== added directory 'src/template'
=== renamed directory 'src/makeBaseApp' => 'src/template/base'
=== modified file 'src/template/base/Makefile'
--- src/makeBaseApp/Makefile 2008-10-08 22:42:49 +0000
+++ src/template/base/Makefile 2010-12-20 22:33:53 +0000
@@ -1,4 +1,4 @@
-TOP=../..
+TOP=../../..
include $(TOP)/configure/CONFIG
=== renamed directory 'src/makeBaseExt' => 'src/template/ext'
=== modified file 'src/template/ext/Makefile'
--- src/makeBaseExt/Makefile 2006-03-29 17:09:24 +0000
+++ src/template/ext/Makefile 2010-12-20 22:33:53 +0000
@@ -1,4 +1,4 @@
-TOP=../..
+TOP=../../..
include $(TOP)/configure/CONFIG
=== removed file 'src/toolsComm/Makefile'
--- src/toolsComm/Makefile 2010-10-12 16:27:17 +0000
+++ src/toolsComm/Makefile 1970-01-01 00:00:00 +0000
@@ -1,19 +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 is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution.
-#*************************************************************************
-
-TOP=../..
-
-include $(TOP)/configure/CONFIG
-
-DIRS = antelope flex
-
-flex_DEPEND_DIRS += antelope
-
-include $(TOP)/configure/RULES_DIRS
-
=== removed file 'src/toolsComm/antelope/Makefile'
--- src/toolsComm/antelope/Makefile 2009-07-10 22:00:18 +0000
+++ src/toolsComm/antelope/Makefile 1970-01-01 00:00:00 +0000
@@ -1,29 +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 is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution.
-#*************************************************************************
-TOP=../../..
-include $(TOP)/configure/CONFIG
-
-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_HOST = antelope
-PROD_LIBS = Com
-
-include $(TOP)/configure/RULES
-
=== removed file 'src/toolsComm/flex/Makefile'
--- src/toolsComm/flex/Makefile 2009-07-22 20:41:09 +0000
+++ src/toolsComm/flex/Makefile 1970-01-01 00:00:00 +0000
@@ -1,44 +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 is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution.
-#*************************************************************************
-TOP=../../..
-
-include $(TOP)/configure/CONFIG
-
-HOST_WARN=NO
-
-YACC = $(EYACC)
-YACCOPT = -l -d
-
-SKELETON_FILE = include/flex.skel.static
-
-USR_CPPFLAGS = -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_HOST = e_flex
-PROD_LIBS = Com
-
-include $(TOP)/configure/RULES
-
-clean::
- $(RM) parse.c parse.h
-
-# EOF Makefile.Host for base/src/toolsComm/flex
=== removed directory 'src/util'
=== removed file 'src/util/Makefile'
--- src/util/Makefile 2010-10-12 16:27:17 +0000
+++ src/util/Makefile 1970-01-01 00:00:00 +0000
@@ -1,35 +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 is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution.
-#*************************************************************************
-TOP=../..
-
-include $(TOP)/configure/CONFIG
-
-PROD_LIBS = ca Com
-
-#
-# Added winmm user32 for the non-dll build
-#
-PROD_HOST_DEFAULT = ca_test iocLogServer
-PROD_HOST_WIN32 = ca_test iocLogServer
-PROD_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
-
-iocLogServer_SYS_LIBS_solaris = socket
-
-ca_test_SRCS = ca_test_main.c ca_test.c
-iocLogServer_SRCS = iocLogServer.c
-
-OBJS_vxWorks = ca_test
-
-SCRIPTS_solaris := S99logServer S99caRepeater
-SCRIPTS_Linux := S99logServer S99caRepeater
-
-include $(TOP)/configure/RULES
-
-S99%: ../rc2.%
- sed -e s%:INSTALL_BIN:%`cd $(INSTALL_BIN); pwd`% $< >$@
- Replies:
- Re: [Merge] lp:~mdavidsaver/epics-base/reorg-src into lp:epics-base Ernest Williams
- Navigate by Date:
- Prev:
RE: src/ reorganization Jeff Hill
- Next:
RE: src/ reorganization (merge request) Davidsaver, Michael
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
<2010>
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
- Navigate by Thread:
- Prev:
RE: src/ reorganization Jeff Hill
- Next:
Re: [Merge] lp:~mdavidsaver/epics-base/reorg-src into lp:epics-base Ernest Williams
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
<2010>
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
|
·
Home
·
News
·
About
·
Base
·
Modules
·
Extensions
·
Distributions
·
Download
·