Release R7.0.8.1

The handling of N-to-M array compression was broken with the addition
of the partial buffer option, which broke the bounds check that was
being used.

Note that this also makes the partial buffer option more consistent;
if, for example, you have
```
record(compress, foo) {
  field(ALG, "N to 1 Average")
  field(INP, "bar NPP")
  field(NSAM, 2)
  field(N, 2)
  field(PBUF, YES)
}
```
(with `bar` having, e.g. length 3), then this will now behave as
expected on both of the samples.

.appveyor.yml

@@ -25,22 +25,6 @@ init:
 # Set clone depth (do not fetch complete history)
 clone_depth: 5
 
-# Skip commits affecting only specific files
-skip_commits:
-  files:
-    # Removed - 'documentation/*'
-    # Unfortunately Appveyor only looks at the HEAD (latest) commit, so if
-    # the last commit pushed to a PR only updates the Release Notes the whole
-    # PR build gets skipped. GitHub Actions looks at the complete list
-    # of files changed since its last build, which is much more useful.
-    - 'startup/*'
-    - '.github/*'
-    - '.tools/*'
-    - '.gitattributes'
-    - '.lgtm.yml'
-    - '**/*.html'
-    - '**/*.md'
-
 #---------------------------------#
 #   build matrix configuration    #
 #---------------------------------#

.appveyor/epics-base-7.yml

@@ -32,22 +32,6 @@ init:
 # Set clone depth (do not fetch complete history)
 clone_depth: 5
 
-# Skip commits affecting only specific files
-skip_commits:
-  files:
-    # Removed - 'documentation/*'
-    # Unfortunately Appveyor only looks at the HEAD (latest) commit, so if
-    # the last commit pushed to a PR only updates the Release Notes the whole
-    # PR build gets skipped. GitHub Actions looks at the complete list
-    # of files changed since its last build, which is much more useful.
-    - 'startup/*'
-    - '.github/*'
-    - '.tools/*'
-    - '.lgtm.yml'
-    - '.gitattributes'
-    - '**/*.html'
-    - '**/*.md'
-
 #---------------------------------#
 #   build matrix configuration    #
 #---------------------------------#

.github/workflows/check-editorconfig.yml

@@ -8,6 +8,6 @@ jobs:
   editorconfig:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: EditorConfig-Action
         uses: greut/eclint-action@v0

.github/workflows/ci-scripts-build.yml

@@ -29,6 +29,7 @@ on:
       - '.gitattributes'
       - '**/*.html'
       - '**/*.md'
+  workflow_dispatch:
 
 env:
     SETUP_PATH: .ci-local:.ci
@@ -51,6 +52,25 @@ jobs:
       matrix:
         # Job names also name artifacts, character limitations apply
         include:
+          - os: ubuntu-22.04
+            cmp: gcc-12
+            name: "Ub-22 gcc-12 c++20 Werror"
+            # Turn all warnings into errors,
+            # except for those we could not fix (yet).
+            # Remove respective -Wno-error=... flag once it is fixed.
+            extra: "CMD_CXXFLAGS=-std=c++20
+                    CMD_CPPFLAGS='-fdiagnostics-color
+                                  -Werror
+                                  -Wno-error=deprecated-declarations
+                                  -Wno-error=stringop-truncation
+                                  -Wno-error=restrict
+                                  -Wno-error=sizeof-pointer-memaccess
+                                  -Wno-error=nonnull
+                                  -Wno-error=dangling-pointer
+                                  -Wno-error=format-overflow
+                                  -Wno-error=format-security
+                                  -Wno-error=stringop-overread'"
+
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
@@ -133,13 +153,15 @@ jobs:
 
           - os: windows-2019
             cmp: vs2019
-            configuration: default
+            configuration: debug
             name: "Win2019 MSC-19"
+            extra: "CMD_CXXFLAGS=-analysis"
 
           - os: windows-2019
             cmp: vs2019
-            configuration: static
+            configuration: static-debug
             name: "Win2019 MSC-19, static"
+            extra: "CMD_CXXFLAGS=-analysis"
 
           - os: windows-2019
             cmp: vs2019
@@ -151,6 +173,26 @@ jobs:
             configuration: default
             name: "Win2019 mingw"
 
+          # Cross builds
+
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            name: "Cross linux-aarch64"
+            cross: linux-aarch64
+
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            name: "Cross linux-arm gnueabi"
+            cross: linux-arm@arm-linux-gnueabi
+
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            name: "Cross linux-arm gnueabihf"
+            cross: linux-arm@arm-linux-gnueabihf
+
     steps:
     - uses: actions/checkout@v3
       with:
@@ -242,6 +284,10 @@ jobs:
         submodules: true
     - name: Automatic core dumper analysis
       uses: mdavidsaver/ci-core-dumper@master
+      if: matrix.image!='centos:7'
+    - name: Automatic core dumper analysis
+      uses: mdavidsaver/ci-core-dumper@node16
+      if: matrix.image=='centos:7'
     - name: Prepare and compile dependencies
       run: python .ci/cue.py prepare
     - name: Build main module

.gitignore

@@ -17,3 +17,4 @@ O.*/
 *.log
 .*.swp
 .DS_Store
+.iocsh_history

.gitmodules

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

.tools/make-tar.sh

@@ -20,9 +20,9 @@ maybedie() {
 
 usage() {
    cat <<EOF >&2
-usage: $0 [-v] [-s] <rev> [<outfile> [<prefix>]]
+usage: $0 [-v] [-d] <rev> [<outfile> [<prefix>]]
 
-  <rev> may be any git revision spec. (tag, branch, or commit id).
+  <rev> may be any git revision spec. (tag or, using -d, branch or commit id).
 
   If provided, <outfile> must end with ".tar", ".tar.gz" or ".tar.bz2".
   If <outfile> is omitted, "base-<rev>.tar.gz" will be used.

Makefile

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

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,7 +48,7 @@ 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
@@ -56,7 +56,7 @@ EPICS_PATCH_LEVEL = 1
 
 # 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

@@ -2,11 +2,11 @@
 
 EPICS_CA_MAJOR_VERSION = 4
 EPICS_CA_MINOR_VERSION = 14
-EPICS_CA_MAINTENANCE_VERSION = 3
+EPICS_CA_MAINTENANCE_VERSION = 4
 
 # 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

@@ -83,8 +83,9 @@ IOCS_APPL_TOP               = $(INSTALL_ABSOLUTE)
 
 #-------------------------------------------------------
 # How to portably check the flags to make
+makeflags := $(firstword $(filter-out -,$(filter-out --%,$(MAKEFLAGS))))
 define checkflags
-  make-$1 = $(findstring $1,$(filter-out --%,$(MAKEFLAGS)))
+  make-$1 := $(findstring $1,$(makeflags))
 endef
 # This is extensible to most single letter flags:
 $(foreach flag,s q, $(eval $(call checkflags,$(flag))))

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_MINOR_VERSION = 23
 EPICS_DATABASE_MAINTENANCE_VERSION = 1
 
 # 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_MINOR_VERSION = 23
 EPICS_LIBCOM_MAINTENANCE_VERSION = 1
 
 # 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/Makefile

@@ -34,5 +34,9 @@ CFG += TOOLCHAIN.$(EPICS_HOST_ARCH).$(T_A)
 
 include $(TOP)/configure/RULES
 
+ifeq ($(GNU),YES)
+  # Pass compiler flags to preprocessor to enable _FORTIFY_SOURCE
+  TOOLCHAIN.$(EPICS_HOST_ARCH).$(T_A): CPPFLAGS += $(CFLAGS)
+endif
 TOOLCHAIN.$(EPICS_HOST_ARCH).$(T_A): toolchain.c
 	$(PREPROCESS.cpp)

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
 
@@ -545,11 +532,11 @@ endif # LOADABLE_SHRLIB_SUFFIX
 ifneq ($(INSTALL_CONFIGS),)
 $(INSTALL_CONFIG)/%: %
 	$(ECHO) "Installing config file $@"
-	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $(abspath $< $(@D))
 
 $(INSTALL_CONFIG)/%: ../%
 	$(ECHO) "Installing config file $@"
-	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $(abspath $< $(@D))
 endif
 
 $(INSTALL_INCLUDE)/%: $(COMMON_DIR)/%

configure/os/CONFIG.Common.RHEL7-x86_64

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

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

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

configure/os/CONFIG.Common.RHEL8-x86_64

@@ -1,18 +0,0 @@
-# Include definitions common to linux pentium targets
-include $(CONFIG)/os/CONFIG.Common.linux-x86_64
-
-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,3 +0,0 @@
-include $(CONFIG)/os/CONFIG.Common.linux-clang
-
-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.RTEMS-qoriq_e500

@@ -22,7 +22,7 @@ ARCH_DEP_CFLAGS += -DRTEMS_HAS_ALTIVEC
 #OP_SYS_LDLIBS += -lbspExt #does not use posix stuff ... want to ignore
 OP_SYS_LDLIBS += -Wl,--gc-sections
 #ARCH_DEP_LDFLAGS = -mcpu=8540 -meabi -msdata=sysv -mstrict-align -mspe -mabi=spe -mfloat-gprs=double 
-ARCH_DEP_LDFLAGS = -L$(RTEMS_BASE)/powerpc-rtems5/qoriq_e500/lib  
+ARCH_DEP_LDFLAGS = -L$(RTEMS_BASE)/$(GNU_TARGET)$(RTEMS_VERSION)/$(RTEMS_BSP)/lib
 
 MUNCH_SUFFIX = .img
 MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))

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 = /afs/psi.ch/project/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=$(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=$(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.freebsdCommon

@@ -7,6 +7,10 @@
 
 # Include definitions common to all Unix targets
 include $(CONFIG)/os/CONFIG.Common.UnixCommon
+GNU         = NO
+CMPLR_CLASS = clang
+CC          = clang
+CCC         = clang++
 
 OS_CLASS = freebsd
 

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.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=/afs/psi.ch/project/embeddedlinux/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=/afs/psi.ch/project/embeddedlinux/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,17 +0,0 @@
-# National Instruments CompactRIO running LabView RT 19.5.1
-
-# 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 = /bin
-
-ARCH_DEP_CPPFLAGS += -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon
-ARCH_DEP_CXXFLAGS += -I$(SYSROOT)/usr/include/c++/4.7.2/arm-nilrt-linux-gnueabi/
-ARCH_DEP_CXXFLAGS += -I$(SYSROOT)/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)/gcc-linaro-arm-linux-gnueabihf-raspbian/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)/gcc-linaro-arm-linux-gnueabihf-raspbian/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,6 +0,0 @@
-include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
-
-VALID_BUILDS = Ioc Command
-
-PATH := /opt/wine-msvc-2017/bin/x64:$(PATH)
-export WINEPREFIX = $(HOME)/.wine-$(EPICS_HOST_ARCH)

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 +0,0 @@
-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,22 +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
-LD_LIBRARY_PATH = $(TOOLSET_DIR:%=$(SYSROOT)%/usr/$$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.nilrt7-armv7a

@@ -1 +0,0 @@
-GNU_BIN = /opt/RHEL7/bin

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

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

configure/os/CONFIG.freebsd-x86.Common

@@ -5,3 +5,4 @@
 
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
+CMPLR_CLASS = clang

configure/os/CONFIG.freebsd-x86.freebsd-x86

@@ -2,6 +2,7 @@
 # Definitions for freebsd-x86 host - freebsd-x86 target builds
 # Sites may override these definitions in CONFIG_SITE.freebsd-x86.freebsd-x86
 #-------------------------------------------------------
+GNU_DIR=/usr/local
 
 # Include common gnu compiler definitions
 include $(CONFIG)/CONFIG.gnuCommon

configure/os/CONFIG.freebsd-x86_64.freebsd-x86_64

@@ -2,6 +2,7 @@
 # Definitions for freebsd-x86_64 host - freebsd-x86_64 target builds
 # Sites may override these definitions in CONFIG_SITE.freebsd-x86_64.freebsd-x86_64
 #-------------------------------------------------------
+GNU_DIR=/usr/local
 
 # Include common gnu compiler definitions
 include $(CONFIG)/CONFIG.gnuCommon

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.UnixCommon

@@ -1,2 +0,0 @@
-SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
-LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_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,16 +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

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 = /afs/psi.ch/project/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,10 +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
-
-# NI Linux Real-Time 7.x
-# requires RPM gcc-c++-arm-linux-gnu
-# Not available on RHEL8
-CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a

configure/os/CONFIG_SITE.RHEL8-x86_64.Common

@@ -1,11 +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
-
-# NI Linux Real-Time 7.x
-# requires RPM gcc-c++-arm-linux-gnu
-CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a

configure/os/CONFIG_SITE.linux-x86.Common

@@ -5,53 +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
-
-# set LD_LIBRARY_PATH may cause problems for eldk53-ppc4xxFP
-# not exported LD_LIBRARY_PATH causes problem for RHEL7 cross compilation
-export LD_LIBRARY_PATH=
-
-# 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
-
-# Raspberry Pi
-CROSS_COMPILER_TARGET_ARCHS += raspbian-arm
-
-# 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.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,22 +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

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

configure/toolchain.c

@@ -47,3 +47,8 @@ COMMANDLINE_LIBRARY ?= EPICS
 #else
 COMMANDLINE_LIBRARY ?= $(strip $(if $(wildcard $(if $(GNU_DIR),$(GNU_DIR)/include/readline/readline.h)), READLINE, EPICS))
 #endif
+
+#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE>2
+OP_SYS_CPPFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+#endif
+

documentation/RELEASE_NOTES.md

@@ -9,11 +9,146 @@ important to read more than just the first section to understand everything that
 has changed in each release.
 
 The PVA submodules each have their own individual sets of release notes which
-should also be read to understand what has changed since earlier releases.
+should also be read to understand what has changed since earlier releases:
 
-**This version of EPICS has not been released yet.**
+- [normativeTypes](https://github.com/epics-base/normativeTypesCPP/blob/master/documentation/RELEASE_NOTES.md)
+- [pvAccess](http://epics-base.github.io/pvAccessCPP/pvarelease_notes.html)
+- [pvData](http://epics-base.github.io/pvDataCPP/release_notes.html)
+- [pvDatabase](https://github.com/epics-base/pvDatabaseCPP/blob/master/documentation/RELEASE_NOTES.md)
+- [pva2pva](https://epics-base.github.io/pva2pva/release_notes.html)
+- [pvaClient](https://github.com/epics-base/pvaClientCPP/blob/master/documentation/RELEASE_NOTES.md)
 
-## Changes made on the 7.0 branch since 7.0.7
+## EPICS Release 7.0.8.1
+
+### Limit to `_FORTIFY_SOURCE=2`
+
+GCC versions 12 and beyond and glibc have added some aggressive runtime
+checks for buffer overflows in libc functions at runtime, and the
+[Ubuntu 2024.04](https://wiki.ubuntu.com/ToolChain/CompilerFlags) release
+increased their default gcc fortification level from 2 to 3.
+This has started causing EPICS Base builds to fail on that version, and
+other OS releases may make that configuration change with similar results.
+This release detects a compiler configured with `_FORTIFY_SOURCE=3` and
+overrides it to 2.
+Later releases of Base will adjust the code, providing information to the
+compiler to avoid triggering these incorrect protections.
+
+### Fix issue with compress record
+
+In Base 7.0.8, an update to the compress record was added to allow for certain
+algorithms to use partially filled buffers in their computations. Unfortunately,
+this broke the behaviour of the records in certain cases. This has been fixed.
+
+### Various minor changes
+
+These included fixing minor memory leaks and documentation corrections. The
+`SIZV` field of lsi, lso and printf record VAL fields now can't exceed 32767
+characters, to match an internal limit.
+
+### `epicsSocketAccept()` now returns `SOCKET`, not `int`
+
+This might have some effect on downstream modules still using `int`, but the
+OS-specific osdSock.h headers which osiSock.h includes have all declared
+`SOCKET` (in most casese as a typedef for `int`) for many releases.
+This change removes a compiler warning on WIN32.
+Further details and the discussion about this change can be found
+[here](https://github.com/epics-base/epics-base/pull/458).
+
+### `dbLoadRecords` allows macros with default values
+
+Previously the parser assumed that files containing macro substitutions were
+bad if no macro definitions were provided; that assumption was made incorrect
+once macro substitutions were allowed to provide a default value.
+
+### Hostname length limit in CA removed
+
+Before this release, the CA client library only handled hostnames in address
+list environment variables up to 255 characters long.
+This limit has been removed.
+
+-----
+
+## EPICS Release 7.0.8
+
+### bi "Raw Soft Channel" use MASK
+
+If MASK is non-zero, The raw device support will now apply MASK to the
+value read into RVAL.
+eg. allows extraction of a bit from an input integer.
+
+```
+record(longin, "integer") {
+    field(VAL, "0xff")
+}
+record(bi, "bit1") {
+    field(DESC, "extract bit 1")
+    field(DTYP, "Raw Soft Channel")
+    field(INP , "integer")
+    field(MASK, "0x2")
+    field(ZNAM, "Clear")
+    field(ONAM, "Set")
+}
+```
+
+### ANSI escapes in stderr
+
+ANSI escape charactor sequences may now be printed to the stderr stream.
+These escapes will appear in logs captured from that stream.
+Tools which parse and/or render these logs may need to be adjusted to
+either strip out the escapes, or to translate them into markup.
+(see [ansi2html](https://pypi.org/project/ansi2html/) for example)
+
+### Allow explicit append with `dbRecordsOnceOnly!=0`
+
+Previously setting `dbRecordsOnceOnly!=0` prevented any further changes to a record via a .db file.  eg.
+
+```
+record(ai, "myrec") {}
+```
+
+`dbRecordsOnceOnly!=0` previously disallowed appending fields with either form:
+
+```
+record("*", "myrec") {} # error
+record(ai, "myrec") {}  # error
+```
+
+Beginning with this release, `dbRecordsOnceOnly!=0` allows appending when explicitly intended (when record type is `"*"`).
+
+```
+record("*", "myrec") {} # allowed
+record(ai, "myrec") {}  # error
+```
+
+### Add `$EPICS_CLI_TIMEOUT`
+
+Add support for CA tools timeout from environment variable `$EPICS_CLI_TIMEOUT`
+which sets the default the default timeout for `caget` et al.
+The `-w` argument continues to take precedence.
+
+### Fixed leak from a non-EPICS thread on WIN32
+
+On Windows targets, if a thread not created by `epicsThreadCreate*()` directly
+or indirectly calls an `epicsThread*()` function, a specific tracking struct
+is allocated.  Prior to this release the allocation would not be `free()`d,
+resulting in a memory leak.
+
+A similar issue on POSIX targets was previously fixed.
+
+### Change compiler for FreeBSD to clang
+
+The default compiler for FreeBSD targets changes from GCC to clang.
+
+### Expose `dbCreateAlias` in IOC shell
+
+Add a new IOC shell command `dbCreateAlias` allow record aliases to be added.
+Intended for use before `iocInit`.  eg. to add an alias "bar" for a record "foo".
+
+```
+dbLoadRecords("some.db") # includes: record(ai, "foo") { ...
+dbCreateAlias("foo", "bar")
+iocInit()
+```
 
 ### dbEvent eventsRemaining missed on cancel
 
@@ -26,7 +161,7 @@ Previously, if a subRecord has an invalid `INP*` link, it was silently failing
 (and not running the proc function).  Now the the status code returned by the
 subroutine is returned from `dbProcess()`.
 
-### COMMANDLINE_LIBRARY fallback to GNU_DIR
+### COMMANDLINE\_LIBRARY fallback to GNU\_DIR
 
 Fall back to the previous behavior when searching for `readline.h` with older compilers.
 
@@ -48,6 +183,27 @@ The compress record now supports the use of partially-filled buffers when using
 any of the N-to-one algorithms. This is achieved by setting the new field `PBUF`
 to `YES`.
 
+### Extended timestamp channel filter
+
+The `"ts"` filter can now retrieve the record's timestamp in several numeric
+and string formats, some of which support full nanosecond precision.
+
+    Hal$ caget -a test:channel
+    test:channel                   2021-03-11 18:23:48.265386 42
+    Hal$ caget -f9 'test:channel.{"ts": {"num": "dbl"}}'
+    test:channel.{"ts": {"num": "dbl"}} 984331428.265386105
+    Hal$ caget 'test:channel.{"ts": {"str": "iso"}}'
+    test:channel.{"ts": {"str": "iso"}} 2021-03-11T18:23:48.265386+0100
+    Hal$ caget -f1 'test:channel.{"ts": {"num": "ts"}}'
+    test:channel.{"ts": {"num": "ts"}} 2 984331428.0 265386163.0
+
+More information is included in the filters documentation, which can be found in
+the `html/filters.html` document that is generated during the build
+
+### Allow adding new error symbols at any time
+
+`errSymbolAdd` can now be called after early initialization.
+
 ### Add conditional output (OOPT) to the longout record
 
 The longout record can now be configured using its new OOPT and OOCH fields
@@ -60,7 +216,9 @@ This functionality was suggested in
 be added to other output record types if the community finds it useful,
 please send feedback about the feature to tech-talk.
 
-### Tab completion for IOC shell
+### IOC Shell
+
+#### Tab completion
 
 When built with optional GNU libreadline support, the interactive IOC shell
 will perform tab completion for command names as well as for some arguments
@@ -72,14 +230,25 @@ using the new `iocshArgStringRecord` and `iocshArgStringPath` argument types.
 Both function identically to `iocshArgString` but indicate how to suggest
 completion strings.
 
-Builds on macOS (darwin-x86 or darwin-aarch64 targets) normally use Apple's
+Builds on macOS (`darwin-x86` or `darwin-aarch64` targets) normally use Apple's
 libedit library in readline compatibility mode, which doesn't support the tab
 completion API that GNU readline provides. You can use Homebrew or some other
 third-party package manager to install the GNU readline package, then edit the
-configure/os/CONFIG_SITE.darwinCommon.darwinCommon file to have EPICS use the
+`configure/os/CONFIG_SITE.darwinCommon.darwinCommon` file to have EPICS use the
 real thing to get tab completion in the IOC shell. The default settings in that
 file currently look for and use a Homebrew-installed readline if present.
 
+#### Persist history
+
+Attempt to read and write command to a file (`./.iocsh_history` by default).
+Name may be overwritten with by setting `$EPICS_IOCSH_HISTFILE` to an
+alternate path, or disabled by setting to an empty string.
+
+#### Changes to help output
+
+Rework the `help` command output to improve formatting and readability,
+and include a visual marker (a line of underlines) between different help commands.
+
 ### Add FMOD as CALC Expression
 
 The floating point modulo function `FMOD(NUM,DEN)` has been added to the CALC
@@ -227,6 +396,32 @@ This release fixed the leak on POSIX targets.
 See the associated github [issue 241](https://github.com/epics-base/epics-base/issues/241)
 for WIN32 status.
 
+### Fixed leak from a non-EPICS thread
+
+On some targets, if a thread not created by `epicsThreadCreate*()` directly
+or indirectly calls an `epicsThread*()` function, a specific tracking struct
+is allocated.
+
+Prior to this release, on POSIX and WIN32 targets, this
+allocation would not be `free()`d, resulting in a memory leak.
+
+This release fixed the leak on POSIX and WIN32 targets (excluding
+MSVC before vs2012, and the WINE runtime).
+
+### Fixed leak from a non-EPICS thread
+
+On some targets, if a thread not created by `epicsThreadCreate*()` directly
+or indirectly calls an `epicsThread*()` function, a specific tracking struct
+is allocated.
+
+Prior to this release, on POSIX and WIN32 targets, this
+struct would not be `free()`d, resulting in a memory leak.
+
+This release fixed the leak on POSIX targets.
+
+See the associated github [issue 241](https://github.com/epics-base/epics-base/issues/241)
+for WIN32 status.
+
 ### Fix `CHECK_RELEASE = WARN`
 
 This now works again, it was broken in 2019 (7.0.3.1) by an errant commit.
@@ -500,33 +695,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,
@@ -616,33 +784,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.1' &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.1
           </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.1 ../base-7.0.8.1.tar.gz base-7.0.8.1/
           </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.1.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.1.tar.gz base-7.0.8.1.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.1">
+          Create release from tag R7.0.8.1</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>

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/ca/src/client/catime.c

@@ -450,7 +450,7 @@ void timeIt ( tf *pfunc, ti *pItems, unsigned iterations,
     epicsTimeStamp      end_time;
     epicsTimeStamp      start_time;
     double              delay;
-    unsigned            inlineIter;
+    unsigned            inlineIter = 0;
 
     epicsTimeGetCurrent ( &start_time );
     (*pfunc) ( pItems, iterations, &inlineIter );

modules/ca/src/client/iocinf.cpp

@@ -21,6 +21,9 @@
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
+#include <vector>
+#include <exception>
+
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
@@ -28,6 +31,7 @@
 
 #include "envDefs.h"
 #include "epicsAssert.h"
+#include "epicsString.h"
 #include "epicsStdioRedirect.h"
 #include "errlog.h"
 #include "osiWireFormat.h"
@@ -35,39 +39,6 @@
 #include "addrList.h"
 #include "iocinf.h"
 
-/*
- * getToken()
- */
-static char *getToken ( const char **ppString, char *pBuf, unsigned bufSIze )
-{
-    bool tokenFound = false;
-    const char *pToken;
-    unsigned i;
-
-    pToken = *ppString;
-    while ( isspace (*pToken) && *pToken ){
-        pToken++;
-    }
-
-    for ( i=0u; i<bufSIze; i++ ) {
-        if ( isspace (pToken[i]) || pToken[i]=='\0' ) {
-            pBuf[i] = '\0';
-            *ppString = &pToken[i];
-            if ( i != 0 ) {
-                tokenFound = true;
-            }
-            break;
-        }
-        pBuf[i] = pToken[i];
-    }
-
-    if ( tokenFound ) {
-        pBuf[bufSIze-1] = '\0';
-        return pBuf;
-    }
-    return NULL;
-}
-
 /*
  * addAddrToChannelAccessAddressList ()
  */
@@ -77,9 +48,7 @@ extern "C" int epicsStdCall addAddrToChannelAccessAddressList
 {
     osiSockAddrNode *pNewNode;
     const char *pStr;
-    const char *pToken;
     struct sockaddr_in addr;
-    char buf[256u]; /* large enough to hold an IP address or hostname */
     int status, ret = -1;
 
     pStr = envGetConfigParamPtr (pEnv);
@@ -87,31 +56,45 @@ extern "C" int epicsStdCall addAddrToChannelAccessAddressList
         return ret;
     }
 
-    while ( ( pToken = getToken (&pStr, buf, sizeof (buf) ) ) ) {
-        status = aToIPAddr ( pToken, port, &addr );
-        if (status<0) {
-            fprintf ( stderr, "%s: Parsing '%s'\n", __FILE__, pEnv->name);
-            fprintf ( stderr, "\tBad internet address or host name: '%s'\n", pToken);
-            continue;
+    try {
+        std::vector<char> scratch(pStr, pStr+strlen(pStr)+1); // copy chars and trailing nil
+
+        char *save = NULL;
+        for(const char *pToken = epicsStrtok_r(&scratch[0], " \t\n\r", &save);
+            pToken;
+            pToken = epicsStrtok_r(NULL, " \t\n\r", &save))
+        {
+            if(!pToken[0]) {
+                continue;
+            }
+
+            status = aToIPAddr ( pToken, port, &addr );
+            if (status<0) {
+                fprintf ( stderr, "%s: Parsing '%s'\n", __FILE__, pEnv->name);
+                fprintf ( stderr, "\tBad internet address or host name: '%s'\n", pToken);
+                continue;
+            }
+
+            if ( ignoreNonDefaultPort && ntohs ( addr.sin_port ) != port ) {
+                continue;
+            }
+
+            pNewNode = (osiSockAddrNode *) calloc (1, sizeof(*pNewNode));
+            if (pNewNode==NULL) {
+                fprintf ( stderr, "addAddrToChannelAccessAddressList(): no memory available for configuration\n");
+                break;
+            }
+
+            pNewNode->addr.ia = addr;
+
+            /*
+             * LOCK applied externally
+             */
+            ellAdd (pList, &pNewNode->node);
+            ret = 0; /* success if anything is added to the list */
         }
-
-        if ( ignoreNonDefaultPort && ntohs ( addr.sin_port ) != port ) {
-            continue;
-        }
-
-        pNewNode = (osiSockAddrNode *) calloc (1, sizeof(*pNewNode));
-        if (pNewNode==NULL) {
-            fprintf ( stderr, "addAddrToChannelAccessAddressList(): no memory available for configuration\n");
-            break;
-        }
-
-        pNewNode->addr.ia = addr;
-
-        /*
-         * LOCK applied externally
-         */
-        ellAdd (pList, &pNewNode->node);
-        ret = 0; /* success if anything is added to the list */
+    } catch(std::exception&) { // only bad_alloc currently possible
+        ret = -1;
     }
 
     return ret;

modules/ca/src/client/udpiiu.cpp

@@ -549,7 +549,7 @@ void epicsStdCall caRepeaterRegistrationMessage (
             char sockErrBuf[64];
             epicsSocketConvertErrnoToString (
                 sockErrBuf, sizeof ( sockErrBuf ) );
-            fprintf ( stderr, "error sending registration message to CA repeater daemon was \"%s\"\n",
+            fprintf ( stderr, ERL_ERROR " sending registration message to CA repeater daemon was \"%s\"\n",
                 sockErrBuf );
         }
     }
@@ -813,13 +813,13 @@ bool udpiiu::exceptionRespAction (
 
     if ( msg.m_postsize > sizeof ( caHdr ) ){
         errlogPrintf (
-            "error condition \"%s\" detected by %s with context \"%s\" at %s\n",
+            ERL_ERROR " condition \"%s\" detected by %s with context \"%s\" at %s\n",
             ca_message ( msg.m_available ),
             name, reinterpret_cast <const char *> ( &reqMsg + 1 ), date );
     }
     else{
         errlogPrintf (
-            "error condition \"%s\" detected by %s at %s\n",
+            ERL_ERROR " condition \"%s\" detected by %s at %s\n",
             ca_message ( msg.m_available ), name, date );
     }
 

modules/ca/src/tools/caget.c

@@ -392,6 +392,8 @@ int main (int argc, char *argv[])
 
     LINE_BUFFER(stdout);        /* Configure stdout buffering */
 
+    use_ca_timeout_env ( &caTimeout);
+
     while ((opt = getopt(argc, argv, ":taicnhsSVe:f:g:l:#:d:0:w:p:F:")) != -1) {
         switch (opt) {
         case 'h':               /* Print usage */
@@ -437,8 +439,8 @@ int main (int argc, char *argv[])
             if(epicsScanDouble(optarg, &caTimeout) != 1)
             {
                 fprintf(stderr, "'%s' is not a valid timeout value "
-                        "- ignored. ('caget -h' for help.)\n", optarg);
-                caTimeout = DEFAULT_TIMEOUT;
+                        "- ignored, using '%.1f'. ('caget -h' for help.)\n",
+                        optarg, caTimeout);
             }
             break;
         case '#':               /* Array count */

modules/ca/src/tools/cainfo.c

@@ -141,6 +141,8 @@ int main (int argc, char *argv[])
 
     LINE_BUFFER(stdout);        /* Configure stdout buffering */
 
+    use_ca_timeout_env ( &caTimeout);
+
     while ((opt = getopt(argc, argv, ":nhVw:s:p:")) != -1) {
         switch (opt) {
         case 'h':               /* Print usage */
@@ -150,11 +152,16 @@ int main (int argc, char *argv[])
             printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() );
             return 0;
         case 'w':               /* Set CA timeout value */
+            /*
+             * epicsScanDouble is a macro defined as epicsParseDouble,
+             * (found in modules/libcom/src/misc) which will only
+             * change caTimeout here if it finds an acceptable value.
+             */
             if(epicsScanDouble(optarg, &caTimeout) != 1)
             {
                 fprintf(stderr, "'%s' is not a valid timeout value "
-                        "- ignored. ('cainfo -h' for help.)\n", optarg);
-                caTimeout = DEFAULT_TIMEOUT;
+                        "- ignored, using '%.1f'. ('cainfo -h' for help.)\n",
+                        optarg, caTimeout);
             }
             break;
         case 's':               /* ca_client_status interest level */

modules/ca/src/tools/camonitor.c

@@ -219,6 +219,8 @@ int main (int argc, char *argv[])
 
     LINE_BUFFER(stdout);        /* Configure stdout buffering */
 
+    use_ca_timeout_env ( &caTimeout);
+
     while ((opt = getopt(argc, argv, ":nhVm:sSe:f:g:l:#:0:w:t:p:F:")) != -1) {
         switch (opt) {
         case 'h':               /* Print usage */
@@ -251,11 +253,16 @@ int main (int argc, char *argv[])
             }
             break;
         case 'w':               /* Set CA timeout value */
+            /*
+             * epicsScanDouble is a macro defined as epicsParseDouble,
+             * (found in modules/libcom/src/misc) which will only
+             * change caTimeout here if it finds an acceptable value.
+             */
             if(epicsScanDouble(optarg, &caTimeout) != 1)
             {
                 fprintf(stderr, "'%s' is not a valid timeout value "
-                        "- ignored. ('camonitor -h' for help.)\n", optarg);
-                caTimeout = DEFAULT_TIMEOUT;
+                        "- ignored, using '%.1f'. ('camonitor -h' for help.)\n",
+                        optarg, caTimeout);
             }
             break;
         case '#':               /* Array count */

modules/ca/src/tools/caput.c

@@ -35,6 +35,7 @@
 #include <epicsStdlib.h>
 
 #include <cadef.h>
+#include <errlog.h>
 #include <epicsGetopt.h>
 #include <epicsEvent.h>
 #include <epicsString.h>
@@ -284,6 +285,8 @@ int main (int argc, char *argv[])
     LINE_BUFFER(stdout);        /* Configure stdout buffering */
     putenv("POSIXLY_CORRECT="); /* Behave correct on GNU getopt systems */
 
+    use_ca_timeout_env ( &caTimeout);
+
     while ((opt = getopt(argc, argv, ":cnlhatsVS#:w:p:F:")) != -1) {
         switch (opt) {
         case 'h':               /* Print usage */
@@ -318,11 +321,16 @@ int main (int argc, char *argv[])
             request = callback;
             break;
         case 'w':               /* Set CA timeout value */
+            /*
+             * epicsScanDouble is a macro defined as epicsParseDouble,
+             * (found in modules/libcom/src/misc) which will only
+             * change caTimeout here if it finds an acceptable value.
+             */
             if(epicsScanDouble(optarg, &caTimeout) != 1)
             {
                 fprintf(stderr, "'%s' is not a valid timeout value "
-                        "- ignored. ('caput -h' for help.)\n", optarg);
-                caTimeout = DEFAULT_TIMEOUT;
+                        "- ignored, using '%.1f'. ('caput -h' for help.)\n",
+                        optarg, caTimeout);
             }
             break;
         case '#':               /* Array count */
@@ -337,7 +345,7 @@ int main (int argc, char *argv[])
             if (sscanf(optarg,"%u", &caPriority) != 1)
             {
                 fprintf(stderr, "'%s' is not a valid CA priority "
-                        "- ignored. ('caget -h' for help.)\n", optarg);
+                        "- ignored. ('caput -h' for help.)\n", optarg);
                 caPriority = DEFAULT_CA_PRIORITY;
             }
             if (caPriority > CA_PRIORITY_MAX) caPriority = CA_PRIORITY_MAX;
@@ -542,7 +550,7 @@ int main (int argc, char *argv[])
         result = ca_array_put (dbrType, count, pvs[0].chid, pbuf);
     }
     if (result != ECA_NORMAL) {
-        fprintf(stderr, "Error from put operation: %s\n", ca_message(result));
+        fprintf(stderr, ERL_ERROR " from put operation: %s\n", ca_message(result));
         free(sbuf); free(dbuf); free(ebuf);
         return 1;
     }
@@ -563,7 +571,7 @@ int main (int argc, char *argv[])
     }
 
     if (result != ECA_NORMAL) {
-        fprintf(stderr, "Error occured writing data: %s\n", ca_message(result));
+        fprintf(stderr, ERL_ERROR " occured writing data: %s\n", ca_message(result));
         free(sbuf); free(dbuf); free(ebuf);
         return 1;
     }

modules/ca/src/tools/tool_lib.c

@@ -28,6 +28,7 @@
 
 #include <alarm.h>
 #include <epicsTime.h>
+#include <epicsStdlib.h>
 #include <epicsString.h>
 #include <cadef.h>
 
@@ -53,7 +54,7 @@ char fieldSeparator = ' ';          /* OFS default is whitespace */
 
 int enumAsNr = 0;        /* used for -n option - get DBF_ENUM as number */
 int charArrAsStr = 0;    /* used for -S option - treat char array as (long) string */
-double caTimeout = 1.0;  /* wait time default (see -w option) */
+double caTimeout = DEFAULT_TIMEOUT;  /* wait time default (see -w option) */
 capri caPriority = DEFAULT_CA_PRIORITY;  /* CA Priority */
 
 #define TIMETEXTLEN 28          /* Length of timestamp text buffer */
@@ -639,3 +640,22 @@ int connect_pvs (pv* pvs, int nPvs)
     }
     return returncode;
 }
+
+
+/* Set the timeout to EPICS_CLI_TIMEOUT */
+void use_ca_timeout_env ( double* timeout)
+{
+    const char* tmoStr;            /* contents of environment var */
+
+    if ((tmoStr = getenv("EPICS_CLI_TIMEOUT")) != NULL && timeout != NULL)
+    {
+        if(epicsScanDouble(tmoStr, timeout) != 1)
+        {
+            fprintf(stderr, "'%s' is not a valid timeout value "
+                "(from 'EPICS_CLI_TIMEOUT' in the environment) - "
+                "ignored. (use '-h' for help.)\n", tmoStr);
+            *timeout = DEFAULT_TIMEOUT;
+        }
+
+    }
+}

modules/ca/src/tools/tool_lib.h

@@ -100,6 +100,7 @@ extern char *dbr2str (const void *value, unsigned type);
 extern void print_time_val_sts (pv *pv, unsigned long reqElems);
 extern int  create_pvs (pv *pvs, int nPvs, caCh *pCB );
 extern int  connect_pvs (pv *pvs, int nPvs );
+extern void use_ca_timeout_env (double* timeout);
 
 /*
  * no additions below this endif

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

@@ -225,6 +225,11 @@ static void asCaTask(void)
         if(asCaDebug) printf("asCaTask has cleared all channels\n");
         epicsEventSignal(asCaTaskWait);
     }
+
+    /* ATM never reached, just a placeholder */
+    cantProceed("Unreachable.  Perpetual thread.");
+
+    taskwdRemove(0);
 }
 
 void asCaStart(void)

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

@@ -21,7 +21,8 @@ static const iocshArg * const asSetFilenameArgs[] = {&asSetFilenameArg0};
 static const iocshFuncDef asSetFilenameFuncDef =
     {"asSetFilename",1,asSetFilenameArgs,
      "Set path+file name of ACF file.\n"
-     "No immediate effect.  Run as asInit() to (re)load.\n"};
+     "No immediate effect.  Run asInit to (re)load.\n"
+     "Example: asSetFilename /full/path/to/accessSecurityFile\n"};
 static void asSetFilenameCallFunc(const iocshArgBuf *args)
 {
     asSetFilename(args[0].sval);
@@ -33,7 +34,8 @@ static const iocshArg * const asSetSubstitutionsArgs[] = {&asSetSubstitutionsArg
 static const iocshFuncDef asSetSubstitutionsFuncDef =
     {"asSetSubstitutions",1,asSetSubstitutionsArgs,
      "Set subtitutions used when reading ACF file.\n"
-     "No immediate effect.  Run as asInit() to (re)load.\n"};
+     "No immediate effect.  Run asInit to (re)load.\n"
+     "Example: asSetSubstitutions var1=5,var2=hello\n"};
 static void asSetSubstitutionsCallFunc(const iocshArgBuf *args)
 {
     asSetSubstitutions(args[0].sval);
@@ -59,7 +61,10 @@ static void asdbdumpCallFunc(const iocshArgBuf *args)
 static const iocshArg aspuagArg0 = { "uagname",iocshArgString};
 static const iocshArg * const aspuagArgs[] = {&aspuagArg0};
 static const iocshFuncDef aspuagFuncDef = {"aspuag",1,aspuagArgs,
-                                           "Show members of User Access Group.\n"};
+                                           "Show members of the User Access Group.\n"
+                                           "If no Group is specified then the members\n"
+                                           "of all user access groups are displayed.\n"
+                                           "Example: aspuag mygroup\n"};
 static void aspuagCallFunc(const iocshArgBuf *args)
 {
     aspuag(args[0].sval);
@@ -69,7 +74,10 @@ static void aspuagCallFunc(const iocshArgBuf *args)
 static const iocshArg asphagArg0 = { "hagname",iocshArgString};
 static const iocshArg * const asphagArgs[] = {&asphagArg0};
 static const iocshFuncDef asphagFuncDef = {"asphag",1,asphagArgs,
-                                           "Show members of Host Access Group.\n"};
+                                           "Show members of the Host Access Group.\n"
+                                           "If no Group is specified then the members\n"
+                                           "of all host access groups are displayed\n"
+                                           "Example: asphag mygroup\n"};
 static void asphagCallFunc(const iocshArgBuf *args)
 {
     asphag(args[0].sval);
@@ -78,8 +86,12 @@ static void asphagCallFunc(const iocshArgBuf *args)
 /* asprules */
 static const iocshArg asprulesArg0 = { "asgname",iocshArgString};
 static const iocshArg * const asprulesArgs[] = {&asprulesArg0};
-static const iocshFuncDef asprulesFuncDef = {"asprules",1,asprulesArgs,
-                                             "List rules of an Access Security Group.\n"};
+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\n"
+};
 static void asprulesCallFunc(const iocshArgBuf *args)
 {
     asprules(args[0].sval);
@@ -89,8 +101,14 @@ static void asprulesCallFunc(const iocshArgBuf *args)
 static const iocshArg aspmemArg0 = { "asgname",iocshArgString};
 static const iocshArg aspmemArg1 = { "clients",iocshArgInt};
 static const iocshArg * const aspmemArgs[] = {&aspmemArg0,&aspmemArg1};
-static const iocshFuncDef aspmemFuncDef = {"aspmem",2,aspmemArgs,
-                                           "List members of Access Security Group.\n"};
+static const iocshFuncDef aspmemFuncDef = {
+    "aspmem",2,aspmemArgs,
+    "List members of Access Security Group.\n"
+    "If no Group is specified then print the members for all Groups.\n"
+    "If clients is (0, 1) then Channel Access clients attached to each member\n"
+    "(are not, are) shown\n"
+    "Example: aspmem mygroup 1\n",
+};
 static void aspmemCallFunc(const iocshArgBuf *args)
 {
     aspmem(args[0].sval,args[1].ival);
@@ -101,8 +119,10 @@ static const iocshArg astacArg0 = { "recordname",iocshArgStringRecord};
 static const iocshArg astacArg1 = { "user",iocshArgString};
 static const iocshArg astacArg2 = { "host",iocshArgString};
 static const iocshArg * const astacArgs[] = {&astacArg0,&astacArg1,&astacArg2};
-static const iocshFuncDef astacFuncDef = {"astac",3,astacArgs,
-                                          "Test Access Security privlages granted to user+host.\n"};
+static const iocshFuncDef astacFuncDef = {
+    "astac",3,astacArgs,
+    "Show what read/write permissions the user:host would have when\n"
+    "accessing a certain PV.\n"};
 static void astacCallFunc(const iocshArgBuf *args)
 {
     astac(args[0].sval,args[1].sval,args[2].sval);
@@ -111,8 +131,14 @@ static void astacCallFunc(const iocshArgBuf *args)
 /* ascar */
 static const iocshArg ascarArg0 = { "level",iocshArgInt};
 static const iocshArg * const ascarArgs[] = {&ascarArg0};
-static const iocshFuncDef ascarFuncDef = {"ascar",1,ascarArgs,
-                                          "Report status of PVs used in INP*() Access Security rules.\n"};
+static const iocshFuncDef ascarFuncDef = {
+    "ascar",1,ascarArgs,
+    "Report status of PVs used in INP*() Access Security rules.\n"
+    "Level 0 - Summary report\n"
+    "      1 - Summary report plus details on unconnected channels\n"
+    "      2 - Summary report plus detail report on each channel\n"
+    "Example: ascar 1\n"
+};
 static void ascarCallFunc(const iocshArgBuf *args)
 {
     ascar(args[0].ival);

modules/database/src/ioc/bpt/makeBpt.c

@@ -21,6 +21,7 @@
 #include <ctype.h>
 
 #include "dbDefs.h"
+#include "errlog.h"
 #include "ellLib.h"
 #include "cvtTable.h"
 
@@ -125,12 +126,12 @@ int main(int argc, char **argv)
     }
     inFile = fopen(argv[1],"r");
     if(!inFile) {
-        fprintf(stderr,"Error opening %s\n",argv[1]);
+        fprintf(stderr,ERL_ERROR " opening %s\n",argv[1]);
         exit(-1);
     }
     outFile = fopen(outFilename,"w");
     if(!outFile) {
-        fprintf(stderr,"Error opening %s\n",outFilename);
+        fprintf(stderr,ERL_ERROR " opening %s\n",outFilename);
         exit(-1);
     }
     while(fgets(inbuf,MAX_LINE_SIZE,inFile)) {

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/callback.c

@@ -344,6 +344,10 @@ int callbackRequest(epicsCallback *pcallback)
         epicsInterruptContextMessage("callbackRequest: " ERL_ERROR " pcallback was NULL\n");
         return S_db_notInit;
     }
+    if (!pcallback->callback) {
+        epicsInterruptContextMessage("callbackRequest: " ERL_ERROR " pcallback->callback was NULL\n");
+        return S_db_notInit;
+    }
     priority = pcallback->priority;
     if (priority < 0 || priority >= NUM_CALLBACK_PRIORITIES) {
         epicsInterruptContextMessage("callbackRequest: " ERL_ERROR " Bad priority\n");

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

@@ -73,7 +73,7 @@ epicsExportAddress(int, dbAccessDebugPUTF);
 
 DB_LOAD_RECORDS_HOOK_ROUTINE dbLoadRecordsHook = NULL;
 
-static short mapDBFToDBR[DBF_NTYPES] = {
+static const short mapDBFToDBR[DBF_NTYPES] = {
     /* DBF_STRING   => */    DBR_STRING,
     /* DBF_CHAR     => */    DBR_CHAR,
     /* DBF_UCHAR    => */    DBR_UCHAR,
@@ -798,18 +798,13 @@ int dbLoadRecords(const char* file, const char* subs)
         return -1;
     }
     status = dbReadDatabase(&pdbbase, file, 0, subs);
-    switch(status)
-    {
-    case 0:
+    if(status==0) {
         if(dbLoadRecordsHook)
             dbLoadRecordsHook(file, subs);
-        break;
-    case -2:
-        errlogPrintf("dbLoadRecords: failed to load '%s'\n"
-            "    Records cannot be loaded after iocInit!\n", file);
-        break;
-    default:
-        errlogPrintf("dbLoadRecords: failed to load '%s'\n", file);
+    } else {
+        fprintf(stderr, ERL_ERROR " failed to load '%s'\n", file);
+        if(status==-2)
+            fprintf(stderr, "    Records cannot be loaded after iocInit!\n");
     }
     return status;
 }
@@ -1177,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;
@@ -1185,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 */
 
@@ -1247,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/dbChannel.c

@@ -575,15 +575,10 @@ long dbChannelOpen(dbChannel *chan)
     }
 
     /* Set up type probe */
-    probe.type = dbfl_type_val;
-    probe.ctx = dbfl_context_read;
+    memset(&probe, 0, sizeof(probe));
     probe.field_type  = dbChannelExportType(chan);
     probe.no_elements = dbChannelElements(chan);
     probe.field_size  = dbChannelFieldSize(chan);
-    probe.sevr = NO_ALARM;
-    probe.stat = NO_ALARM;
-    probe.time.secPastEpoch = 0;
-    probe.time.nsec = 0;
 
     p = probe;
 

modules/database/src/ioc/db/dbChannel.h

@@ -41,20 +41,35 @@ extern "C" {
 /**
  * event subscription
  */
-typedef struct evSubscrip {
+struct evSubscrip;
+
+typedef struct evSubscrip evSubscrip;
+
+#ifdef EPICS_PRIVATE_API
+struct evSubscrip {
     ELLNODE             node;
     struct dbChannel  * chan;
+    /* user_sub==NULL used to indicate db_cancel_event() */
     EVENTFUNC         * user_sub;
     void              * user_arg;
+    /* associated queue, may be shared with other evSubscrip */
     struct event_que  * ev_que;
+    /* NULL if !npend.  if npend!=0, pointer to last event added to event_que::valque */
     db_field_log     ** pLastLog;
-    unsigned long       npend;      /**< n times this event is on the queue */
-    unsigned long       nreplace;   /**< n times replacing event on the queue */
+    /* n times this event is on the queue */
+    unsigned long       npend;
+    /* n times replacing event on the queue */
+    unsigned long       nreplace;
+    /* DBE mask */
     unsigned char       select;
+    /* if set, subscription will yield dbfl_type_val */
     char                useValque;
+    /* event_task is handling this subscription */
     char                callBackInProgress;
+    /* this node added to dbCommon::mlis */
     char                enabled;
-} evSubscrip;
+};
+#endif
 
 typedef struct chFilter chFilter;
 

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

@@ -91,20 +91,25 @@ For example these rates are all valid:
  1 second
  2 Hertz
 
-The B<PINI> field specifies record processing at initialization. If it is set
-to YES during database configuration, the record is processed once at IOC
-initialization (before the normal scan tasks are started).
+The B<PINI> field specifies record processing at initialization. It can have the
+values NO, YES, RUN, RUNNING, PAUSE, and PAUSED. If it is set to YES during
+database configuration, the record is processed once at IOC initialization
+(before the normal scan tasks are started). For the other values see
+L<menuPini.dbd|menuPini> for more details.
 
-The B<PHAS> field orders the records within a specific SCAN group. This is not
-meaningful for passive records. All records of a specified phase are processed
-before those with higher phase number. It is generally better practice to use
-linked passive records to enforce the order of processing rather than a phase
-number.
+The B<PHAS> field orders the records processed within a specific SCAN group or
+PINI processing phase. All records of a specified phase are processed before
+those with higher phase number. It is generally better practice to use linked
+passive records to enforce the order of processing rather than a phase number.
+If the PINI field is set to NO, the PHAS field is not meaningful for passive
+records.
 
-The B<EVNT> field specifies an event number. This event number is used if the
-SCAN field is set to C<Event>. All records with scan type C<Event> and the
-same EVNT value will be processed when a call to post_event for EVNT is made.
-The call to post_event is: post_event(short event_number).
+The B<EVNT> field specifies an event name or number. This event identifier is
+used if the SCAN field is set to C<Event>. All records with scan type C<Event>
+and the same EVNT value will be processed when that event is signalled by other
+software running in the IOC, either by calling C<post_event(int event)> for
+numeric events, or by calling C<postEvent()> with an event handle previously
+looked up using C<eventNameToHandle()> for named events.
 
 The B<PRIO> field specifies the scheduling priority for processing records
 with SCAN=C<I/O Event> and asynchronous record completion tasks.

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;
 }