Fold antelope/flex and asHost into libCom

Build lexer and parser from libCom/Makefile.
Since libCom now includes asLib.c and asLib_lex.c we must build
antelope and flex without linking them to Com.  This works because
they only need epicsTempFile anyway.  However make doesn't like a
subdirectory with the same name as a target object, so the antelope
source directory is now called yacc.  The two main.c files were also
renamed to avoid other build problems.

Merge asHost into Com and remove mentions in CONFIG_BASE

Lots of noise since SRCS must be renamed to Com_SRCS
This commit is contained in:
Michael Davidsaver
2011-02-25 15:39:44 -06:00
committed by Andrew Johnson
parent 588ea50bfb
commit f7fc564556
75 changed files with 182 additions and 222 deletions

View File

@@ -22,13 +22,13 @@ endif
# Epics base Ioc libraries
EPICS_BASE_IOC_LIBS += recIoc softDevIoc
EPICS_BASE_IOC_LIBS += miscIoc rsrvIoc dbtoolsIoc asIoc asHost
EPICS_BASE_IOC_LIBS += miscIoc rsrvIoc dbtoolsIoc asIoc
EPICS_BASE_IOC_LIBS += dbIoc registryIoc dbStaticIoc ca Com
#---------------------------------------------------------------
# Epics base Host libraries
EPICS_BASE_HOST_LIBS += cas gdd asHost dbStaticHost registryIoc
EPICS_BASE_HOST_LIBS += cas gdd dbStaticHost registryIoc
EPICS_BASE_HOST_LIBS += ca Com
#---------------------------------------------------------------

View File

@@ -26,12 +26,6 @@ template/ext_DEPEND_DIRS = tools
DIRS += libCom
libCom_DEPEND_DIRS = tools
DIRS += libCom/tools
libCom/tools_DEPEND_DIRS = libCom
DIRS += libCom/as
libCom/as_DEPEND_DIRS = libCom libCom/tools
DIRS += libCom/RTEMS
libCom/RTEMS_DEPEND_DIRS = libCom
@@ -61,7 +55,7 @@ ca/client/perl_DEPEND_DIRS = ca/client
# PDB Core
DIRS += ioc/dbStatic
ioc/dbStatic_DEPEND_DIRS = libCom/tools
ioc/dbStatic_DEPEND_DIRS = libCom
DIRS += ioc/registry
ioc/registry_DEPEND_DIRS = ioc/dbStatic
@@ -73,7 +67,7 @@ DIRS += ioc/db
ioc/db_DEPEND_DIRS = ioc/bpt ca/client
DIRS += ioc/as
ioc/as_DEPEND_DIRS = ioc/db libCom/as
ioc/as_DEPEND_DIRS = ioc/db libCom
DIRS += ioc/dbtemplate
ioc/dbtemplate_DEPEND_DIRS = ioc/db

View File

@@ -25,6 +25,6 @@ asIoc_RCS = asIoc.rc
PROD_HOST = ascheck
ascheck_SRCS = ascheck.c
PROD_LIBS = asHost dbStaticHost Com
PROD_LIBS = dbStaticHost Com
include $(TOP)/configure/RULES

View File

@@ -12,6 +12,7 @@ include $(TOP)/configure/CONFIG
SRC = $(TOP)/src
LIBCOM = $(SRC)/libCom
include $(LIBCOM)/as/Makefile
include $(LIBCOM)/bucketLib/Makefile
include $(LIBCOM)/calc/Makefile
include $(LIBCOM)/cvtFast/Makefile
@@ -22,6 +23,7 @@ include $(LIBCOM)/ellLib/Makefile
include $(LIBCOM)/env/Makefile
include $(LIBCOM)/error/Makefile
include $(LIBCOM)/fdmgr/Makefile
include $(LIBCOM)/flex/Makefile
include $(LIBCOM)/freeList/Makefile
include $(LIBCOM)/gpHash/Makefile
include $(LIBCOM)/iocsh/Makefile
@@ -33,6 +35,7 @@ include $(LIBCOM)/ring/Makefile
include $(LIBCOM)/taskwd/Makefile
include $(LIBCOM)/timer/Makefile
include $(LIBCOM)/tsDefs/Makefile
include $(LIBCOM)/yacc/Makefile
# Library to build:
LIBRARY=Com

View File

@@ -1,15 +1,17 @@
#*************************************************************************
# Copyright (c) 2010 Brookhaven Science Associates, as Operator of
# Brookhaven National Lab.
# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne
# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
# National Laboratory.
# Copyright (c) 2002 The Regents of the University of California, as
# Operator of Los Alamos National Laboratory.
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#************************************************************************
TOP=../../..
include $(TOP)/configure/CONFIG
# This is a Makefile fragment, see src/libCom/Makefile.
SRC_DIRS += $(LIBCOM)/as
INC += asLib.h
INC += asTrapWrite.h
@@ -17,16 +19,3 @@ INC += asTrapWrite.h
LIB_SRCS += asLib.c
LIB_SRCS += asTrapWrite.c
LIBRARY_HOST = asHost
asHost_LIBS = Com
asHost_RCS = asHost.rc
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

22
src/libCom/as/RULES Normal file
View File

@@ -0,0 +1,22 @@
#*************************************************************************
# Copyright (c) 2010 Brookhaven Science Associates, as Operator of
# Brookhaven National Lab.
# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
# National Laboratory.
# Copyright (c) 2002 The Regents of the University of California, as
# Operator of Los Alamos National Laboratory.
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#************************************************************************
# This is a Makefile fragment, see src/libCom/Makefile.
# 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: $(call PATH_FILTER, $(TOOLS)/antelope$(HOSTEXE))
asLib_lex.c: $(call PATH_FILTER, $(TOOLS)/e_flex$(HOSTEXE))
clean::
@$(RM) asLib.c asLib_lex.c

View File

@@ -1,36 +0,0 @@
#include <Winver.h>
#include "epicsVersion.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS VOS__WINDOWS32
FILETYPE VFT_UNKNOWN
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments","Host Access Security Library for EPICS\0"
VALUE "CompanyName", "The EPICS collaboration\0"
VALUE "FileDescription", "Host Access Security Library\0"
VALUE "FileVersion", EPICS_VERSION_STRING "\0"
VALUE "InternalName", "asHost\0"
VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
VALUE "OriginalFilename", "asHost.dll\0"
VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END

View File

@@ -9,4 +9,4 @@
SRC_DIRS += $(LIBCOM)/bucketLib
INC += bucketLib.h
SRCS += bucketLib.c
Com_SRCS += bucketLib.c

View File

@@ -9,6 +9,6 @@
SRC_DIRS += $(LIBCOM)/calc
INC += postfix.h
SRCS += postfix.c
SRCS += calcPerform.c
Com_SRCS += postfix.c
Com_SRCS += calcPerform.c

View File

@@ -9,5 +9,5 @@
SRC_DIRS += $(LIBCOM)/cvtFast
INC += cvtFast.h
SRCS += cvtFast.c
Com_SRCS += cvtFast.c

View File

@@ -17,7 +17,7 @@ INC += tsFreeList.h
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

View File

@@ -9,5 +9,5 @@
SRC_DIRS += $(LIBCOM)/dbmf
INC += dbmf.h
SRCS += dbmf.c
Com_SRCS += dbmf.c

View File

@@ -9,4 +9,4 @@
SRC_DIRS += $(LIBCOM)/ellLib
INC += ellLib.h
SRCS += ellLib.c
Com_SRCS += ellLib.c

View File

@@ -11,6 +11,6 @@ SRC_DIRS += $(LIBCOM)/env
INC += envDefs.h
SRCS += envSubr.c
SRCS += envData.c
Com_SRCS += envSubr.c
Com_SRCS += envData.c

View File

@@ -15,9 +15,9 @@ 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
# For bldErrSymTbl
#

View File

@@ -10,5 +10,5 @@
SRC_DIRS += $(LIBCOM)/fdmgr
INC += fdManager.h
INC += fdmgr.h
SRCS += fdmgr.cpp
SRCS += fdManager.cpp
Com_SRCS += fdmgr.cpp
Com_SRCS += fdManager.cpp

35
src/libCom/flex/Makefile Normal file
View File

@@ -0,0 +1,35 @@
#*************************************************************************
# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
# National Laboratory.
# Copyright (c) 2002 The Regents of the University of California, as
# Operator of Los Alamos National Laboratory.
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#*************************************************************************
# This is a Makefile fragment, see src/libCom/Makefile.
SRC_DIRS += $(LIBCOM)/flex
parse_YACCOPT = -l -d
SKELETON_FILE = include/flex.skel.static
parse_CPPFLAGS = -DDEFAULT_SKELETON_FILE=$(SKELETON_FILE)
INC += flex.skel.static
# flex.c is included in parse.c
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)
PROD_HOST += e_flex

View File

@@ -1,5 +1,5 @@
#*************************************************************************
# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
# National Laboratory.
# Copyright (c) 2002 The Regents of the University of California, as
# Operator of Los Alamos National Laboratory.
@@ -7,13 +7,10 @@
# in file LICENSE that is included with this distribution.
#*************************************************************************
TOP=../../..
# This is a Makefile fragment, see src/libCom/Makefile.
include $(TOP)/configure/CONFIG
DIRS = antelope flex
flex_DEPEND_DIRS += antelope
include $(TOP)/configure/RULES_DIRS
# Ensure that the lexer is built before it is needed
parse.c: $(call PATH_FILTER, $(TOOLS)/antelope$(HOSTEXE))
clean::
$(RM) parse.c parse.h

View File

@@ -703,5 +703,5 @@ char msg[];
#include "scan.c"
#include "yylex.c"
#include "main.c"
#include "flex.c"

View File

@@ -9,5 +9,5 @@
SRC_DIRS += $(LIBCOM)/freeList
INC += freeList.h
SRCS += freeListLib.c
Com_SRCS += freeListLib.c
HTMLS += freeList/freeList.html

View File

@@ -9,5 +9,5 @@
SRC_DIRS += $(LIBCOM)/gpHash
INC += gpHash.h
SRCS += gpHashLib.c
Com_SRCS += gpHashLib.c
HTMLS += gpHash/gpHash.html

View File

@@ -11,6 +11,6 @@ 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

View File

@@ -10,8 +10,8 @@
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

View File

@@ -9,6 +9,6 @@
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

View File

@@ -31,13 +31,13 @@ INC += testMain.h
# epicsVersion.h is created by this Makefile
INC += epicsVersion.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

View File

@@ -52,61 +52,61 @@ INC += devLibVME.h
INC += devLibVMEImpl.h
INC += osdVME.h
SRCS += epicsThread.cpp
SRCS += epicsMutex.cpp
SRCS += epicsEvent.cpp
SRCS += epicsTime.cpp
SRCS += epicsMessageQueue.cpp
SRCS += epicsMath.cpp
Com_SRCS += epicsThread.cpp
Com_SRCS += epicsMutex.cpp
Com_SRCS += epicsEvent.cpp
Com_SRCS += epicsTime.cpp
Com_SRCS += epicsMessageQueue.cpp
Com_SRCS += epicsMath.cpp
SRCS += epicsGeneralTime.c
Com_SRCS += epicsGeneralTime.c
# Time providers
SRCS += osiClockTime.c
SRCS_vxWorks += osiNTPTime.c
SRCS_RTEMS += osiNTPTime.c
Com_SRCS += osiClockTime.c
Com_SRCS_vxWorks += osiNTPTime.c
Com_SRCS_RTEMS += osiNTPTime.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
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
osdEnv_CFLAGS_WIN32= -U__STDC__
SRCS += osdEnv.c
Com_SRCS += osdEnv.c
# Command-line input support
epicsReadline_CFLAGS += -DEPICS_COMMANDLINE_LIBRARY=EPICS_COMMANDLINE_LIBRARY_$(COMMANDLINE_LIBRARY)
epicsReadline_INCLUDES += $(INCLUDES_$(COMMANDLINE_LIBRARY))
SRCS += epicsReadline.c
Com_SRCS += epicsReadline.c
SRCS += epicsTempFile.cpp
SRCS += epicsStdio.c
SRCS += osdStdio.c
Com_SRCS += epicsTempFile.cpp
Com_SRCS += epicsStdio.c
Com_SRCS += osdStdio.c
#POSIX thread priority scheduling flag
THREAD_CPPFLAGS_NO += -DDONT_USE_POSIX_THREAD_PRIORITY_SCHEDULING
osdThread_CPPFLAGS += $(THREAD_CPPFLAGS_$(USE_POSIX_THREAD_PRIORITY_SCHEDULING))
SRCS += osdThread.c
SRCS += osdMutex.c
SRCS += osdEvent.c
SRCS += osdTime.cpp
SRCS += osdProcess.c
SRCS += osdNetIntf.c
SRCS += osdMessageQueue.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
SRCS += devLibVME.c
SRCS += devLibVMEOSD.c
Com_SRCS += devLibVME.c
Com_SRCS += devLibVMEOSD.c
SRCS_vxWorks += atReboot.cpp
Com_SRCS_vxWorks += atReboot.cpp
# For old vxWorks applications
INC_vxWorks += camacLib.h
@@ -114,14 +114,14 @@ 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
SRCS_WIN32 += epicsGetopt.c
SRCS_WIN32 += setThreadName.cpp
#SRCS_WIN32 += dllmain.cpp
SRCS_WIN32 += forceBadAllocException.cpp
Com_SRCS_WIN32 += epicsGetopt.c
Com_SRCS_WIN32 += setThreadName.cpp
#Com_SRCS_WIN32 += dllmain.cpp
Com_SRCS_WIN32 += forceBadAllocException.cpp

View File

@@ -11,5 +11,5 @@ 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

View File

@@ -9,4 +9,4 @@
SRC_DIRS += $(LIBCOM)/taskwd
INC += taskwd.h
SRCS += taskwd.c
Com_SRCS += taskwd.c

View File

@@ -9,9 +9,9 @@
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

View File

@@ -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

View File

@@ -10,4 +10,4 @@
#tsDefs contains R3.13 compatibility tsStamp code
SRC_DIRS += $(LIBCOM)/tsDefs
INC += tsDefs.h
SRCS += tsDefs.c
Com_SRCS += tsDefs.c

View File

@@ -6,24 +6,24 @@
# 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
# This is a Makefile fragment, see src/libCom/Makefile.
PROD_HOST = antelope
PROD_LIBS = Com
SRC_DIRS += $(LIBCOM)/yacc
include $(TOP)/configure/RULES
antelope_SRCS += closure.c
antelope_SRCS += error.c
antelope_SRCS += lalr.c
antelope_SRCS += lr0.c
antelope_SRCS += antelope.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)
PROD_HOST += antelope