Added COMPAT_313 macro for building/installing R3.13 compatability files.
This commit is contained in:
5
Makefile
5
Makefile
@@ -14,7 +14,10 @@
|
||||
TOP = .
|
||||
include $(TOP)/configure/CONFIG
|
||||
|
||||
DIRS += config config/tools configure src
|
||||
ifeq ($(strip $(COMPAT_313)),YES)
|
||||
DIRS += config config/tools
|
||||
endif
|
||||
DIRS += configure src
|
||||
|
||||
include $(TOP)/configure/RULES_TOP
|
||||
|
||||
|
||||
@@ -130,6 +130,14 @@ HOST_WARN=YES
|
||||
# must be either YES or NO
|
||||
CROSS_WARN=YES
|
||||
|
||||
# Create and/or install files for R3.13 ioc application and extension builds?
|
||||
# must be either YES or NO
|
||||
#
|
||||
# NOTE: Set to YES only if you have existing R3.13 ioc applications
|
||||
# or extensions that will be built with this base
|
||||
#
|
||||
COMPAT_313=NO
|
||||
|
||||
# Installation directory
|
||||
#Note: INSTALL_LOCATION definition moved to configure/RELEASE file
|
||||
|
||||
|
||||
@@ -16,6 +16,21 @@
|
||||
<h2>Changes since 3.14.4</h2>
|
||||
</center>
|
||||
|
||||
|
||||
<h4>R3.13 compatability files</h4>
|
||||
|
||||
<p>R3.13 compatability files will no longer be generated as
|
||||
default during the build. There is a new macro, COMPAT_313,
|
||||
in the configure/CONFIG_SITE file which must be set to
|
||||
YES for R3.13 compatability files to be created and installed.
|
||||
You will need to set COMPAT_313 to YES if you want R3.13 ioc
|
||||
applications or R3.13 extensions built with this R3.14 base.
|
||||
</p>
|
||||
|
||||
<p>The COMPAT_313 macro is set to NO in the CONFIG_SITE distribution
|
||||
file.
|
||||
</p>
|
||||
|
||||
<h4>Stringin record time-stamp soft device support</h4>
|
||||
Add simple device support for converting time to nicely-formatted string using
|
||||
INP field as epicsTimeToStrftime format string:
|
||||
|
||||
@@ -35,8 +35,10 @@ ascheck_SRCS = ascheck.c
|
||||
PROD_LIBS = asHost dbStaticHost Com
|
||||
|
||||
# For R3.13 compatibility only
|
||||
ifeq ($(strip $(COMPAT_313)),YES)
|
||||
OBJLIB_vxWorks=asIoc
|
||||
OBJLIB_SRCS += $(LIB_SRCS) $(asIoc_SRCS)
|
||||
endif
|
||||
|
||||
include $(TOP)/configure/RULES
|
||||
|
||||
|
||||
@@ -76,8 +76,10 @@ LIBRARY=ca
|
||||
ca_RCS_WIN32 = ca.rc
|
||||
|
||||
# For R3.13 compatibility only
|
||||
ifeq ($(strip $(COMPAT_313)),YES)
|
||||
OBJLIB_vxWorks=ca
|
||||
OBJLIB_SRCS = $(LIBSRCS)
|
||||
endif
|
||||
|
||||
ca_LIBS = Com
|
||||
|
||||
|
||||
@@ -80,8 +80,10 @@ dbIoc_LIBS = dbStaticIoc ca Com
|
||||
dbIoc_RCS_WIN32 = dbIoc.rc
|
||||
|
||||
# For R3.13 compatibility only
|
||||
ifeq ($(strip $(COMPAT_313)),YES)
|
||||
OBJLIB_vxWorks=dbIoc
|
||||
OBJLIB_SRCS = $(LIBSRCS)
|
||||
endif
|
||||
|
||||
include $(TOP)/configure/RULES
|
||||
|
||||
|
||||
@@ -34,8 +34,10 @@ LIBRARY_HOST += dbStaticHost
|
||||
LIBRARY_IOC += dbStaticIoc
|
||||
|
||||
# For R3.13 compatibility only
|
||||
ifeq ($(strip $(COMPAT_313)),YES)
|
||||
OBJLIB_vxWorks=dbStaticIoc
|
||||
OBJLIB_SRCS = $(LIBSRCS) $(dbStaticIoc_SRCS)
|
||||
endif
|
||||
|
||||
dbStaticHost_LIBS = Com
|
||||
dbStaticIoc_LIBS = Com
|
||||
|
||||
@@ -27,8 +27,10 @@ dbtoolsIoc_RCS_WIN32 = dbtoolsIoc.rc
|
||||
HTMLS += dbLoadTemplate.html
|
||||
|
||||
# For R3.13 compatibility only
|
||||
ifeq ($(strip $(COMPAT_313)),YES)
|
||||
OBJLIB_vxWorks=dbtoolsIoc
|
||||
OBJLIB_SRCS = $(LIBSRCS)
|
||||
endif
|
||||
|
||||
include $(TOP)/configure/RULES
|
||||
|
||||
|
||||
@@ -54,7 +54,9 @@ softDevIoc_LIBS += recIoc asIoc dbIoc registryIoc dbStaticIoc ca Com
|
||||
softDevIoc_RCS_WIN32 = softDevIoc.rc
|
||||
|
||||
# For R3.13 compatability
|
||||
ifeq ($(strip $(COMPAT_313)),YES)
|
||||
OBJS_vxWorks = $(LIBSRCS:%.c=%)
|
||||
endif
|
||||
|
||||
include $(TOP)/configure/RULES
|
||||
|
||||
|
||||
@@ -32,6 +32,8 @@ testDevIoc_LIBS += recIoc asIoc dbIoc registryIoc dbStaticIoc ca Com
|
||||
testDevIoc_RCS_WIN32 = testDevIoc.rc
|
||||
|
||||
# For R3.13 compatability
|
||||
ifeq ($(strip $(COMPAT_313)),YES)
|
||||
OBJS_vxWorks = $(LIBSRCS:%.c=%)
|
||||
endif
|
||||
|
||||
include $(TOP)/configure/RULES
|
||||
|
||||
@@ -58,8 +58,10 @@ iocsh_LIBS = miscIoc rsrvIoc dbtoolsIoc asIoc dbIoc registryIoc dbStaticIoc Com
|
||||
iocsh_RCS_WIN32 = iocsh.rc
|
||||
|
||||
# For R3.13 compatibility only
|
||||
ifeq ($(strip $(COMPAT_313)),YES)
|
||||
OBJLIB_vxWorks=iocsh
|
||||
OBJLIB_SRCS = $(LIBSRCS)
|
||||
endif
|
||||
|
||||
include $(TOP)/configure/RULES
|
||||
|
||||
|
||||
@@ -255,8 +255,10 @@ Com_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
|
||||
Com_RCS_WIN32 = Com.rc
|
||||
|
||||
# For R3.13 compatibility only
|
||||
ifeq ($(strip $(COMPAT_313)),YES)
|
||||
OBJLIB_vxWorks=Com
|
||||
OBJLIB_SRCS = $(SRCS)
|
||||
endif
|
||||
|
||||
# libs needed for PROD and TESTPRODUCT
|
||||
PROD_LIBS = Com
|
||||
|
||||
@@ -26,8 +26,10 @@ miscIoc_RCS_WIN32 = miscIoc.rc
|
||||
miscIoc_LIBS = rsrvIoc asIoc dbIoc registryIoc dbStaticIoc ca Com
|
||||
|
||||
# For R3.13 compatibility only
|
||||
ifeq ($(strip $(COMPAT_313)),YES)
|
||||
OBJLIB_vxWorks=miscIoc
|
||||
OBJLIB_SRCS = $(LIBSRCS)
|
||||
endif
|
||||
|
||||
include $(TOP)/configure/RULES
|
||||
|
||||
|
||||
@@ -86,7 +86,9 @@ recIoc_LIBS = asIoc dbIoc registryIoc dbStaticIoc ca Com
|
||||
recIoc_RCS_WIN32 = recIoc.rc
|
||||
|
||||
# For R3.13 compatability
|
||||
ifeq ($(strip $(COMPAT_313)),YES)
|
||||
OBJS_vxWorks = $(LIBSRCS:%.c=%)
|
||||
endif
|
||||
|
||||
include $(TOP)/configure/RULES
|
||||
|
||||
|
||||
@@ -40,8 +40,10 @@ registryIoc_LIBS = Com
|
||||
|
||||
registryIoc_RCS_WIN32 = registryIoc.rc
|
||||
|
||||
ifeq ($(strip $(COMPAT_313)),YES)
|
||||
OBJLIB_vxWorks = registryIoc
|
||||
OBJLIB_SRCS = $(LIBSRCS)
|
||||
endif
|
||||
|
||||
include $(TOP)/configure/RULES
|
||||
|
||||
|
||||
@@ -29,7 +29,9 @@ rsrvIoc_SYS_LIBS_WIN32 := ws2_32
|
||||
rsrvIoc_RCS_WIN32 = rsrvIoc.rc
|
||||
|
||||
# For R3.13 compatibility only
|
||||
ifeq ($(strip $(COMPAT_313)),YES)
|
||||
OBJLIB_vxWorks=rsrvIoc
|
||||
OBJLIB_SRCS = $(LIBSRCS)
|
||||
endif
|
||||
|
||||
include $(TOP)/configure/RULES
|
||||
|
||||
@@ -24,9 +24,11 @@ iocCore_OBJS += $(INSTALL_BIN)/iocshLibrary.o
|
||||
iocCore_OBJS += $(INSTALL_BIN)/vxComLibrary.o
|
||||
iocCore_SRCS += registerRecordDeviceDriver.c
|
||||
|
||||
ifeq ($(strip $(COMPAT_313)),YES)
|
||||
OBJLIB_vxWorks = iocCore
|
||||
OBJLIB_OBJS += $(iocCore_OBJS)
|
||||
OBJLIB_SRCS += registerRecordDeviceDriver.c
|
||||
endif
|
||||
|
||||
include $(TOP)/configure/RULES
|
||||
|
||||
|
||||
Reference in New Issue
Block a user