Set release version numbers

(setting $/='' breaks reading multi-line into an array)

.gitignore

@@ -18,7 +18,3 @@ O.*/
 .*.swp
 .DS_Store
 .iocsh_history
-RPMS
-SRPMS
-BUILDROOT
-*.rpm

.gitmodules

@@ -1,7 +1,6 @@
 [submodule "modules/pvData"]
     path = modules/pvData
-#    url = https://github.com/epics-base/pvDataCPP
-    url = git@git.psi.ch:epics_base/pvData.git
+    url = https://github.com/epics-base/pvDataCPP
     branch = master
 [submodule "modules/pvAccess"]
     path = modules/pvAccess
@@ -27,6 +26,3 @@
     path = .ci
     url = https://github.com/epics-base/ci-scripts
     branch = master
-[submodule "modules/pcas"]
-    path = modules/pcas
-    url = https://github.com/epics-modules/pcas

Makefile

@@ -23,13 +23,3 @@ DIRS += modules
 modules_DEPEND_DIRS = src
 
 include $(TOP)/configure/RULES_TOP
-
-UNINSTALL_DIRS += $(INSTALL_LOCATION)/src
-copysrc:
-	tar cf - --exclude-vcs --exclude-backups --exclude=O.* modules/*/src | tar xf - -C $(INSTALL_LOCATION)
-
-tar:
-	tar cfjP epics_base-$(EPICS_VERSION_NUMBER).tar.bz2 $(INSTALL_LOCATION)
-
-rpm:
-	rpmbuild -bb epics-base.spec

configure/CONFIG.gnuCommon

@@ -33,11 +33,7 @@ CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF))
 CODE_CFLAGS += $(ASAN_FLAGS_$(ENABLE_ASAN))
 WARN_CFLAGS_YES = -Wall -Werror-implicit-function-declaration
 WARN_CFLAGS_NO = -w
-# It makes sense to include debugging symbols even in optimized builds
-# in case you want to attach gdb to the process or examine a core-dump.
-# This does cost disk space, but not memory as debug symbols are not
-# loaded into RAM when the binary is loaded.
-OPT_CFLAGS_YES = -O3 -g
+OPT_CFLAGS_YES = -O3
 OPT_CFLAGS_NO = -g
 
 PROF_CXXFLAGS_YES = -p
@@ -46,7 +42,7 @@ CODE_CXXFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
 CODE_CXXFLAGS += $(ASAN_FLAGS_$(ENABLE_ASAN))
 WARN_CXXFLAGS_YES = -Wall
 WARN_CXXFLAGS_NO = -w
-OPT_CXXFLAGS_YES = -O3 -g
+OPT_CXXFLAGS_YES = -O3
 OPT_CXXFLAGS_NO = -g
 
 CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))

configure/CONFIG_BASE_VERSION

@@ -48,15 +48,15 @@ EPICS_VERSION = 7
 EPICS_REVISION = 0
 
 # EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 7
+EPICS_MODIFICATION = 8
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included in the official EPICS version number if zero
-EPICS_PATCH_LEVEL = 1
+EPICS_PATCH_LEVEL = 0
 
 # Immediately after an official release the EPICS_PATCH_LEVEL is incremented
 # and the -DEV suffix is added (similar to the Maven -SNAPSHOT versions)
-EPICS_DEV_SNAPSHOT=-DEV
+EPICS_DEV_SNAPSHOT=
 
 # No changes should be needed below here
 

configure/CONFIG_CA_VERSION

@@ -6,7 +6,7 @@ EPICS_CA_MAINTENANCE_VERSION = 3
 
 # Development flag, set to zero for release versions
 
-EPICS_CA_DEVELOPMENT_FLAG = 1
+EPICS_CA_DEVELOPMENT_FLAG = 0
 
 # Immediately after a release the MAINTENANCE_VERSION
 # will be incremented and the DEVELOPMENT_FLAG set to 1

configure/CONFIG_COMMON

@@ -422,10 +422,10 @@ INSTALL_LIB_INSTALLS = $(addprefix $(INSTALL_LIB)/,$(notdir $(LIB_INSTALLS)))
 
 #---------------------------------------------------------------
 # Installed file permissions
-BIN_PERMISSIONS = 755
-LIB_PERMISSIONS = 644
-SHRLIB_PERMISSIONS = 755
-INSTALL_PERMISSIONS = 644
+BIN_PERMISSIONS = 555
+LIB_PERMISSIONS = 444
+SHRLIB_PERMISSIONS = 555
+INSTALL_PERMISSIONS = 444
 
 #---------------------------------------------------------------
 #

configure/CONFIG_DATABASE_VERSION

@@ -1,12 +1,12 @@
 # Version number for the database APIs and shared library
 
 EPICS_DATABASE_MAJOR_VERSION = 3
-EPICS_DATABASE_MINOR_VERSION = 22
-EPICS_DATABASE_MAINTENANCE_VERSION = 1
+EPICS_DATABASE_MINOR_VERSION = 23
+EPICS_DATABASE_MAINTENANCE_VERSION = 0
 
 # Development flag, set to zero for release versions
 
-EPICS_DATABASE_DEVELOPMENT_FLAG = 1
+EPICS_DATABASE_DEVELOPMENT_FLAG = 0
 
 # Immediately after a release the MAINTENANCE_VERSION
 # will be incremented and the DEVELOPMENT_FLAG set to 1

configure/CONFIG_LIBCOM_VERSION

@@ -1,12 +1,12 @@
 # Version number for the libcom APIs and shared library
 
 EPICS_LIBCOM_MAJOR_VERSION = 3
-EPICS_LIBCOM_MINOR_VERSION = 22
-EPICS_LIBCOM_MAINTENANCE_VERSION = 1
+EPICS_LIBCOM_MINOR_VERSION = 23
+EPICS_LIBCOM_MAINTENANCE_VERSION = 0
 
 # Development flag, set to zero for release versions
 
-EPICS_LIBCOM_DEVELOPMENT_FLAG = 1
+EPICS_LIBCOM_DEVELOPMENT_FLAG = 0
 
 # Immediately after a release the MAINTENANCE_VERSION
 # will be incremented and the DEVELOPMENT_FLAG set to 1

configure/CONFIG_SITE

@@ -157,9 +157,7 @@ USE_POSIX_THREAD_PRIORITY_SCHEDULING = YES
 
 # Site version number, if set will append '-' and this string to the
 #  EPICS version number string that is reported by many tools.
-ifeq ($(INSTALL_LOCATION),$(EPICS_BASE))
-EPICS_SITE_VERSION=$(shell $(PERL) -MPOSIX -e 'print strftime "%Y-%m-%d", localtime')
-endif
+EPICS_SITE_VERSION =
 
 # For GNU compiler, use pipes rather than temporary files for
 #  communication between the various stages of compilation.

configure/RULES_BUILD

@@ -100,23 +100,6 @@ include $(CONFIG)/RULES_FILE_TYPE
 
 include $(CONFIG)/RULES.Db
 
-#---------------------------------------------------------------
-# Do not build anything if current path matches SKIP_BUILDS
-
-ifneq (,$(strip $(SKIP_BUILDS)))
-CURRENT_MODULE=$(subst modules/,,$(subst $(realpath $(TOP)/..)/,,$(subst $(realpath $(dir $(lastword $(MAKEFILE_LIST)))..)/,,$(realpath ..))))
-ifneq ($(filter $(SKIP_BUILDS) $(addsuffix /%,$(SKIP_BUILDS)),$(CURRENT_MODULE)),)
-$(info Skipping $(CURRENT_MODULE) for $(T_A))
-PROD=
-TESTPROD=
-LIBRARY=
-TESTLIBRARY=
-LOADABLE_LIBRARY=
-TESTS=
-SRC_FILES=
-endif
-endif
-
 #---------------------------------------------------------------
 # Include defines and rules for prod, library and test* targets
 
@@ -243,7 +226,7 @@ $(LOADABLE_SHRLIBNAME): FINAL_DIR=$(INSTALL_SHRLIB)
 
 $(TESTPRODNAME) $(PRODNAME): $(PRODUCT_OBJS) $(PROD_RESS) $(PROD_DEPLIBS)
 
-$(TESTPRODNAME) $(PRODNAME): %$(EXE):
+$(TESTPRODNAME) $(PRODNAME): %$(EXE): | $(INSTALL_LIB)
 	@$(RM) $@
 	$(LINK.cpp)
 	$(MT_EXE_COMMAND)
@@ -346,6 +329,10 @@ $(LOADABLE_SHRLIBNAME): $(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX):
 	$(LINK.shrlib)
 	$(MT_DLL_COMMAND)
 
+$(LIBNAME) $(SHRLIBNAME) $(LOADABLE_SHRLIBNAME): | $(INSTALL_LIB)
+$(INSTALL_LIB):
+	@$(MKDIR) $@
+
 #---------------------------------------------------------------
 # C++ munching for VxWorks
 
@@ -514,13 +501,6 @@ ifneq (,$(strip $(SHRLIB_VERSION)))
 	@$(RM) $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@)
 	ln -s $< $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@)
 endif # SHRLIB_VERSION
-else  # SHRLIB_SUFFIX
-ifeq ($(BUILD_CLASS),HOST)
-ifneq (,$(strip $(SHRLIB_VERSION)))
-	@$(RM) $@.$(SHRLIB_VERSION)
-	ln -s $< $@.$(SHRLIB_VERSION)
-endif # HOST
-endif # SHRLIB_VERSION
 endif # SHRLIB_SUFFIX
 
 ifneq ($(INSTALL_TCLLIB),$(INSTALL_BIN))

configure/os/CONFIG.Common.RHEL7-x86_64

@@ -1,8 +0,0 @@
-# Include definitions common to linux pentium targets
-include $(CONFIG)/os/CONFIG.Common.linux-x86_64
-
-BUILD_CLASS = HOST
-
-TOOLSET_LOCATION = /opt/rh
-TOOLSET = devtoolset-12
-STD_CXXFLAGS = -std=c++20

configure/os/CONFIG.Common.RHEL7-x86_64-clang

@@ -1,3 +0,0 @@
-include $(CONFIG)/os/CONFIG.Common.linux-clang
-
-BUILD_CLASS = HOST

configure/os/CONFIG.Common.RHEL8-x86_64

@@ -1,20 +0,0 @@
-# Include definitions common to linux pentium targets
-include $(CONFIG)/os/CONFIG.Common.linux-x86_64
-
-BUILD_CLASS = HOST
-
-TOOLSET_LOCATION = /opt/rh
-TOOLSET = gcc-toolset-12
-STD_CXXFLAGS = -std=c++20
-
-# Fix bug in gcc-toolset-11 calling the old assembler
-ifneq ($(filter %-11,$(TOOLSET)),)
-TARGET_CPPFLAGS += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
-TARGET_LDFLAGS  += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
-endif
-
-ifneq (($(TOOLSET)),)
-# Perl requests (native) annobin incompatible with the annobin from any TOOLSET
-# Disable Perl specific CFLAGS
-override Cap5_CFLAGS=
-endif

configure/os/CONFIG.Common.RHEL8-x86_64-clang

@@ -1,5 +0,0 @@
-include $(CONFIG)/os/CONFIG.Common.linux-clang
-
-BUILD_CLASS = HOST
-
-STD_CXXFLAGS = -std=c++2a

configure/os/CONFIG.Common.RHEL9-x86_64

@@ -1,20 +0,0 @@
-# Include definitions common to linux pentium targets
-include $(CONFIG)/os/CONFIG.Common.linux-x86_64
-
-BUILD_CLASS = HOST
-
-TOOLSET_LOCATION = /opt/rh
-TOOLSET = gcc-toolset-12
-STD_CXXFLAGS = -std=c++20
-
-# Fix bug in gcc-toolset-11 calling the old assembler
-ifneq ($(filter %-11,$(TOOLSET)),)
-TARGET_CPPFLAGS += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
-TARGET_LDFLAGS  += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
-endif
-
-ifneq (($(TOOLSET)),)
-# Perl requests (native) annobin incompatible with the annobin from any TOOLSET
-# Disable Perl specific CFLAGS
-override Cap5_CFLAGS=
-endif

configure/os/CONFIG.Common.RHEL9-x86_64-clang

@@ -1,5 +0,0 @@
-include $(CONFIG)/os/CONFIG.Common.linux-clang
-
-BUILD_CLASS = HOST
-
-STD_CXXFLAGS = -std=c++2a

configure/os/CONFIG.Common.RTEMS-pc686

@@ -32,7 +32,7 @@ OP_SYS_LDFLAGS += -Wl,-Ttext,0x100000
 
 
 # This check must appear after the above include
-ifneq ($(firstword $(subst ., ,$(RTEMS_VERSION))),5)
+ifneq ($(RTEMS_VERSION),5)
   $(info *** This target is not compatible with the configured RTEMS version.)
   $(info *** Build the RTEMS-pc386 (-qemu) target for RTEMS 4.x)
   $(error Can't continue)

configure/os/CONFIG.Common.RTEMS49-pc386

@@ -1,2 +0,0 @@
-RTEMS_VERSION = 4.9
-include $(CONFIG)/os/CONFIG.Common.RTEMS-pc386

configure/os/CONFIG.Common.RTEMS51-pc686

@@ -1,2 +0,0 @@
-RTEMS_VERSION = 5
-include $(CONFIG)/os/CONFIG.Common.RTEMS-pc686

configure/os/CONFIG.Common.T2-ppc604

@@ -1,8 +0,0 @@
-include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
-VXWORKS_VERSION = 5.5.1
-WIND_BASE = /opt/VxWorks/Tornado2.2.1
-
-#there is a problem with our ccppc and optimization
-# -O0 works, -O and -O1 and higher are buggy
-OPT_CFLAGS_YES = -O0
-OPT_CXXFLAGS_YES = -O0

configure/os/CONFIG.Common.V62-ppc604

@@ -1,2 +0,0 @@
-include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
-VXWORKS_VERSION = 6.2

configure/os/CONFIG.Common.V63-ppc603

@@ -1,5 +0,0 @@
-include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc603_long
-VXWORKS_VERSION = 6.3
-
-# Buggy "uninitialized variable" warning produces many false positives
-ARCH_DEP_CXXFLAGS += -Wno-uninitialized

configure/os/CONFIG.Common.V63-ppc604

@@ -1,5 +0,0 @@
-include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
-VXWORKS_VERSION = 6.3
-
-# Buggy "uninitialized variable" warning produces many false positives
-ARCH_DEP_CXXFLAGS += -Wno-uninitialized

configure/os/CONFIG.Common.V64-ppc604

@@ -1,5 +0,0 @@
-include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
-VXWORKS_VERSION = 6.4
-
-# Buggy "uninitialized variable" warning produces many false positives
-ARCH_DEP_CXXFLAGS += -Wno-uninitialized

configure/os/CONFIG.Common.V66-ppc603

@@ -1,2 +0,0 @@
-include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc603_long
-VXWORKS_VERSION = 6.6

configure/os/CONFIG.Common.V66-ppc604

@@ -1,2 +0,0 @@
-include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
-VXWORKS_VERSION = 6.6

configure/os/CONFIG.Common.V67-ppc604

@@ -1,8 +0,0 @@
-include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
-VXWORKS_VERSION = 6.7
-
-# needed when including memPartLib.h, e.g. through moduleLib.h or loadLib.h
-ARCH_DEP_CFLAGS += -D_VSB_CONFIG_FILE='<../lib/h/config/vsbConfig.h>'
-
-# compiler tries to access license server (even though no license isneeded)
-export LM_LICENSE_FILE=37000@lic-windriver.psi.ch

configure/os/CONFIG.Common.V69-ppc32

@@ -1,3 +0,0 @@
-include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc32
-VXWORKS_VERSION = 6.9
-#export LD_LIBRARY_PATH=$(LD_LIBRARY_PATH:%=%:)$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib

configure/os/CONFIG.Common.V69-ppc604

@@ -1,6 +0,0 @@
-include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
-VXWORKS_VERSION = 6.9
-#export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH:%=%:)($(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
-
-# -fno-implicit-fp causes error: "unable to find a register to spill in class 'FLOAT_REGS'"
-ARCH_DEP_CFLAGS = -mcpu=604 -mstrict-align

configure/os/CONFIG.Common.deb10-x86_64

@@ -1,22 +0,0 @@
-# Cross Debian 10 with gcc 8.3
-
-# Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-
-ARCH_CLASS = x86_64
-
-LDLIBS_SHARED_YES=LDLIBS
-
-SDK = gcc
-SDK_DIR  = /opt/xgcc/gcc-8.3.0-deb10
-GNU_ARCH = x86_64-deb10-linux-gnu
-SDKTARGETSYSROOT=$(SDK_DIR)/$(GNU_ARCH)/sys-root/
-GNU_DIR = $(SDK_DIR)
-GNU_BIN = $(GNU_DIR)/bin
-GNU_TARGET_INCLUDE_DIR =
-GNU_TARGET=x86_64-deb10-linux-gnu
-
-ARCH_DEP_CPPFLAGS =
-AS=$(GNU_BIN)/$(GNU_TARGET)-as
-
-STD_CXXFLAGS = -std=c++17

configure/os/CONFIG.Common.eldk42-ppc4xxFP

@@ -1,28 +0,0 @@
-# DeltaTau PowerPMAC with ELDK 4.2
-
-# Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-
-COMMANDLINE_LIBRARY = READLINE_NCURSES
-
-ARCH_CLASS = ppc
-
-ELDK=/opt/eldk-4.2
-GNU_TARGET=ppc_4xxFP
-GNU_DIR=$(ELDK)/usr
-
-# This cross tool chain is installed in a somehow weired way
-# Without the following lines it does not work on RHEL7
-# but it worked on SL6
-ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2
-ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/powerpc-linux
-ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/backward
-
-ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/lib
-ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/usr/lib
-
-# have no C++11
-STD_CXXFLAGS =
-
-# suppress strict alias warnings
-CODE_CPPFLAGS += -fno-strict-aliasing

configure/os/CONFIG.Common.eldk51-ppc4xxSF

@@ -1,17 +0,0 @@
-# Virtex FPGA embedded Processor with ELDK 5.1
-
-# Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-
-ARCH_CLASS = ppc
-
-SDK = eldk
-SDK_DIR = /opt/eldk-5.1
-SDK_HOST_ARCH = $(GNU_HOST_ARCH)-$(SDK)-$(GNU_HOST_OS)
-GNU_TARGET = powerpc-4xx-softfloat
-GNU_ARCH = ppc405-linux
-GNU_DIR = $(SDK_DIR)/$(GNU_TARGET)/sysroots/$(SDK_HOST_ARCH)/usr
-GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)
-
-# have no full C++11
-STD_CXXFLAGS = -std=c++0x

configure/os/CONFIG.Common.eldk52-e500v2

@@ -1,18 +0,0 @@
-# IOxOS IFC1210 with ELDK 5.2
-
-# Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-
-ARCH_CLASS = ppc
-
-SDK = eldk
-SDK_DIR = /opt/eldk-5.2
-SDK_HOST_ARCH = $(GNU_HOST_ARCH)-$(SDK)-$(GNU_HOST_OS)
-GNU_TARGET = powerpc-e500v2
-GNU_ARCH = ppce500v2-linux-gnuspe
-GNU_DIR = $(SDK_DIR)/$(GNU_TARGET)/sysroots/$(SDK_HOST_ARCH)/usr
-GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)
-GNU_TARGET_INCLUDE_DIR =
-
-# have no full C++11
-STD_CXXFLAGS = -std=c++0x

configure/os/CONFIG.Common.eldk53-ppc4xxFP

@@ -1,20 +0,0 @@
-# DeltaTau PowerPMAC with ELDK 5.3
-
-# Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-
-ARCH_CLASS = ppc
-
-SDK = eldk
-SDK_DIR = /opt/eldk-5.3
-SDK_HOST_ARCH = $(GNU_HOST_ARCH)-$(SDK)-$(GNU_HOST_OS)
-GNU_ARCH = ppc440e-linux
-SDKTARGETSYSROOT=$(SDK_DIR)/powerpc-4xx/sysroots
-GNU_DIR = $(SDKTARGETSYSROOT)/$(SDK_HOST_ARCH)/usr
-GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)
-GNU_TARGET_INCLUDE_DIR =
-GNU_TARGET=powerpc-linux
-SYSROOT = $(SDKTARGETSYSROOT)/$(GNU_ARCH)
-
-ARCH_DEP_CPPFLAGS =  -m32 -mcpu=440fp -mhard-float
-AS=$(GNU_BIN)/$(GNU_TARGET)-as

configure/os/CONFIG.Common.fslqoriq20-e6500_64

@@ -1,17 +0,0 @@
-# IOxOS IFC1211 with Freescale QorIQ 2.0 toolchain
-
-# Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-
-ARCH_CLASS = ppc
-
-SDK = fslsdk
-SDK_DIR = /opt/fsl-qoriq/2.0
-SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS)
-SDK_TARGET = ppc64e6500-fsl-linux
-GNU_TARGET = powerpc64-fsl-linux
-SYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
-GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
-GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)
-
-ARCH_DEP_CFLAGS = -mcpu=e6500 -m64 -mhard-float

configure/os/CONFIG.Common.gcc8-ppc4xxFP

@@ -1,21 +0,0 @@
-# DeltaTau PowerPMAC with gcc 8.5
-
-# Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-
-ARCH_CLASS = ppc
-
-SDK = gcc
-SDK_DIR = /opt/xgcc/gcc-8.5.0
-GNU_ARCH = powerpc-ppmac-linux-gnu
-SDKTARGETSYSROOT=$(SDK_DIR)/$(GNU_ARCH)/sys-root/
-GNU_DIR = $(SDK_DIR)
-GNU_BIN = $(GNU_DIR)/bin/
-GNU_TARGET_INCLUDE_DIR =
-GNU_TARGET=powerpc-ppmac-linux-gnu
-
-ARCH_DEP_CPPFLAGS =  -m32 -mcpu=440fp -mhard-float
-ARCH_DEP_LDFLAGS+=-Wl,-rpath,/opt/xgcc/gcc-8.5.0/$(GNU_ARCH)/lib
-ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(SDKTARGETSYSROOT)/lib/powerpc-linux-gnu/
-ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(SDKTARGETSYSROOT)/usr/lib/powerpc-linux-gnu/
-AS=$(GNU_BIN)/$(GNU_TARGET)-as

configure/os/CONFIG.Common.linux-clang

@@ -1,5 +0,0 @@
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-GNU         = NO
-CMPLR_CLASS = clang
-CC          = clang
-CCC         = clang++

configure/os/CONFIG.Common.linuxCommon

@@ -24,13 +24,13 @@ STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic
 
 # Set runtime path for shared libraries if LINKER_USE_RPATH=YES
-SHRLIBDIR_RPATH_LDFLAGS_YES = $(subst $(abspath $(LINKER_ORIGIN_ROOT)),$(FINAL_LOCATION),$(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)) $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
+SHRLIBDIR_RPATH_LDFLAGS_YES = $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
 SHRLIBDIR_RPATH_LDFLAGS_ORIGIN = $(shell $(MAKERPATH) -O '\$$ORIGIN' -F $(FINAL_DIR) -R $(LINKER_ORIGIN_ROOT) $(SHRLIB_DEPLIB_DIRS))
 SHRLIBDIR_LDFLAGS += \
     $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
 
 # Set runtime path for products if LINKER_USE_RPATH=YES
-PRODDIR_RPATH_LDFLAGS_YES = $(subst $(abspath $(LINKER_ORIGIN_ROOT)),$(FINAL_LOCATION),$(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)) $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
+PRODDIR_RPATH_LDFLAGS_YES = $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
 PRODDIR_RPATH_LDFLAGS_ORIGIN = $(shell $(MAKERPATH) -O '\$$ORIGIN' -F $(FINAL_DIR) -R $(LINKER_ORIGIN_ROOT) $(PROD_DEPLIB_DIRS))
 PRODDIR_LDFLAGS += \
     $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))

configure/os/CONFIG.Common.moxa42-armv6l

@@ -1,26 +0,0 @@
-# Moxa DA-66x with SDK 4.2 and ARM7 processor
-
-# Include definitions common to all Linux ARM targets
-include $(CONFIG)/os/CONFIG.Common.linux-arm
-
-GNU_DIR=/opt/moxa/arm-linux-4.4.2-v4
-GNU_TARGET=arm
-ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(GNU_DIR)/arm-none-linux-gnueabi/lib
-ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(INSTALL_LIB)
-
-COMMANDLINE_LIBRARY = READLINE_NCURSES
-
-# suppress note "the mangling of 'va_list' has changed in GCC 4.4"
-ARCH_DEP_CXXFLAGS += -Wno-psabi
-
-ARCH_DEP_CFLAGS += -funwind-tables
-
-# have no full C++11
-STD_CXXFLAGS = -std=c++0x
-
-# suppress strict alias warnings
-CODE_CPPFLAGS += -fno-strict-aliasing
-
-# accept4() exists but does not work
-# Give fake __rtems__ macro to posix/osdSock.c because that disables accept4()
-osdSock_CFLAGS += -D__rtems__

configure/os/CONFIG.Common.mvl40-xscale_be

@@ -1,18 +0,0 @@
-# Moxa DA-66x with Montavista Linux 4.0
-
-# Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-
-COMMANDLINE_LIBRARY = READLINE_CURSES
-
-ARCH_CLASS = xscale
-
-GNU_DIR=/opt/moxa/xscale_be/armv5teb-montavista-linuxeabi
-
-ARCH_DEP_CFLAGS += -funwind-tables
-
-# have no C++11
-STD_CXXFLAGS =
-
-# Cannot build PVA because of missing boost support
-SKIP_BUILDS = pv% normativeTypes

configure/os/CONFIG.Common.nilrt7-armv7a

@@ -1,21 +0,0 @@
-# National Instruments CompactRIO running LabView RT 19.5.1
-# requires RPM gcc-c++-arm-linux-gnu
-
-# Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-
-ARCH_CLASS = arm
-
-GNU_TARGET = arm-linux-gnu
-
-SYSROOT = /opt/LabVIEW-RT-19.5.1/arm/sysroots/armv7a-vfp-neon-nilrt-linux-gnueabi
-GNU_BIN = /opt/RHEL7/bin
-
-# Needed on RHEL9:
-export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)/usr/$$LIB:/opt/RHEL7/$$LIB
-
-ARCH_DEP_CPPFLAGS += -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon
-ARCH_DEP_CXXFLAGS += -I=/usr/include/c++/4.7.2/arm-nilrt-linux-gnueabi
-ARCH_DEP_CXXFLAGS += -I=/usr/include/c++/4.7.2
-
-COMMANDLINE_LIBRARY = READLINE_NCURSES

configure/os/CONFIG.Common.raspbian-arm

@@ -1,41 +0,0 @@
-# RaspberryPi with github.com/raspberrypi/tools toolchain
-# Tested on:
-# * Raspberry 3B+ Raspbian 9
-# * Raspberry 2   Raspbian 7
-
-# Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-
-# Using readline:
-# Due to missing/messed up libs in the toolchain, readline needs copies of
-# libtinfo.so.5.9 and libreadline.so.6.2 from a Raspbian 7 rootfs
-# /lib/arm-linux-gnueabihf/ to the toolchain, e.g.
-# $(SDK_DIR)/$(SDK_TARGET)/arm-linux-gnueabihf/libc/lib/arm-linux-gnueabihf/
-# and manually created links libtinfo.so.5 and libreadline.so.
-# For gcc-linaro-arm-linux-gnueabihf-raspbian, an existing incompatible
-# libtinfo.so.5 is in the way. Remove it.
-# (Built with glibc 2.16 like installed on Raspbian 9 but toolchain uses glibc 2.13.)
-# Also copy /usr/include/readline/ directory from some readline 6 installation
-# to $(SDK_DIR)/$(SDK_TARGET)/arm-linux-gnueabihf/libc/usr/include/
-
-ARCH_CLASS = arm
-
-SDK_DIR = /opt/raspberrypi/arm-bcm2708
-
-# Available SDK_TARGETs:
-
-# gcc 4.8.3 for 32 bit hosts with GLIBC 2.3 or higher
-# SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian
-
-# gcc 4.8.3 for 64 bit hosts with GLIBC 2.14 or higher
-SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian-x64
-
-# gcc 4.7.1 for 64 bit hosts with GLIBC 2.8 or higher
-# SDK_TARGET = arm-linux-gnueabihf
-
-# gcc 4.7.1 for 32 bit hosts with GLIBC 2.4 or higher
-# SDK_TARGET = arm-bcm2708hardfp-linux-gnueabi
-# SDK_TARGET = arm-bcm2708-linux-gnueabi
-
-GNU_DIR = $(SDK_DIR)/$(SDK_TARGET)
-GNU_TARGET = $(if $(filter arm-bcm2708%,SDK_TARGET),$(SDK_TARGET),arm-linux-gnueabihf)

configure/os/CONFIG.Common.yocto21-aarch64

@@ -1,15 +0,0 @@
-# XILINX Zynq with Yocto 2.1 / Petalinux toolchain
-
-# Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-
-ARCH_CLASS = arm64
-
-SDK = petalinux
-SDK_DIR = /opt/petalinux-gfa/2018.1
-SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS)
-SDK_TARGET = aarch64-xilinx-linux
-GNU_TARGET = $(SDK_TARGET)
-SYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
-GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
-GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)

configure/os/CONFIG.Common.yocto40-aarch64

@@ -1,19 +0,0 @@
-# XILINX Zynq with Yocto 4.0 toolchain
-
-# Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-
-ARCH_CLASS = arm64
-
-SDK = pokysdk
-SDK_DIR = /opt/yocto40-aarch64
-SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS)
-SDK_TARGET = cortexa53-poky-linux
-GNU_TARGET = aarch64-poky-linux
-SYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
-GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
-GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)
-
-ARCH_DEP_CPPFLAGS = -mcpu=cortex-a53 -march=armv8-a+crc
-
-STD_CXXFLAGS = -std=c++23

configure/os/CONFIG.Linux.windows-x64

@@ -1,10 +0,0 @@
-include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
-
-VALID_BUILDS = Ioc Command
-
-MSVC_VERSION ?= 2019
-PATH := /opt/gfa-wine/bin:/opt/wine-msvc-$(MSVC_VERSION)/bin/x64:$(PATH)
-export WINEPREFIX = $(HOME)/.wine-$(EPICS_HOST_ARCH)
-export WINEDEBUG=fixme-all
-export WINEDLLOVERRIDES="mscoree,mshtml="
-export WINE = wine64

configure/os/CONFIG.RHEL7-x86_64.Common

@@ -1,3 +0,0 @@
-#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
-#Include definitions common to linux hosts
-include $(CONFIG)/os/CONFIG.linux-x86_64.Common

configure/os/CONFIG.RHEL7-x86_64.RHEL7-x86_64

@@ -1,2 +0,0 @@
-# Include common linux definitions
-include $(CONFIG)/os/CONFIG.linux-x86.linux-x86

configure/os/CONFIG.RHEL7-x86_64.windows-x64

@@ -1,3 +0,0 @@
-# MSVC_VERSION 2019 in wine 4 for on RHEL7 would require winetricks
-MSVC_VERSION = 2017
-include $(CONFIG)/os/CONFIG.Linux.windows-x64

configure/os/CONFIG.RHEL8-x86_64.Common

@@ -1,3 +0,0 @@
-#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
-#Include definitions common to linux hosts
-include $(CONFIG)/os/CONFIG.linux-x86_64.Common

configure/os/CONFIG.RHEL8-x86_64.RHEL7-x86_64

@@ -1,25 +0,0 @@
-# Include common linux definitions
-include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
-
-# "Cross compile" for RHEL7-x86_64
-# Expects RHEL7 RPMs c++ and readline-devel installed
-# in $(SYSROOT)
-# This can be installed on RHEL7 with:
-#    yum install --installroot=$(SYSROOT) <packages>
-# (Assuming $(SYSROOT) is on a shared network volume.)
-# Optionally use a newer TOOLSET (installed on $(SYSROOT)).
-
-SYSROOT = /opt/RHEL7
-
-# "Cross" TOOLSET progs need to find their libraries
-export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(TOOLSET_DIR:%=$(SYSROOT)%/usr/$$LIB)
-
-# The linker has problems to find indirectly referenced libraries
-ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(INSTALL_LIB)
-
-# These programs have library problems when using them
-# from SYSROOT but without TOOLSET.
-# But provinding LD_LIBRARY PATH crashes other progams.
-# Our host versions work just fine.
-AR = ar -rc
-RANLIB = ranlib

configure/os/CONFIG.RHEL8-x86_64.RHEL8-x86_64

@@ -1,2 +0,0 @@
-# Include common linux definitions
-include $(CONFIG)/os/CONFIG.linux-x86.linux-x86

configure/os/CONFIG.RHEL8-x86_64.windows-x64

@@ -1 +0,0 @@
-include $(CONFIG)/os/CONFIG.Linux.windows-x64

configure/os/CONFIG.RHEL9-x86_64.Common

@@ -1,3 +0,0 @@
-#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
-#Include definitions common to linux hosts
-include $(CONFIG)/os/CONFIG.linux-x86_64.Common

configure/os/CONFIG.RHEL9-x86_64.RHEL7-x86_64

@@ -1,18 +0,0 @@
-# Include common linux definitions
-include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
-
-# "Cross compile" for RHEL7-x86_64
-# Expects RHEL7 RPMs c++ and readline-devel installed
-# in $(SYSROOT)
-# This can be installed on RHEL7 with:
-#    yum install --installroot=$(SYSROOT) <packages>
-# (Assuming $(SYSROOT) is on a shared network volume.)
-# Optionally use a newer TOOLSET (installed on $(SYSROOT)).
-
-SYSROOT = /opt/RHEL7
-
-# "Cross" TOOLSET progs need to find their libraries
-export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(TOOLSET_DIR:%=$(SYSROOT)%/usr/$$LIB:)/usr/$$LIB:$(SYSROOT)/usr/$$LIB
-
-# The linker has problems to find indirectly referenced libraries
-PROD_LDLIBS += $(LDLIBS)

configure/os/CONFIG.RHEL9-x86_64.RHEL8-x86_64

@@ -1,22 +0,0 @@
-# Include common linux definitions
-include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
-
-# "Cross compile" for RHEL8-x86_64
-# Expects RHEL8 RPMs gcc-toolset-12-gcc-c++ and readline-devel
-# to be installed in $(SYSROOT)
-# These can be installed on RHEL8 with:
-#    yum install --installroot=$(SYSROOT) <packages>
-# (Assuming $(SYSROOT) is on a shared network volume.)
-
-SYSROOT = /opt/RHEL8
-
-# "Cross" TOOLSET progs need to find their libraries.
-# But linker gets confused with LD_LIBRARY_PATH.
-# Thus only wrap the compiler.
-WRAPPER = -wrapper env,LD_LIBRARY_PATH=$(TOOLSET_DIR:%=$(SYSROOT)%/usr/lib64:)/usr/lib64:$(SYSROOT)/usr/lib64
-TARGET_CPPFLAGS += $(WRAPPER)
-
-# These programs as cross tools would also need LD_LIBRARY_PATH.
-# But but our host versions work just fine.
-AR = ar -rc
-RANLIB = ranlib

configure/os/CONFIG.RHEL9-x86_64.RHEL9-x86_64

@@ -1,2 +0,0 @@
-# Include common linux definitions
-include $(CONFIG)/os/CONFIG.linux-x86.linux-x86

configure/os/CONFIG.RHEL9-x86_64.windows-x64

@@ -1 +0,0 @@
-include $(CONFIG)/os/CONFIG.Linux.windows-x64

configure/os/CONFIG.win32-x86.win32-x86

@@ -16,7 +16,7 @@ OPT_WHOLE_PROGRAM = YES
 
 WINLINK = link
 
-RCCMD = rc -nologo -l 0x409 $(INCLUDES) -fo $@ $<
+RCCMD = rc -l 0x409 $(INCLUDES) -fo $@ $<
 
 ARCMD = lib -nologo -verbose -out:$@ $(LIB_OPT_LDFLAGS) $(LIBRARY_LD_OBJS)
 

configure/os/CONFIG_SITE.Common.RTEMS

@@ -24,9 +24,6 @@
 #RTEMS_VERSION = 5
 #RTEMS_BASE = /usr/local/vw/rtems/rtems-5.1
 
-# PSI:
-RTEMS_BASE = /opt/rtems/$(RTEMS_VERSION)
-
 # Cross-compile toolchain in $(RTEMS_TOOLS)/bin
 #
 RTEMS_TOOLS = $(RTEMS_BASE)

configure/os/CONFIG_SITE.Common.deb10-x86_64

@@ -1,2 +0,0 @@
-# Debian 10
-COMMANDLINE_LIBRARY=READLINE_NCURSES

configure/os/CONFIG_SITE.Common.gcc8-ppc4xxFP

@@ -1,2 +0,0 @@
-# DeltaTau PowerPMAC with gcc
-COMMANDLINE_LIBRARY=READLINE

configure/os/CONFIG_SITE.Common.linuxCommon

@@ -8,22 +8,3 @@
 # They must be set in the host+target specific file instead:
 #   CONFIG_SITE.<linux-arch>.<linux-arch>
 
-COMMANDLINE_LIBRARY = READLINE
-
-USR_CXXFLAGS += $(STD_CXXFLAGS)
-STD_CXXFLAGS = -std=c++11
-
-TOOLSET_DIR      = $(TOOLSET:%=$(TOOLSET_LOCATION)/%/root)
-GNU_DIR = $(SYSROOT)$(TOOLSET_DIR)
-TARGET_CPPFLAGS += $(SYSROOT:%=--sysroot=%)
-TARGET_LDFLAGS  += $(SYSROOT:%=--sysroot=%)
-
-ifeq ($(filter SL% RHEL%,$(T_A)),)
-VALID_BUILDS = Ioc Command
-endif
-
-# backward compatibility: Keep unversioned libs for older linux versions
-ifneq ($(filter SL% RHEL7% RHEL8%,$(T_A)),)
-SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
-LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
-endif

configure/os/CONFIG_SITE.Common.vxWorksCommon

@@ -18,82 +18,8 @@ VXWORKS_VERSION = 6.9
 # architecture by adding it to an appropriate
 # CONFIG_SITE.$(EPICS_HOST_ARCH).vxWorksCommon file.
 
-#### Fixes for CONFIG.Common.vxWorksCommon  #######
-
-VX_GNU_VERSION_7 = 4.8.1.11
-
-
-# These are needed for vxWorks 6.x; the GNU toolset version number
-# is in the path to the compiler tools:
-VX_GNU_VERSION_5   = 2.96
-VX_GNU_VERSION_6 = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
-VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_MAJOR_VERSION))
-VX_GNU_MAJOR_VERSION = $(firstword $(subst ., ,$(VX_GNU_VERSION)))
-VX_GNU_MINOR_VERSION = $(word 2,$(subst ., ,$(VX_GNU_VERSION)))
-
-# gcc version before 3.4 are "old" and need special treatment
-VX_OLD_GCC_2   = OLD
-VX_OLD_GCC_3.3 = OLD
-VX_OLD_GCC_3   = $(VX_OLD_GCC_3.$(VX_GNU_MINOR_VERSION))
-VX_OLD_GCC = $(VX_OLD_GCC_$(VX_GNU_MAJOR_VERSION))
-
-# vxWorks directory definitions
-VX_DIR_5 = $(WIND_BASE)
-VX_DIR_6 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
-VX_DIR_7 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)/pkgs/os
-VX_DIR = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))
-
-VX_INCLUDE_DIRS_5  = $(VX_DIR)/target/h
-VX_INCLUDE_DIRS_6  = $(VX_DIR)/target/h
-VX_INCLUDE_DIRS_6 += $(VX_DIR)/target/h/wrn/coreip
-VX_INCLUDE_DIRS_7  = $(VX_DIR)/core/kernel-1.2.8.0/h
-VX_INCLUDE_DIRS_7 += $(VX_DIR)/lang-lib/libc-1.0.0.1/libc-kernel-1.0.8.0/h
-VX_INCLUDE_DIRS_7 += $(VX_DIR)/utils/ostools-1.0.5.0/h
-VX_INCLUDE_DIRS_7 += $(VX_DIR)/utils/ostools-1.0.5.0/shareh
-VX_INCLUDE_DIRS_7 += $(VX_DIR)/arch/ppc-1.3.4.0/kernel/base/h/
-VX_INCLUDE_DIRS_7 += $(VX_DIR)/arch/ppc-1.3.4.0/kernel/60x/h/arch/ppc/
-VX_INCLUDE_DIRS_7 += $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)/samples/prebuilt_projects/vsb_vxsim_linux/krnl/h/public
-GNU_TARGET_INCLUDE_DIR = $(VX_INCLUDE_DIRS_$(VXWORKS_MAJOR_VERSION))
-
-TARGET_CPPFLAGS_5 = -isystem $(VX_DIR)/target/h
-TARGET_CPPFLAGS_6 = -isystem $(VX_DIR)/target/h
-TARGET_CPPFLAGS_7 = -isystem $(VX_DIR)/core/kernel-1.2.8.0/h -D_VSB_CONFIG_FILE='<$(WIND_BASE)/vxworks-$(VXWORKS_VERSION)/samples/prebuilt_projects/vsb_vxsim_linux/h/config/vsbConfig.h>'
-TARGET_CPPFLAGS = $(TARGET_CPPFLAGS_$(VXWORKS_MAJOR_VERSION))
-
-# vxWorks GNU directories
-
-GNU_DIR_5 = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
-GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
-GNU_DIR_7 = $(WIND_BASE)/compilers/gnu-$(VX_GNU_VERSION)/$(WIND_HOST_TYPE)
-GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION))
-
-# Operating system flags
-
-OP_SYS_INCLUDE_CPPFLAGS_5 += -include $(VX_DIR)/target/h/vxWorks.h
-OP_SYS_INCLUDE_CPPFLAGS_5 += -I$(EPICS_BASE)/include/os/vxWorks/vxWorks5
-OP_SYS_INCLUDE_CPPFLAGS_6 += -include $(VX_DIR)/target/h/vxWorks.h
-OP_SYS_INCLUDE_CPPFLAGS_7 += -include vxWorks.h
-OP_SYS_INCLUDE_CPPFLAGS = $(OP_SYS_INCLUDE_CPPFLAGS_$(VXWORKS_MAJOR_VERSION))
-
-OP_SYS_LDFLAGS += $(OP_SYS_LDFLAGS_$@)
-OP_SYS_LDFLAGS_softIoc = -whole-archive
-OP_SYS_LDFLAGS_softIocPVA = -whole-archive
-
-# code flags (delete -fno-implicit-templates)
-CODE_CXXFLAGS =
-
 # WIND_BASE is where you installed the Wind River software.
 
 #WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
-#WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
+WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
 #WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION)
-WIND_BASE = /opt/VxWorks/VxWorks$(VXWORKS_VERSION)
-
-#--------------------------------------------------
-# Modules we cannot build with old compiler
-
-PV_MODULES = pv% normativeTypes
-SKIP_BUILDS_5 = $(PV_MODULES)
-SKIP_BUILDS_OLD = $(PV_MODULES)
-SKIP_BUILDS_6 = $(SKIP_BUILDS_$(VX_OLD_GCC))
-SKIP_BUILDS = $(SKIP_BUILDS_$(VXWORKS_MAJOR_VERSION))

configure/os/CONFIG_SITE.RHEL7-x86_64.Common

@@ -1,5 +0,0 @@
-include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
-
-# Improved error checking with clang
-CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64-clang
-CROSS_COMPILER_RUNTEST_ARCHS += RHEL7-x86_64-clang

configure/os/CONFIG_SITE.RHEL8-x86_64.Common

@@ -1,7 +0,0 @@
-include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
-
-# Improved error checking with clang
-CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64-clang
-
-# Build for old RHEL7 64 bit
-CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64

configure/os/CONFIG_SITE.RHEL9-x86_64.Common

@@ -1,10 +0,0 @@
-include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
-
-# Improved error checking with clang
-CROSS_COMPILER_TARGET_ARCHS += RHEL9-x86_64-clang
-
-# Build for old RHEL8 64 bit
-CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64
-
-# Build for old RHEL7 64 bit
-CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64

configure/os/CONFIG_SITE.UnixCommon.Common

@@ -1,5 +0,0 @@
-# Make sure hosts tools find their libraries during build
-# even if FINAL_LOCATION differs from INSTALL_LOCATION
-ifneq ($(FINAL_LOCATION:$(INSTALL_LOCATION)=),)
-export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH:%=%:)$(INSTALL_HOST_LIB)
-endif

configure/os/CONFIG_SITE.linux-x86.Common

@@ -5,46 +5,3 @@
 
 #CROSS_COMPILER_TARGET_ARCHS = vxWorks-ppc32
 #CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100 RTEMS-pc386-qemu
-
-INSTALL_LOCATION=/usr/local/epics/base-$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
-
-GNU_HOST_ARCH=i686
-GNU_HOST_OS=linux
-
-# vxWorks for MVxxxx boards
-#CROSS_COMPILER_TARGET_ARCHS += T2-ppc604
-#CROSS_COMPILER_TARGET_ARCHS += V67-ppc604
-CROSS_COMPILER_TARGET_ARCHS += V69-ppc604
-#CROSS_COMPILER_TARGET_ARCHS += V69-ppc32
-
-# NI compact RIO
-#CROSS_COMPILER_TARGET_ARCHS += V63-ppc603
-
-# MOXA montavista linux (No PVA because of missing boost support)
-CROSS_COMPILER_TARGET_ARCHS += mvl40-xscale_be
-
-# MOXA SDK 4.2
-CROSS_COMPILER_TARGET_ARCHS += moxa42-armv6l
-
-# Virtex embedded PPC
-CROSS_COMPILER_TARGET_ARCHS += eldk51-ppc4xxSF
-
-# IOxOS IFC1210
-CROSS_COMPILER_TARGET_ARCHS += eldk52-e500v2
-
-# DeltaTau PowerPMAC
-CROSS_COMPILER_TARGET_ARCHS += eldk42-ppc4xxFP
-CROSS_COMPILER_TARGET_ARCHS += eldk53-ppc4xxFP
-
-# Test other vxWorks versions
-#CROSS_COMPILER_TARGET_ARCHS += V66-ppc603
-#CROSS_COMPILER_TARGET_ARCHS += V66-ppc604
-#CROSS_COMPILER_TARGET_ARCHS += V63-ppc604
-#CROSS_COMPILER_TARGET_ARCHS += V64-ppc604
-# (No PVA because of old compiler)
-#CROSS_COMPILER_TARGET_ARCHS += V62-ppc604
-
-# RTEMS (Can only have 1 RTEMS major version in 1 EPICS installation
-# because they overwrite their header files.)
-#CROSS_COMPILER_TARGET_ARCHS += RTEMS49-pc386
-CROSS_COMPILER_TARGET_ARCHS += RTEMS51-pc686

configure/os/CONFIG_SITE.linux-x86.RTEMS

@@ -4,5 +4,5 @@
 #-------------------------------------------------------
 
 # Needed by gcc
-export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(RTEMS_BASE)/lib
+export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(RTEMS_BASE)/lib
 

configure/os/CONFIG_SITE.linux-x86.linux-x86

@@ -3,6 +3,13 @@
 # Site specific definitions for linux-x86 host - linux-x86 target builds
 #-------------------------------------------------------
 
+# It makes sense to include debugging symbols even in optimized builds
+# in case you want to attach gdb to the process or examine a core-dump.
+# This does cost disk space, but not memory as debug symbols are not
+# loaded into RAM when the binary is loaded.
+OPT_CFLAGS_YES += -g
+OPT_CXXFLAGS_YES += -g
+
 # Uncomment the followings lines to build with CLANG instead of GCC.
 #
 #GNU         = NO

configure/os/CONFIG_SITE.linux-x86_64.Common

@@ -7,28 +7,3 @@
 #CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
 #CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100
 
-include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
-
-GNU_HOST_ARCH_64=x86_64
-
-# Windows cross builds using Wine
-CROSS_COMPILER_TARGET_ARCHS += windows-x64
-
-# IOxOS IFC1211
-#CROSS_COMPILER_TARGET_ARCHS += fslqoriq20-e6500_64
-
-# Zynq
-#CROSS_COMPILER_TARGET_ARCHS += yocto21-aarch64
-CROSS_COMPILER_TARGET_ARCHS += yocto40-aarch64
-
-# Debian 10
-CROSS_COMPILER_TARGET_ARCHS += deb10-x86_64
-
-# Newer DeltaTau PowerPMAC
-CROSS_COMPILER_TARGET_ARCHS += gcc8-ppc4xxFP
-
-# Raspberry Pi
-CROSS_COMPILER_TARGET_ARCHS += raspbian-arm
-
-# NI Linux Real-Time 7.x
-CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a

configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64

@@ -3,6 +3,13 @@
 # Site specific definitions for linux-x86_64 host - linux-x86_64 target builds
 #-------------------------------------------------------
 
+# It makes sense to include debugging symbols even in optimized builds
+# in case you want to attach gdb to the process or examine a core-dump.
+# This does cost disk space, but not memory as debug symbols are not
+# loaded into RAM when the binary is loaded.
+OPT_CFLAGS_YES += -g
+OPT_CXXFLAGS_YES += -g
+
 # Uncomment the followings lines to build with CLANG instead of GCC.
 #
 #GNU         = NO

documentation/RELEASE_NOTES.md

@@ -18,15 +18,8 @@ should also be read to understand what has changed since earlier releases:
 - [pva2pva](https://epics-base.github.io/pva2pva/release_notes.html)
 - [pvaClient](https://github.com/epics-base/pvaClientCPP/blob/master/documentation/RELEASE_NOTES.md)
 
-**This version of EPICS has not been released yet.**
 
-## Changes made on the 7.0 branch since 7.0.7
-
-### PROC field changed to ASL0
-
-The PROC field has been changed from access security level ASL1 to ASL0.
-This allows users to trigger processing a record without having the rights
-to reconfigure the records.
+## EPICS Release 7.0.8
 
 ### bi "Raw Soft Channel" use MASK
 
@@ -653,33 +646,6 @@ make INSTALL_LOCATION=/tmp/build FINAL_LOCATION=/usr/lib/epics
 `FINAL_LOCATION` is now correctly used in systemd and sysv init scripts
 `caRepeater.service`, `S99caRepeater`, and `S99logServer`.
 
-### epicsEnvShow accepts glob pattern
-
-The optional argument to epicsEnvShow can now be a glob pattern.
-
-### New function `epicsStrnGlobMatch()`
-
-The function `epicsStrnGlobMatch(char* str, size_t len, char* pattern)`
-works exactly the same as `epicsStrGlobMatch()` but takes an additional
-length arguments which limits the number of characters of `str` to match.
-
-### Glob pattern allowed in `var` command
-
-When used with one argument, the `var` command can be used with a glob pattern
-for printing matching variables.
-
-### Fix for input links marked "special"
-
-The calcout record (and a number of synApps record types) marks its input
-link fields with the attribute `special(SPC_MOD)` and provides code in
-the record's `special()` routine to reinitialize the related value field
-whenever the input link field is set to a numeric constant. Unfortunately the
-changes to the link handling code broke this behaviour (reported as Launchpad
-[bug #1824277](https://bugs.launchpad.net/epics-base/+bug/1824277))
-back in the Base 3.16.1 release. This issue has been fixed in Base, although
-external record types may require some fixing to ensure they are correctly
-checking for and initializing the link in their `special()` routine.
-
 ### IOCsh sets `${PWD}`
 
 IOC shell will now ensure `${PWD}` is set on startup,
@@ -769,33 +735,6 @@ that the variables referenced by output pointers are initialized.
 ```
 
 
-### Timeouts for Unit Test Programs
-
-The unit test programs that are run by the `make runtests` or `make tapfiles`
-commands get executed by a `.t` wrapper script which is normally generated by
-the EPICS `makeTestfile.pl` program. Those generated wrapper scripts now
-impose a time-limit on the test program they execute, and will kill it if it
-runs for longer than 500 seconds (8 minutes 20) without exiting. That
-time-limit can be changed for any such test by modifying the Makefile which
-creates and runs the `.t` wrapper script.
-
-Setting the environment variable `EPICS_UNITTEST_TIMEOUT` to the desired
-number of seconds while the Makefile is generating the test script changes the
-timeout in that script. For example:
-
-```
-  TESTSCRIPTS_HOST += hourLongTest.t
-  hourLongTest.t: export EPICS_UNITTEST_TIMEOUT=3600
-```
-
-When selecting such a timeout remember that different Continuous Integration
-systems such as GitHub Actions and Appveyor run on processors with different
-speeds, so allow enough head-room for slower systems to complete the test.
-
-Test programs written directly in Perl as a `.plt` script should implement a
-similar timeout for themselves. The "netget" test in Base does this in a way
-that works on Windows as well as Unix-like hosts.
-
 ### Timeouts for Unit Test Programs
 
 The unit test programs that are run by the `make runtests` or `make tapfiles`

documentation/ReleaseChecklist.html

@@ -48,14 +48,14 @@ everything that has to be done since it's so easy to miss steps.</p>
 <p>The following roles are used below:</p>
 
 <dl>
-  <dt><strong>Release Manager</strong> ()</dt>
+  <dt><strong>Release Manager</strong></dt>
     <dd>Responsible for managing and tagging the release</dd>
-  <dt><strong>Platform Developers</strong> (informal)</dt>
-    <dd>Responsible for individual operating system platforms</dd>
+  <dt><strong>Core Developers</strong></dt>
+    <dd>Responsible for maintaining the EPICS software</dd>
   <dt><strong>Application Developers</strong></dt>
     <dd>Responsible for support modules that depend on EPICS Base.</dd>
-  <dt><strong>APS Website Editor</strong> (Andrew Johnson)</dt>
-    <dd>Responsible for the APS EPICS website</dd>
+  <dt><strong>Website Editors</strong></dt>
+    <dd>Responsible for the EPICS websites</dd>
 </dl>
 
 <form>
@@ -72,23 +72,22 @@ everything that has to be done since it's so easy to miss steps.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Email all developers about the upcoming release and ask for a list
-        of remaining tasks that must be finished.</td>
+      <td>Notify core developers about the upcoming release and ask about any
+        remaining tasks that must be finished.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
       <td>All developers</td>
       <td>Check the bug tracker for any outstanding items and handle
-        appropriately. All bugs that have been fixed should have been marked
-        as Fix Committed.</td>
+        appropriately.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Set the Feature Freeze date, by which time all Git commits for
-        enhancements and new functionality should have been completed. After
-        this date, commits should only be made to fix problems that show up
-        during testing.</td>
+      <td>Set a Feature Freeze date, by which time all Git branches for
+        enhancements and new functionality should have been merged. After this
+        date, commits and merges should only be made to fix problems that show
+        up during testing.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
@@ -97,6 +96,7 @@ everything that has to be done since it's so easy to miss steps.</p>
       <td>Ensure that documentation will be updated before the release date:
         <ul>
           <li>Release Notes</li>
+          <li>Doxygen annotations</li>
           <li>Other documents</li>
         </ul>
       </td>
@@ -104,13 +104,8 @@ everything that has to be done since it's so easy to miss steps.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Review and update this checklist for the upcoming release.</td>
-      </tr>
-    <tr>
-      <td>&nbsp;</td>
-      <td>Release Manager</td>
-      <td>Create a release milestone on Launchpad. If a target release date is
-        known set "Date Targeted" to the expected release date.</td>
+      <td>Review and update this checklist for the upcoming release.
+        Update the release version number in the tags and messages below.</td>
       </tr>
     <tr>
       <th colspan="3">Testing</th>
@@ -118,7 +113,7 @@ everything that has to be done since it's so easy to miss steps.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Platform Developers</td>
-      <td>Run the built-in test programs on all available host platforms using
+      <td>Run the internal test programs on all available host platforms using
         <blockquote><tt>
           make -s runtests
         </tt></blockquote></td>
@@ -156,6 +151,7 @@ everything that has to be done since it's so easy to miss steps.</p>
       <td>Check that documentation has been updated:
         <ul>
           <li>Release Notes</li>
+          <li>Doxygen annotations</li>
           <li>Other documents</li>
           </ul>
         </td>
@@ -167,8 +163,8 @@ everything that has to be done since it's so easy to miss steps.</p>
     </tr>
     <tr>
       <td><input type="checkbox"></td>
-      <td>Release Manager</td>
-      <td>Obtain a positive <q>Ok to release</q> from developers.</td>
+      <td>Core Developers</td>
+      <td>Reach a consensus that the software is ready to release.</td>
       </tr>
     <tr>
       <th colspan="3">Creating the final release version</th>
@@ -191,27 +187,29 @@ everything that has to be done since it's so easy to miss steps.</p>
               cd base-7.0/modules/&lt;module&gt;/documentation<br />
               pandoc -f gfm -t html -o RELEASE_NOTES.html RELEASE_NOTES.md
               </tt></blockquote>
-            Commit changes (don't push).</li>
+            Commit these changes (don't push).</li>
 
           <li>Edit the module's release version file
-            <tt>configure/CONFIG_<i>module</i>_VERSION</tt> and its top-level
-            <tt>Doxyfile</tt>; set the <tt>DEVELOPMENT_FLAG</tt> value to 0 and
-            remove <tt>-dev</tt> from the <tt>PROJECT_NUMBER</tt> string.
-            Commit changes (don't push).</li>
+            <tt>configure/CONFIG_<i>module</i>_VERSION</tt> and the
+            <tt>Doxyfile</tt>s in the top-level and/or documentation
+            directories. In these, set <tt>DEVELOPMENT_FLAG</tt> to 0 and remove
+            <tt>-dev</tt> from the <tt>PROJECT_NUMBER</tt> string. Commit these
+            changes (don't push).</li>
 
           <li>Tag the module:
             <blockquote><tt>
-              git tag -m 'ANJ: Tag for EPICS 7.0.7' &lt;module-version&gt;
+              git tag -m 'ANJ: Tag for EPICS 7.0.8' &lt;module-version&gt;
               </tt></blockquote>
             </li>
 
           <li>Update the git submodule on the Base-7.0 branch to the
-            newly-tagged version, but don't commit yet:
+            newly-tagged version, check the module's status matches the tag:
             <blockquote><tt>
               cd base-7.0/modules<br />
               git add &lt;module&gt;<br />
               git submodule status --cached
               </tt></blockquote>
+            Don't commit the submodule updates yet.
             </li>
 
           <li>Edit the module's release version file
@@ -221,7 +219,8 @@ everything that has to be done since it's so easy to miss steps.</p>
             <tt>PROJECT_NUMBER</tt> string, appending <tt>-dev</tt> to the new
             module version number. Commit changes.</li>
 
-          <li>Push commits and the new tag to the submodule's GitHub repository:
+          <li>Push commits and the new tag to the submodule's GitHub repository
+            (assumed to be the <tt>upstream</tt> remote):
             <blockquote><tt>
               cd base-7.0/modules/&lt;module&gt;<br />
               git push --follow-tags upstream master
@@ -270,10 +269,9 @@ everything that has to be done since it's so easy to miss steps.</p>
       <td>Tag the epics-base module in Git:
         <blockquote><tt>
           cd base-7.0<br />
-          git tag -m 'ANJ: Tagged for release' R7.0.7
+          git tag -m 'ANJ: Tagged for release' R7.0.8
           </tt></blockquote>
-        <p>Don't push anything to the Launchpad repository
-          yet.</p>
+        <p>Don't push to GitHub yet.</p>
         </td>
       </tr>
     <tr>
@@ -305,12 +303,12 @@ everything that has to be done since it's so easy to miss steps.</p>
         files and directories that are only used for continuous integration:
         <blockquote><tt>
           cd base-7.0<br />
-          ./.tools/make-tar.sh R7.0.7 ../base-7.0.7.tar.gz base-7.0.7/
+          ./.tools/make-tar.sh R7.0.8 ../base-7.0.8.tar.gz base-7.0.8/
           </tt></blockquote>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
           cd ..<br />
-          gpg --armor --sign --detach-sig base-7.0.7.tar.gz
+          gpg --armor --sign --detach-sig base-7.0.8.tar.gz
           </tt></blockquote>
         </td>
       </tr>
@@ -318,8 +316,9 @@ everything that has to be done since it's so easy to miss steps.</p>
       <td><input type="checkbox"></td>
       <td>Release Manager</td>
       <td>Test the tar file by extracting its contents and building it on at
-        least one supported platform. When this succeeds the commits and new git
-        tag can be pushed to the Launchpad repository:
+        least one supported platform. If this succeeds the commits and new git
+        tag can be pushed to the GitHub repository's 7.0 branch (assumed to be
+        the <tt>upstream</tt> remote):
         <blockquote><tt>
           git push --follow-tags upstream 7.0
           </tt></blockquote>
@@ -367,7 +366,7 @@ everything that has to be done since it's so easy to miss steps.</p>
       </tr>
 
     <tr>
-      <th colspan="3">Publish to epics-controls</th>
+      <th colspan="3">Publish to epics-controls.org</th>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
@@ -375,7 +374,7 @@ everything that has to be done since it's so easy to miss steps.</p>
       <td>Upload the tar file and its <tt>.asc</tt> signature file to the
         epics-controls web-server.
         <blockquote><tt>
-          scp base-7.0.7.tar.gz base-7.0.7.tar.gz.asc epics-controls:download/base<br />
+          scp base-7.0.8.tar.gz base-7.0.8.tar.gz.asc epics-controls:download/base<br />
           </tt></blockquote>
         </td>
       </tr>
@@ -392,22 +391,22 @@ everything that has to be done since it's so easy to miss steps.</p>
       </tr>
 
     <tr>
-      <th colspan="3">Publish to Launchpad</th>
+      <th colspan="3">Publish to GitHub</th>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
       <td>Release Manager</td>
-      <td>Go to the Launchpad milestone for this release. Click the Create
-        release button and add the release date. Put a URL for the release page
-        in the Release notes box, and click the Create release button. Upload
-        the tar file and its <tt>.asc</tt> signature file to the new Launchpad
-        release page.</td>
+      <td>Go to the GitHub
+        <a href="https://github.com/epics-base/epics-base/releases/new?tag=R7.0.8">
+          Create release from tag R7.0.8</a> page.
+        Upload the tar file and its <tt>.asc</tt> signature file to the new
+        GitHub release page.</td>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
       <td>Release Manager</td>
-      <td>Find all Launchpad bug reports with the status Fix Committed which
-        have been fixed in this release and mark them Fix Released.</td>
+      <td>We used to close out bug reports in Launchpad at release-time, this
+        would be the time to do that if we have an equivalent on GitHub.</td>
       </tr>
 
     <tr>

epics-base.sh

@@ -1,6 +0,0 @@
-_OLD_EXTGLOB=$(shopt -p extglob)
-shopt -s extglob
-test -n "$EPICS_HOST_ARCH" || export EPICS_HOST_ARCH=$(/bin/sed "s%cpe:/o:redhat:enterprise_linux:\([0-9]*\).*%RHEL\1-`/bin/uname -m`%" /etc/system-release-cpe)
-PATH=${PATH//?(:)\/usr\/local\/epics\/base-+([0-9]).+([0-9]).+([0-9])\/bin\/$EPICS_HOST_ARCH}:$EPICS_BASE/bin/$EPICS_HOST_ARCH
-eval $_OLD_EXTGLOB
-unset _OLD_EXTGLOB

epics-base.spec

@@ -1,479 +0,0 @@
-# Always make sure EpicsVersion.Version-Release matches the git tag!
-
-%define EpicsVersion 7.0.7
-
-Name:           epics-base-%{EpicsVersion}
-Summary:        EPICS Base %{EpicsVersion}
-Version:        1
-Release:        7%{?dist}
-License:        EPICS Open License
-Group:          Development/Languages
-URL:            https://git.psi.ch/epics_base/base-7.0
-
-Obsoletes:      caRepeater = 1
-
-%define module_name                          %{name}
-%define prog_folder                          /usr/local/epics/base-%{EpicsVersion}
-
-%define debug_package                        %{nil}
-
-# do not strip libraries
-%global __strip                              /bin/true
-%undefine __brp_strip
-
-%undefine __brp_mangle_shebangs
-%undefine __brp_ldconfig
-%define _binaries_in_noarch_packages_terminate_build 0
-
-%if %{defined rhel}
-%global epics_host_arch RHEL%{rhel}-%{_host_cpu}
-%endif
-# else define epics_host_arch as suitable
-
-%description
-EPICS is a set of Open Source software tools, libraries and applications
-developed collaboratively and used worldwide to create distributed soft
-real-time control systems for scientific instruments such as a particle
-accelerators, telescopes and other large scientific experiments.
-This RPM is a binary-only package.
-
-###########################################
-
-%package host-devel
-Requires:       make >= 3.80
-BuildRequires:  make >= 3.80
-BuildRequires:  gfa-cross-compiler-links
-BuildRequires:  wine
-
-Summary:    Minimal stuff needed to build EPICS host apps
-Requires:   %{name} = %{version}-%{release}
-
-# This EPICS installation uses the toolset 12 compiler
-%if 0%{?rhel} == 7
-Requires:       devtoolset-12-gcc-c++
-BuildRequires:  devtoolset-12-gcc-c++
-%endif
-
-%if 0%{?rhel} >= 8
-Requires:       gcc-toolset-12-gcc-c++
-BuildRequires:  gcc-toolset-12-gcc-c++
-%endif
-
-# The perl stuff we need
-Requires:       perl-interpreter >= 5.10.1
-BuildRequires:  perl-interpreter >= 5.10.1
-
-%if 0%{?rhel} >= 7
-Requires:       perl-File-Path perl-Getopt-Long perl-Pod-Usage perl-Time-HiRes perl-Data-Dumper perl-Scalar-List-Utils
-BuildRequires:  perl-File-Path perl-Getopt-Long perl-Pod-Usage perl-Time-HiRes perl-Data-Dumper perl-Scalar-List-Utils
-%endif
-
-%if 0%{?rhel} >= 8
-Requires:       perl-Text-Tabs+Wrap
-BuildRequires:  perl-Text-Tabs+Wrap
-%endif
-
-%if 0%{?rhel} >= 9
-Requires:       perl-File-Find perl-File-Basename perl-File-Copy perl-FindBin perl-Getopt-Std perl-POSIX
-BuildRequires:  perl-File-Find perl-File-Basename perl-File-Copy perl-FindBin perl-Getopt-Std perl-POSIX
-%endif
-
-%if 0%{?rhel} == 7
-# Perl auto-detection is broken
-# It does not find all EPICS internal packages
-%global __requires_exclude_from ^%{prog_folder}/bin/.*\\.pl$
-%endif
-
-%description host-devel
-Contains headers etc to build EPICS host applications.
-
-###########################################
-
-%package compat
-Summary:        EPICS base %{EpicsVersion} for other RHEL versions
-Requires:       %{name} = %{version}-%{release}
-AutoReqProv:    no
-
-%description compat
-Contains EPICS binaries that run on other RHEL versions.
-
-###########################################
-
-%package wine
-Summary:        EPICS base %{EpicsVersion} for wine
-Requires:       %{name} = %{version}-%{release}
-Requires:       wine
-
-%description wine
-Allows to run EPICS in wine.
-
-###########################################
-
-%package boot
-Summary:        EPICS base %{EpicsVersion} for boot servers
-BuildArch:      noarch
-AutoReqProv:    no
-Prefix:         /usr/local/epics
-
-%description boot
-Contains files needed on NFS server to boot EPICS targets from.
-This package can be relocated.
-
-###########################################
-
-%package devel
-Summary:        EPICS base %{EpicsVersion} for development environments
-Requires:       %{name}             = %{version}-%{release}
-Requires:       %{name}-host-devel  = %{version}-%{release}
-Requires:       gfa-cross-compiler-links
-BuildArch:      noarch
-AutoReqProv:    no
-
-%description devel
-All what is needed to develop EPICS for different target architectures.
-
-###########################################
-
-%package devel-static
-Summary:        EPICS base %{EpicsVersion} for development environments including static libraries
-Requires:       %{name}-devel = %{version}-%{release}
-BuildArch:      noarch
-AutoReqProv:    no
-
-%description devel-static
-Contains the static libraries (*.a) for EPICS development systems.
-Only needed to build statically linked applications.
-
-###########################################
-
-%package src
-Summary:        Sources code of EPICS base %{EpicsVersion}
-BuildArch:      noarch
-AutoReqProv:    no
-Prefix:         /usr/local/epics
-
-%description src
-The source code of EPICS base %{EpicsVersion}.
-May help when debugging
-
-###########################################
-
-%package doc
-Summary:        EPICS base %{EpicsVersion} documentation
-BuildArch:      noarch
-AutoReqProv:    no
-Prefix:         /usr/local/epics
-
-%description doc
-The documentation of EPICS base %{EpicsVersion}.
-
-###########################################
-
-# Our sources are locally in this directory
-# and here we also build
-# RPMS will be stored here, too
-%define _topdir %(pwd)
-%define _sourcedir %{_topdir}
-%define _builddir %{_topdir}
-
-%prep
-%{__rm} -rf %{buildroot}/usr/lib
-%{__rm} -f modules/RELEASE.*.local
-git submodule update --init --recursive modules
-%{__mkdir_p} RPMS
-
-%build
-%if %{defined epics_host_arch}
-export EPICS_HOST_ARCH=%{epics_host_arch}
-%endif
-%{__make} INSTALL_LOCATION=%{buildroot}%{prog_folder} FINAL_LOCATION=%{prog_folder}
-%{__make} INSTALL_LOCATION=%{buildroot}%{prog_folder} copysrc
-
-# remove files we do not need
-shopt -s extglob
-%{__rm} -f %{buildroot}%{prog_folder}/bin/{V,RTEMS}*/{*Harness,softIoc,softIocPVA}
-%{__rm} -f %{buildroot}%{prog_folder}/bin/RTEMS*/TEMP.*
-
-# fix permissions of caRepeater.service
-%{__chmod} 644 %{buildroot}%{prog_folder}/bin/*/caRepeater.service
-
-# install the profile script
-/bin/sed 's!\$EPICS_BASE!%{prog_folder}!' epics-base.sh > %{buildroot}%{prog_folder}/bin/epics-base.sh
-
-# copy over old libraries for compatibility
-%if %{?rhel} > 7
-%{__cp} /opt/RHEL7/lib64/libreadline.so.6 %{buildroot}%{prog_folder}/lib/RHEL7-x86_64
-%endif
-%if %{?rhel} > 8
-%{__cp} /opt/RHEL7/lib64/libtinfo.so.5 %{buildroot}%{prog_folder}/lib/RHEL7-x86_64
-%{__cp} /opt/RHEL8/lib64/libreadline.so.7 %{buildroot}%{prog_folder}/lib/RHEL8-x86_64
-%endif
-
-# Do not use install section because build already installed
-# and install will delete our buildroot!
-
-%clean
-%{__make} realclean
-%{__rm} -f modules/RELEASE.*.local
-%{__rm} -rf %{buildroot}
-%{__cp} %{_rpmdir}/*/%{name}*%{version}-%{release}.*.rpm %{_sourcedir}
-
-# Link caRepeater and profile script to highest installed EPICS version after install and uninstall
-%post
-shopt -s extglob
-%{__rm} -f /etc/profile.d/epics-base.sh
-%{__ln_s} "$(/usr/bin/ls -dvr1 /usr/local/epics/base-+([0-9]).+([0-9]).+([0-9])/bin/epics-base.sh | /usr/bin/head -n1)" /etc/profile.d/
-SYSTEMD_DIR=$(pkg-config systemd --variable=systemdsystemunitdir)
-if [ -n "$SYSTEMD_DIR" ]
-then
-    %{__rm} -f $SYSTEMD_DIR/caRepeater.service
-    LATEST_REPEATER=$(/usr/bin/ls -dvr1 /usr/local/epics/base-+([0-9]).+([0-9]).+([0-9])/bin/%{epics_host_arch}/caRepeater.service | /usr/bin/head -n1)
-    %{__ln_s} $LATEST_REPEATER $SYSTEMD_DIR/
-    systemctl daemon-reload
-    systemctl reenable caRepeater.service
-    systemctl start caRepeater.service
-fi
-
-%postun
-shopt -s extglob
-%{__rm} -f /etc/profile.d/epics-base.sh
-%{__ln_s} "$(/usr/bin/ls -dvr1 /usr/local/epics/base-+([0-9]).+([0-9]).+([0-9])/bin/epics-base.sh 2>/dev/null | /usr/bin/head -n1)" /etc/profile.d/ 2>/dev/null
-SYSTEMD_DIR=$(pkg-config systemd --variable=systemdsystemunitdir)
-if [ -n "$SYSTEMD_DIR" ]
-then
-    LATEST_REPEATER=$(/usr/bin/ls -dvr1 /usr/local/epics/base-+([0-9]).+([0-9]).+([0-9])/bin/%{epics_host_arch}/caRepeater.service 2>/dev/null | /usr/bin/head -n1)
-    if [ -z "$LATEST_REPEATER" ]
-    then
-        systemctl disable caRepeater.service
-        # Do not stop or restart caRepeater.service
-        # because EPICS clients cannot handle that.
-        # Next reboot will take care of this.
-    fi
-    %{__rm} -f $SYSTEMD_DIR/caRepeater.service
-    if [ -n "$LATEST_REPEATER" ]
-    then
-        %{__ln_s} $LATEST_REPEATER $SYSTEMD_DIR/ 2>/dev/null
-        systemctl reenable caRepeater.service
-    fi
-    systemctl daemon-reload
-fi
-
-%files
-%defattr(-,root,root,-)
-%dir %{prog_folder}
-%dir %{prog_folder}/configure
-%{prog_folder}/configure/CONFIG_BASE_VERSION
-
-%dir %{prog_folder}/dbd
-%{prog_folder}/dbd/softIoc*.dbd
-
-%dir %{prog_folder}/bin
-%dir %{prog_folder}/lib
-%{prog_folder}/db
-
-%{prog_folder}/bin/epics-base.sh
-%{prog_folder}/lib/perl/EpicsHostArch.pl
-%{prog_folder}/lib/perl/CA.pm
-%dir %{prog_folder}/lib/perl
-%dir %{prog_folder}/lib/perl/*
-%dir %{prog_folder}/lib/perl/*/*-linux-thread-multi
-%{prog_folder}/lib/perl/*/*-linux-thread-multi/libCap5.so
-
-# Install host binaries but avoid installing *.pl scripts
-# and other development tools
-
-%dir %{prog_folder}/bin/%{epics_host_arch}*
-%{prog_folder}/bin/%{epics_host_arch}*/[Scips]*[^.]??
-%{prog_folder}/bin/%{epics_host_arch}*/p2p
-%{prog_folder}/bin/%{epics_host_arch}*/msi
-%dir %{prog_folder}/lib/%{epics_host_arch}*
-%{prog_folder}/lib/%{epics_host_arch}*/*.so*
-
-###########################################
-
-%files compat
-%if %{?rhel} > 7
-%dir %{prog_folder}/bin/RHEL7*
-%{prog_folder}/bin/RHEL7*/[Scips]*[^.]??
-%{prog_folder}/bin/RHEL7*/p2p
-%{prog_folder}/bin/RHEL7*/msi
-%dir %{prog_folder}/lib/RHEL7*
-%{prog_folder}/lib/RHEL7*/*.so*
-%endif
-
-%if %{?rhel} > 8
-%dir %{prog_folder}/bin/RHEL8*
-%{prog_folder}/bin/RHEL8*/[Scips]*[^.]??
-%{prog_folder}/bin/RHEL8*/p2p
-%{prog_folder}/bin/RHEL8*/msi
-%dir %{prog_folder}/lib/RHEL8*
-%{prog_folder}/lib/RHEL8*/*.so*
-%endif
-
-%if %{?rhel} > 9
-%dir %{prog_folder}/bin/RHEL9*
-%{prog_folder}/bin/RHEL9*/[Scips]*[^.]??
-%{prog_folder}/bin/RHEL9*/p2p
-%{prog_folder}/bin/RHEL9*/msi
-%dir %{prog_folder}/lib/RHEL9*
-%{prog_folder}/lib/RHEL9*/*.so*
-%endif
-
-###########################################
-
-%files wine
-%{prog_folder}/bin/win*
-
-###########################################
-
-%files boot
-%defattr(-,root,root,-)
-%dir %{prog_folder}
-%dir %{prog_folder}/configure
-%{prog_folder}/configure/CONFIG_BASE_VERSION
-
-%dir %{prog_folder}/dbd
-%{prog_folder}/dbd/softIoc*.dbd
-%{prog_folder}/db
-
-%dir %{prog_folder}/lib
-# avoid pulling in pkgconfig and perl
-%dir %{prog_folder}/lib/[a-z]*-*
-%{prog_folder}/lib/[a-z]*-*/*.so*
-
-%dir %{prog_folder}/bin
-# avoid pulling in host files again
-# but get all cross architectures (mostly lower case)
-# including all Windows dlls (hence listed twice: here and in wine)
-%dir %{prog_folder}/bin/[a-z]*
-%{prog_folder}/bin/[a-z]*/[Scips]*[^.]??
-%{prog_folder}/bin/[a-z]*/msi*
-%{prog_folder}/bin/[a-z]*/acctst*
-%{prog_folder}/bin/[a-z]*/*.dll
-
-# vxWorks and RTEMS
-%dir %{prog_folder}/bin/V*
-%{prog_folder}/bin/V*/*.munch
-%{prog_folder}/bin/V*/*.o
-%dir %{prog_folder}/bin/RTEMS*
-%{prog_folder}/bin/RTEMS*/*.boot
-
-###########################################
-
-%files host-devel
-%defattr(-,root,root,-)
-%dir %{prog_folder}/include
-%{prog_folder}/include/*.h
-%{prog_folder}/include/compiler
-%dir %{prog_folder}/include/os
-%{prog_folder}/include/os/Linux/
-%{prog_folder}/include/os/WIN32/
-%{prog_folder}/include/pv/
-%{prog_folder}/include/pva/
-%{prog_folder}/include/valgrind/
-%{prog_folder}/include/flex.skel.static
-%{prog_folder}/templates
-%dir %{prog_folder}/cfg
-%{prog_folder}/cfg/CONFIG*
-%{prog_folder}/cfg/TOOLCHAIN.%{epics_host_arch}*.%{epics_host_arch}*
-%{prog_folder}/cfg/TOOLCHAIN.%{epics_host_arch}*.win*
-%dir %{prog_folder}/configure
-%{prog_folder}/configure/RELEASE
-%{prog_folder}/configure/CONFIG*
-%{prog_folder}/configure/RULES*
-%dir %{prog_folder}/configure/os
-%{prog_folder}/configure/os/CONFIG.Common.UnixCommon
-%{prog_folder}/configure/os/CONFIG.Common.linuxCommon
-%{prog_folder}/configure/os/CONFIG.Common.linux-clang
-%{prog_folder}/configure/os/CONFIG.Common.linux-%{_host_cpu}*
-%{prog_folder}/configure/os/CONFIG.Common.%{epics_host_arch}*
-%{prog_folder}/configure/os/CONFIG.UnixCommon.Common
-%{prog_folder}/configure/os/CONFIG.%{epics_host_arch}*.Common
-%{prog_folder}/configure/os/CONFIG.%{epics_host_arch}*.%{epics_host_arch}*
-%{prog_folder}/configure/os/CONFIG.linux-%{__isa_name}*.Common
-%{prog_folder}/configure/os/CONFIG.linux-%{__isa_name}*.linux-%{__isa_name}*
-%{prog_folder}/configure/os/CONFIG.linux-%{__isa_name}*.win*
-%{prog_folder}/configure/os/CONFIG.Linux.win*
-%{prog_folder}/configure/os/CONFIG.win*.win*
-%{prog_folder}/configure/os/CONFIG_SITE.Common.linuxCommon
-%{prog_folder}/configure/os/CONFIG_SITE.Common.linux-%{__isa_name}*
-%{prog_folder}/configure/os/CONFIG_SITE.%{epics_host_arch}*.Common
-%{prog_folder}/configure/os/CONFIG_SITE.linux-%{__isa_name}*.Common
-%{prog_folder}/configure/os/CONFIG_SITE.linux-%{__isa_name}*.UnixCommon
-%{prog_folder}/configure/os/CONFIG_SITE.linux-%{__isa_name}*.linux-%{__isa_name}*
-%{prog_folder}/bin/%{epics_host_arch}*/[^Scips]*[^.]??
-%{prog_folder}/bin/%{epics_host_arch}*/*.??
-%dir %{prog_folder}/lib/pkgconfig
-%{prog_folder}/lib/pkgconfig/epics-base.pc
-%{prog_folder}/lib/pkgconfig/epics-base-%{epics_host_arch}*.pc
-%{prog_folder}/lib/perl/EPICS
-%{prog_folder}/lib/perl/DBD*
-%{prog_folder}/dbd
-
-###########################################
-
-%files devel
-%defattr(-,root,root,-)
-%{prog_folder}/include/os/vxWorks/
-%{prog_folder}/include/os/RTEMS/
-%exclude %{prog_folder}/cfg/TOOLCHAIN.%{epics_host_arch}*.%{epics_host_arch}*
-%exclude %{prog_folder}/cfg/TOOLCHAIN.%{epics_host_arch}*.win*
-%{prog_folder}/cfg/TOOLCHAIN.*
-%exclude %{prog_folder}/configure/os/CONFIG.Common.%{epics_host_arch}*
-%exclude %{prog_folder}/configure/os/CONFIG.Common.UnixCommon
-%exclude %{prog_folder}/configure/os/CONFIG.Common.linuxCommon
-%exclude %{prog_folder}/configure/os/CONFIG.Common.linux-clang
-%exclude %{prog_folder}/configure/os/CONFIG.Common.linux-%{_host_cpu}*
-%exclude %{prog_folder}/configure/os/CONFIG.UnixCommon.Common
-%exclude %{prog_folder}/configure/os/CONFIG.%{epics_host_arch}*.Common
-%exclude %{prog_folder}/configure/os/CONFIG.%{epics_host_arch}*.%{epics_host_arch}*
-%exclude %{prog_folder}/configure/os/CONFIG.linux-%{__isa_name}*.Common
-%exclude %{prog_folder}/configure/os/CONFIG.linux-%{__isa_name}*.linux-%{__isa_name}*
-%exclude %{prog_folder}/configure/os/CONFIG.linux-%{__isa_name}*.win*
-%exclude %{prog_folder}/configure/os/CONFIG.Linux.win*
-%exclude %{prog_folder}/configure/os/CONFIG.win*.win*
-%exclude %{prog_folder}/configure/os/CONFIG_SITE.Common.linuxCommon
-%exclude %{prog_folder}/configure/os/CONFIG_SITE.Common.linux-%{__isa_name}*
-%exclude %{prog_folder}/configure/os/CONFIG_SITE.%{epics_host_arch}*.Common
-%exclude %{prog_folder}/configure/os/CONFIG_SITE.linux-%{__isa_name}*.Common
-%exclude %{prog_folder}/configure/os/CONFIG_SITE.linux-%{__isa_name}*.UnixCommon
-%exclude %{prog_folder}/configure/os/CONFIG_SITE.linux-%{__isa_name}*.linux-%{__isa_name}*
-%{prog_folder}/configure/os/
-%exclude %{prog_folder}/lib/pkgconfig/epics-base.pc
-%exclude %{prog_folder}/lib/pkgconfig/epics-base-%{epics_host_arch}*.pc
-%{prog_folder}/lib/pkgconfig/
-%exclude %{prog_folder}/bin/%{epics_host_arch}*/[^Scips]*[^.]??
-%exclude %{prog_folder}/bin/%{epics_host_arch}*/*.??
-%exclude %{prog_folder}/bin/*/[^Scips]*[^.]??
-%exclude %{prog_folder}/bin/*/*.??
-
-# VxWorks and RTEMS need static libs
-%{prog_folder}/lib/V*
-%{prog_folder}/lib/RTEMS*
-%{prog_folder}/lib/win*
-
-###########################################
-
-%files devel-static
-%defattr(-,root,root,-)
-
-# Install bulky static libs for Linux targets only on request
-%dir %{prog_folder}/lib/RHEL*
-%{prog_folder}/lib/RHEL*/*.a
-%dir %{prog_folder}/lib/[a-z]*
-%{prog_folder}/lib/[a-z]*/*.a
-
-###########################################
-
-%files src
-%defattr(-,root,root,-)
-%dir %{prog_folder}
-%{prog_folder}/modules
-
-###########################################
-
-%files doc
-%defattr(-,root,root,-)
-%dir %{prog_folder}
-%docdir %{prog_folder}/html
-%{prog_folder}/html

modules/Makefile

@@ -34,12 +34,6 @@ pvDatabase_DEPEND_DIRS = pvAccess
 SUBMODULES += pva2pva
 pva2pva_DEPEND_DIRS = pvAccess
 
-SUBMODULES += example
-example_DEPEND_DIRS = pva2pva pvaClient
-
-SUBMODULES += pcas
-pcas_DEPEND_DIRS = ca
-
 # Allow sites to add extra submodules
 -include Makefile.local
 

modules/ca/src/client/acctst.c

@@ -2575,7 +2575,8 @@ void monitorUpdateTest ( chid chan, unsigned interestLevel )
     SEVCHK ( ca_get ( DBR_FLOAT, chan, &temp ), NULL );
     SEVCHK ( ca_pend_io ( timeoutToPendIO ), NULL );
 
-    /* printf ( "flow control bypassed %u events\n", flowCtrlCount ); */
+    if (0)
+        printf ( "flow control bypassed %u events\n", flowCtrlCount );
 
     showProgressEnd ( interestLevel );
 }

modules/ca/src/client/cac.cpp

@@ -25,6 +25,7 @@
 #include <stdexcept>
 #include <string> // vxWorks 6.0 requires this include
 
+#include "epicsStdio.h"
 #include "dbDefs.h"
 #include "epicsGuard.h"
 #include "epicsVersion.h"
@@ -1008,7 +1009,7 @@ bool cac::defaultExcep (
     char buf[512];
     char hostName[64];
     iiu.getHostName ( guard, hostName, sizeof ( hostName ) );
-    sprintf ( buf, "host=%s ctx=%.400s", hostName, pCtx );
+    epicsSnprintf( buf, sizeof(buf), "host=%s ctx=%.400s", hostName, pCtx );
     this->notify.exception ( guard, status, buf, 0, 0u );
     return true;
 }
@@ -1312,7 +1313,7 @@ void cac::pvMultiplyDefinedNotify ( msgForMultiplyDefinedPV & mfmdpv,
     const char * pChannelName, const char * pAcc, const char * pRej )
 {
     char buf[256];
-    sprintf ( buf, "Channel: \"%.64s\", Connecting to: %.64s, Ignored: %.64s",
+    epicsSnprintf( buf, sizeof(buf), "Channel: \"%.64s\", Connecting to: %.64s, Ignored: %.64s",
             pChannelName, pAcc, pRej );
     {
         callbackManager mgr ( this->notify, this->cbMutex );

modules/database/src/ioc/as/asIocRegister.c

@@ -90,7 +90,7 @@ static const iocshFuncDef asprulesFuncDef = {
     "asprules",1,asprulesArgs,
     "List rules of an Access Security Group.\n"
     "If no Group is specified then list the rules for all groups\n"
-    "Example: asprules mygroup"
+    "Example: asprules mygroup\n"
 };
 static void asprulesCallFunc(const iocshArgBuf *args)
 {

modules/database/src/ioc/db/Makefile

@@ -42,7 +42,6 @@ INC += dbState.h
 INC += db_access_routines.h
 INC += db_convert.h
 INC += dbUnitTest.h
-INC += dbCaPvt.h
 
 # Generate menuGlobal.dbd, not really by concatenation, see RULES
 DBDCAT += menuGlobal.dbd

modules/database/src/ioc/db/dbAccess.c

@@ -1172,6 +1172,8 @@ static long dbPutFieldLink(DBADDR *paddr,
 
     if (!status) status = dbSetLink(plink, &link_info, new_devsup);
 
+    if (!status && special) status = dbPutSpecial(paddr, 1);
+
     if (status) {
         if (isDevLink) {
             precord->dset = NULL;
@@ -1180,60 +1182,29 @@ static long dbPutFieldLink(DBADDR *paddr,
         goto postScanEvent;
     }
 
-    /* We need to initialize any links with a link support layer, i.e.
-     * any CONSTANT, JSON_LINK, or PV_LINK types. However for a PV_LINK
-     * when isDevLink is set (i.e. this is the record's INP or OUT link)
-     * we must wait until after calling dsxt->add_record(). This allows
-     * the Async Soft Channel input supports to change it to a PN_LINK.
-     * For other cases we initialize the link before the second call to
-     * dbPutSpecial() because some record types such as calcout need to
-     * be able to call link support methods from prset->special().
-     */
-
-    switch (plink->type) { /* New type */
-    case PV_LINK:
-        if (isDevLink)
-            break;
-        /* else fall through */
-    case CONSTANT:
-    case JSON_LINK:
-        dbAddLink(&locker, plink, pfldDes->field_type, chan);
-        chan = NULL; /* we used it, don't clean it up */
-    }
-
-    if (special) status = dbPutSpecial(paddr, 1);
-
-    if (!status && isDevLink) {
+    if (isDevLink) {
         precord->dpvt = NULL;
         precord->dset = new_dset;
         precord->pact = FALSE;
 
         status = new_dsxt->add_record(precord);
-    }
-
-    if (status) {
-        if (isDevLink) {
+        if (status) {
             precord->dset = NULL;
             precord->pact = TRUE;
+            goto postScanEvent;
         }
-        goto postScanEvent;
     }
 
     switch (plink->type) { /* New link type */
-    case CONSTANT:
-    case CA_LINK:
-    case DB_LINK:
-    case PN_LINK:
-    case JSON_LINK:
-        break;
-
     case PV_LINK:
-        if (isDevLink) {
-            dbAddLink(&locker, plink, pfldDes->field_type, chan);
-            chan = NULL; /* we used it, don't clean it up */
-        }
+    case CONSTANT:
+    case JSON_LINK:
+        dbAddLink(&locker, plink, pfldDes->field_type, chan);
+        chan = NULL; /* don't clean it up */
         break;
 
+    case DB_LINK:
+    case CA_LINK:
     case MACRO_LINK:
         break;  /* should never get here */
 
@@ -1242,6 +1213,7 @@ static long dbPutFieldLink(DBADDR *paddr,
             status = S_db_badHWaddr;
             goto postScanEvent;
         }
+        break;
     }
     db_post_events(precord, plink, DBE_VALUE | DBE_LOG);
 

modules/database/src/ioc/db/dbCommon.dbd.pod

@@ -240,7 +240,6 @@ The B<SPVT> field is for internal use by the scanning system.
 	}
 	field(PROC,DBF_UCHAR) {
 		prompt("Force Processing")
-		asl(ASL0)
 		pp(TRUE)
 		interest(3)
 	}

modules/database/src/ioc/db/dbConvertJSON.c

@@ -26,7 +26,7 @@ typedef struct parseContext {
     short dbrType;
     short dbrSize;
     char *pdest;
-    size_t elems;
+    int elems;
 } parseContext;
 
 static int dbcj_null(void *ctx) {
@@ -64,20 +64,19 @@ static int dbcj_double(void *ctx, double num) {
     return 1;
 }
 
+static int dblsj_number(void *ctx, const char *val, size_t len) {
+    errlogPrintf("dbLSConvertJSON: Numeric value %.*s provided, string expected\n",
+        (int)len, val);
+    return 0;    /* Illegal */
+}
+
 static int dbcj_string(void *ctx, const unsigned char *val, size_t len) {
     parseContext *parser = (parseContext *) ctx;
     char *pdest = parser->pdest;
 
-    if (parser->dbrType == DBF_CHAR || parser->dbrType == DBF_UCHAR) {
-        /* Treating char array as long string */
-        if (len > parser->elems)
-            len = parser->elems;
-        strncpy(pdest, (const char *) val, len);
-        parser->elems -= len;
-        parser->pdest += len;
-        return 1;
-    }
-
+    /* Not attempting to handle char-array fields here, they need more
+     * metadata about the field than we have available at the moment.
+     */
     if (parser->dbrType != DBF_STRING) {
         errlogPrintf("dbConvertJSON: String \"%.*s\" provided, numeric value expected\n",
             (int)len, val);
@@ -95,6 +94,21 @@ static int dbcj_string(void *ctx, const unsigned char *val, size_t len) {
     return 1;
 }
 
+static int dblsj_string(void *ctx, const unsigned char *val, size_t len) {
+    parseContext *parser = (parseContext *) ctx;
+    char *pdest = parser->pdest;
+
+    if (parser->elems > 0) {
+        if (len > parser->dbrSize - 1)
+            len = parser->dbrSize - 1;
+        strncpy(pdest, (const char *) val, len);
+        pdest[len] = 0;
+        parser->pdest = pdest + len;
+        parser->elems = 0;
+    }
+    return 1;
+}
+
 static int dbcj_start_map(void *ctx) {
     errlogPrintf("dbConvertJSON: Map type not supported\n");
     return 0;    /* Illegal */
@@ -134,11 +148,6 @@ long dbPutConvertJSON(const char *json, short dbrType,
         return 0;
     }
 
-    if (!jlen) {
-        *pnRequest = 0;
-        return 0;
-    }
-
     parser->depth = 0;
     parser->dbrType = dbrType;
     parser->dbrSize = dbValueSize(dbrType);
@@ -174,10 +183,20 @@ long dbPutConvertJSON(const char *json, short dbrType,
     return status;
 }
 
+
+static yajl_callbacks dblsj_callbacks = {
+    dbcj_null, dbcj_boolean, NULL, NULL, dblsj_number, dblsj_string,
+    dbcj_start_map, NULL, NULL,
+    dbcj_start_array, NULL
+};
+
 long dbLSConvertJSON(const char *json, char *pdest, epicsUInt32 size,
     epicsUInt32 *plen)
 {
-    long nRequest = size-1;
+    parseContext context, *parser = &context;
+    yajl_handle yh;
+    yajl_status ys;
+    size_t jlen = strlen(json);
     long status;
 
     if (!size) {
@@ -185,8 +204,35 @@ long dbLSConvertJSON(const char *json, char *pdest, epicsUInt32 size,
         return 0;
     }
 
-    status = dbPutConvertJSON(json, DBF_CHAR, pdest, &nRequest);
-    pdest[nRequest++] = 0;
-    *plen = nRequest;
+    parser->depth = 0;
+    parser->dbrType = DBF_STRING;
+    parser->dbrSize = size;
+    parser->pdest = pdest;
+    parser->elems = 1;
+
+    yh = yajl_alloc(&dblsj_callbacks, NULL, parser);
+    if (!yh) {
+        errlogPrintf("dbLSConvertJSON: out of memory\n");
+        return S_db_noMemory;
+    }
+
+    ys = yajl_parse(yh, (const unsigned char *) json, jlen);
+
+    switch (ys) {
+    case yajl_status_ok:
+        *plen = (char *) parser->pdest - pdest + 1;
+        status = 0;
+        break;
+
+    default: {
+            unsigned char *err = yajl_get_error(yh, 1,
+                (const unsigned char *) json, jlen);
+            errlogPrintf("dbLSConvertJSON: %s", err);
+            yajl_free_error(yh, err);
+            status = S_db_badField;
+        }
+    }
+
+    yajl_free(yh);
     return status;
 }

modules/database/src/ioc/db/dbUnitTest.c

@@ -50,6 +50,7 @@ void testdbPrepare(void)
 {
     if(!testEvtLock)
         testEvtLock = epicsMutexMustCreate();
+    initHookAnnounce(initHookAfterPrepareDatabase);
 }
 
 void testdbReadDatabase(const char* file,
@@ -94,6 +95,7 @@ void testIocShutdownOk(void)
 
 void testdbCleanup(void)
 {
+    initHookAnnounce(initHookBeforeCleanupDatabase);
     dbFreeBase(pdbbase);
     db_cleanup_events();
     initHookFree();

modules/database/src/ioc/dbStatic/dbCompleteRecord.cpp

@@ -6,6 +6,7 @@
 \*************************************************************************/
 
 #include <algorithm>
+#include <limits>
 #include <string>
 #include <set>
 

modules/database/src/ioc/dbStatic/dbStaticLib.c

@@ -2204,12 +2204,12 @@ long dbInitRecordLinks(dbRecordType *rtyp, struct dbCommon *prec)
              */
 
         } else if(dbCanSetLink(plink, &link_info, devsup)!=0) {
-            errlogPrintf(ERL_ERROR ": %s.%s: can't initialize link type %d with \"%s\" (type %s)\n",
-                         prec->name, pflddes->name, plink->type, plink->text, pamaplinkType[link_info.ltype].strvalue);
+            errlogPrintf(ERL_ERROR ": %s.%s: can't initialize link type %d with \"%s\" (type %d)\n",
+                         prec->name, pflddes->name, plink->type, plink->text, link_info.ltype);
 
         } else if(dbSetLink(plink, &link_info, devsup)) {
-            errlogPrintf(ERL_ERROR ": %s.%s: failed to initialize link type %d with \"%s\" (type %s)\n",
-                         prec->name, pflddes->name, plink->type, plink->text, pamaplinkType[link_info.ltype].strvalue);
+            errlogPrintf(ERL_ERROR ": %s.%s: failed to initialize link type %d with \"%s\" (type %d)\n",
+                         prec->name, pflddes->name, plink->type, plink->text, link_info.ltype);
         }
         free(plink->text);
         plink->text = NULL;

modules/database/src/ioc/dbtemplate/Makefile

@@ -11,7 +11,7 @@
 
 SRC_DIRS += $(IOCDIR)/dbtemplate
 
-PROD_CMD += msi
+PROD_HOST += msi
 
 msi_SRCS = msi.cpp
 msi_LIBS += Com

modules/database/src/ioc/rsrv/Makefile

@@ -16,7 +16,6 @@ caserverio_INCLUDES = -I$(SRC)/ca/client
 camessage_INCLUDES = -I$(SRC)/ca/client
 
 INC += rsrv.h
-INC += server.h
 
 DBD += rsrv.dbd
 

modules/database/src/ioc/rsrv/camessage.c

@@ -280,37 +280,6 @@ static void log_header (
     struct channel_in_use *pciu;
     char hostName[256];
 
-    const char * cmd_str [] = {
-         "CA_PROTO_VERSION",
-         "CA_PROTO_EVENT_ADD",
-         "CA_PROTO_EVENT_CANCEL",
-         "CA_PROTO_READ",
-         "CA_PROTO_WRITE",
-         "CA_PROTO_SNAPSHOT",
-         "CA_PROTO_SEARCH",
-         "CA_PROTO_BUILD",
-         "CA_PROTO_EVENTS_OFF",
-         "CA_PROTO_EVENTS_ON",
-         "CA_PROTO_READ_SYNC",
-         "CA_PROTO_ERROR",
-         "CA_PROTO_CLEAR_CHANNEL",
-         "CA_PROTO_RSRV_IS_UP",
-         "CA_PROTO_NOT_FOUND",
-         "CA_PROTO_READ_NOTIFY",
-         "CA_PROTO_READ_BUILD",
-         "REPEATER_CONFIRM",
-         "CA_PROTO_CREATE_CHAN",
-         "CA_PROTO_WRITE_NOTIFY",
-         "CA_PROTO_CLIENT_NAME",
-         "CA_PROTO_HOST_NAME",
-         "CA_PROTO_ACCESS_RIGHTS",
-         "CA_PROTO_ECHO",
-         "REPEATER_REGISTER",
-         "CA_PROTO_SIGNAL",
-         "CA_PROTO_CREATE_CH_FAIL",
-         "CA_PROTO_SERVER_DISCONN"
-    };
-
     ipAddrToDottedIP (&client->addr, hostName, sizeof(hostName));
 
     pciu = MPTOPCIU(mp);
@@ -320,10 +289,8 @@ static void log_header (
             hostName, pContext);
     }
 
-    epicsPrintf ( "CAS: %s Request from %s => cmmd=%d (%s) cid=0x%x type=%d count=%d postsize=%u version=%u\n",
-        client->proto==IPPROTO_TCP ? "TCP" : "UDP",
-        hostName, mp->m_cmmd, mp->m_cmmd <= CA_PROTO_LAST_CMMD ? cmd_str[mp->m_cmmd] : "invalid",
-        mp->m_cid, mp->m_dataType, mp->m_count, mp->m_postsize, client->minor_version_number);
+    epicsPrintf ( "CAS: Request from %s => cmmd=%d cid=0x%x type=%d count=%d postsize=%u\n",
+        hostName, mp->m_cmmd, mp->m_cid, mp->m_dataType, mp->m_count, mp->m_postsize);
 
     epicsPrintf ( "CAS: Request from %s =>   available=0x%x \tN=%u paddr=%p\n",
         hostName, mp->m_available, mnum, (pciu ? (void *)&pciu->dbch : NULL));
@@ -352,18 +319,6 @@ unsigned            lineno
     SEND_UNLOCK ( client );
 }
 
-/*
- * bad_udp_cmd_beacon()
- */
-static int bad_udp_cmd_beacon ( caHdrLargeArray *mp,
-                       void *pPayload, struct client *pClient )
-{
-    if (CASDEBUG > 0)
-        log_header ("got a beacon on the wrong UDP port",
-                    pClient, mp, pPayload, 0);
-    return RSRV_ERROR;
-}
-
 /*
  * bad_udp_cmd_action()
  */
@@ -408,8 +363,6 @@ static int tcp_version_action ( caHdrLargeArray *mp, void *pPayload,
 
     client->minor_version_number = mp->m_count;
 
-    DLOG(3, ("TCP set version %u\n", client->minor_version_number));
-
     if (!CA_VSUPPORTED(mp->m_count)) {
         DLOG ( 2, ( "CAS: Ignore version from unsupported client %u\n", mp->m_count ) );
         return RSRV_ERROR;
@@ -1260,7 +1213,6 @@ static int claim_ciu_action ( caHdrLargeArray *mp,
     struct dbChannel *dbch;
     char *pName = (char *) pPayload;
 
-    DLOG (3, ("claim_ciu_action: version = %u\n", mp->m_available));
     /*
      * The available field is used (abused)
      * here to communicate the miner version number
@@ -2169,8 +2121,6 @@ static int udp_version_action ( caHdrLargeArray *mp, void *pPayload, struct clie
 {
     client->minor_version_number = mp->m_count;
 
-    DLOG (3, ("UDP set version %u\n", client->minor_version_number));
-
     if (!CA_VSUPPORTED(mp->m_count)) {
         DLOG ( 2, ( "CAS: Ignore version from unsupported client %u\n", mp->m_count ) );
         return RSRV_ERROR;
@@ -2224,9 +2174,6 @@ static int search_reply_udp ( caHdrLargeArray *mp, void *pPayload, struct client
     size_t          spaceNeeded;
     size_t          reasonableMonitorSpace = 10;
 
-    DLOG (3, epicsPrintf("UDP search for \"%.*s\" by %s@%s client version %u, m_count = %u\n",
-        mp->m_postsize, pName, client->pUserName, client->pHostName, client->minor_version_number, mp->m_count));
-
     if (!CA_VSUPPORTED(mp->m_count)) {
         DLOG ( 2, ( "CAS: Ignore search from unsupported client %u\n", mp->m_count ) );
         return RSRV_ERROR;
@@ -2314,9 +2261,6 @@ static int search_reply_tcp (
     size_t          spaceNeeded;
     size_t          reasonableMonitorSpace = 10;
 
-    DLOG (3, ("TCP search for \"%.*s\" by %s@%s client version %u, m_count = %u\n",
-        mp->m_postsize, pName, client->pUserName, client->pHostName, client->minor_version_number, mp->m_count));
-
     if (!CA_VSUPPORTED(mp->m_count)) {
         DLOG ( 2, ( "CAS: Ignore search from unsupported client %u\n", mp->m_count ) );
         return RSRV_ERROR;
@@ -2424,7 +2368,7 @@ static const pProtoStubUDP udpJumpTable[] =
     bad_udp_cmd_action,
     bad_udp_cmd_action,
     bad_udp_cmd_action,
-    bad_udp_cmd_beacon,
+    bad_udp_cmd_action,
     bad_udp_cmd_action,
     bad_udp_cmd_action,
     bad_udp_cmd_action,
@@ -2505,7 +2449,6 @@ int camessage ( struct client *client )
             pBody = ( void * ) ( mp + 1 );
         }
 
-#if 0
         /* ignore deprecated clients, but let newer clients identify themselves. */
         if (msg.m_cmmd!=CA_PROTO_VERSION && !CA_VSUPPORTED(client->minor_version_number)) {
             if (client->proto==IPPROTO_TCP) {
@@ -2527,7 +2470,6 @@ int camessage ( struct client *client )
             }
             break;
         }
-#endif
 
         /*
          * disconnect clients that don't send 8 byte

modules/database/src/std/dev/devAiSoftCallback.c

@@ -81,7 +81,7 @@ static long add_record(dbCommon *pcommon)
     devPvt *pdevPvt;
     processNotify *ppn;
 
-    if (plink->type == CONSTANT)
+    if (dbLinkIsDefined(plink) && dbLinkIsConstant(plink))
         return 0;
 
     if (plink->type != PV_LINK) {

modules/database/src/std/dev/devBiSoftCallback.c

@@ -79,7 +79,7 @@ static long add_record(dbCommon *pcommon)
     devPvt *pdevPvt;
     processNotify *ppn;
 
-    if (plink->type == CONSTANT)
+    if (dbLinkIsDefined(plink) && dbLinkIsConstant(plink))
         return 0;
 
     if (plink->type != PV_LINK) {

modules/database/src/std/dev/devI64inSoftCallback.c

@@ -79,7 +79,7 @@ static long add_record(dbCommon *pcommon)
     devPvt *pdevPvt;
     processNotify *ppn;
 
-    if (plink->type == CONSTANT)
+    if (dbLinkIsDefined(plink) && dbLinkIsConstant(plink))
         return 0;
 
     if (plink->type != PV_LINK) {

modules/database/src/std/dev/devLiSoftCallback.c

@@ -79,7 +79,7 @@ static long add_record(dbCommon *pcommon)
     devPvt *pdevPvt;
     processNotify *ppn;
 
-    if (plink->type == CONSTANT)
+    if (dbLinkIsDefined(plink) && dbLinkIsConstant(plink))
         return 0;
 
     if (plink->type != PV_LINK) {

modules/database/src/std/dev/devMbbiDirectSoftCallback.c

@@ -79,7 +79,7 @@ static long add_record(dbCommon *pcommon)
     devPvt *pdevPvt;
     processNotify *ppn;
 
-    if (plink->type == CONSTANT)
+    if (dbLinkIsDefined(plink) && dbLinkIsConstant(plink))
         return 0;
 
     if (plink->type != PV_LINK) {

modules/database/src/std/dev/devMbbiSoftCallback.c

@@ -79,7 +79,7 @@ static long add_record(dbCommon *pcommon)
     devPvt *pdevPvt;
     processNotify *ppn;
 
-    if (plink->type == CONSTANT)
+    if (dbLinkIsDefined(plink) && dbLinkIsConstant(plink))
         return 0;
 
     if (plink->type != PV_LINK) {

modules/database/src/std/dev/devSiSoftCallback.c

@@ -81,7 +81,7 @@ static long add_record(dbCommon *pcommon)
     devPvt *pdevPvt;
     processNotify *ppn;
 
-    if (plink->type == CONSTANT)
+    if (dbLinkIsDefined(plink) && dbLinkIsConstant(plink))
         return 0;
 
     if (plink->type != PV_LINK) {

modules/database/src/std/rec/biRecord.dbd.pod

@@ -61,8 +61,8 @@ this chapter for information on soft device support.
 If the record gets its values from hardware or uses the C<Raw Soft Channel>
 device support, the device support routines place the value in the RVAL
 field.
-(Since UNRELEASED) If the MASK field is non-zero, then this MASK is applied to RVAL.
-The value of RVAL is then converted using the process described in the
+(Since 7.0.8) If the MASK field is non-zero, then this MASK is applied to RVAL.
+The value from RVAL is then converted using the process described in the
 next section.
 
 =fields INP, DTYP, ZNAM, ONAM, RVAL, VAL

modules/database/src/std/rec/calcRecord.dbd.pod

@@ -158,7 +158,7 @@ CEIL: Ceiling (unary)
 FLOOR: Floor (unary)
 
 =item *
-FMOD: Floating point modulo (binary)  Added in UNRELEASED
+FMOD: Floating point modulo (binary)  Added in 7.0.8
 
 =item *
 LOG: Log base 10 (unary)