bump rpm release

This reverts commit 7d73932dc8.

.gitattributes

@@ -1,9 +1,11 @@
-.ci/          export-ignore
-.tools/       export-ignore
-.github/      export-ignore
-.appveyor/    export-ignore
-.appveyor.yml export-ignore
-README        export-subst
+.appveyor.yml       export-ignore
+.appveyor/          export-ignore
+.ci/                export-ignore
+.github/            export-ignore
+.gitmodules         export-ignore
+.readthedocs.yml    export-ignore
+.tools/             export-ignore
+README              export-subst
 
 #Which files need CRLF handling
 # default to automatic

.github/codeql/config.yml

@@ -0,0 +1,22 @@
+name: "CodeQL Config"
+
+# Queries and the suites they belong to are documented at
+#    https://codeql.github.com/codeql-query-help/cpp/
+
+queries:
+  - uses: security-and-quality
+  # Choose the above from 3 query suites:
+  #   default
+  #      The default set of queries
+  #   security-extended
+  #      `default` suite plus lower severity and precision queries
+  #   security-and-quality
+  #      `security-extended`, plus maintainability and reliability queries
+
+query-filters:
+-
+  exclude:
+    id: cpp/use-of-goto
+-
+  exclude:
+    problem.severity: recommendation

.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

@@ -15,7 +15,6 @@ on:
       - 'startup/*'
       - '.appveyor/*'
       - '.tools/*'
-      - '.lgtm.yml'
       - '.gitattributes'
       - '**/*.html'
       - '**/*.md'
@@ -25,10 +24,10 @@ on:
       - 'startup/*'
       - '.appveyor/*'
       - '.tools/*'
-      - '.lgtm.yml'
       - '.gitattributes'
       - '**/*.html'
       - '**/*.md'
+  workflow_dispatch:
 
 env:
     SETUP_PATH: .ci-local:.ci
@@ -51,85 +50,108 @@ 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
+                                  -fstack-protector-strong
+                                  -Wformat
+                                  -Werror
+                                  -Werror=format-security
+                                  -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=stringop-overread
+                                  -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3'
+                    CMD_LDFLAGS=-Wl,-z,relro"
+
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
             cross: "windows-x64-mingw"
-            name: "Ub-20 gcc-9 + MinGW"
+            name: "Ub-20 gcc + MinGW"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: static
             cross: "windows-x64-mingw"
-            name: "Ub-20 gcc-9 + MinGW, static"
+            name: "Ub-20 gcc + MinGW, static"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: static
             extra: "CMD_CXXFLAGS=-std=c++11"
-            name: "Ub-20 gcc-9 C++11, static"
+            name: "Ub-20 gcc C++11, static"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: static
             extra: "CMD_CFLAGS=-funsigned-char CMD_CXXFLAGS=-funsigned-char"
-            name: "Ub-20 gcc-9 unsigned char"
+            name: "Ub-20 gcc unsigned char"
 
           - os: ubuntu-20.04
             cmp: clang
             configuration: default
-            name: "Ub-20 clang-10"
+            name: "Ub-20 clang"
 
           - os: ubuntu-20.04
             cmp: clang
             configuration: default
             extra: "CMD_CXXFLAGS=-std=c++11"
-            name: "Ub-20 clang-10 C++11"
+            name: "Ub-20 clang C++11"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
             cross: "RTEMS-pc686-qemu@5"
-            name: "Ub-20 gcc-9 + RT-5.1 pc686"
+            name: "Ub-20 gcc + RT-5.1 pc686"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
             cross: "RTEMS-beatnik@5"
             test: NO
-            name: "Ub-20 gcc-9 + RT-5.1 beatnik"
+            name: "Ub-20 gcc + RT-5.1 beatnik"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
             cross: "RTEMS-xilinx_zynq_a9_qemu@5"
             test: NO
-            name: "Ub-20 gcc-9 + RT-5.1 xilinx_zynq_a9_qemu"
+            name: "Ub-20 gcc + RT-5.1 xilinx_zynq_a9_qemu"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
             cross: "RTEMS-uC5282@5"
             test: NO
-            name: "Ub-20 gcc-9 + RT-5.1 uC5282"
+            name: "Ub-20 gcc + RT-5.1 uC5282"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            name: "Ub-20 gcc-9 + RT-4.10"
+            name: "Ub-20 gcc + RT-4.10"
             cross: "RTEMS-pc386-qemu@4.10"
             test: NO
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            name: "Ub-20 gcc-9 + RT-4.9"
+            name: "Ub-20 gcc + RT-4.9"
             cross: "RTEMS-pc386-qemu@4.9"
 
           - os: macos-latest
             cmp: clang
             configuration: default
-            name: "MacOS clang-12"
+            name: "MacOS clang"
 
           - os: windows-2019
             cmp: vs2019
@@ -174,7 +196,7 @@ jobs:
             cross: linux-arm@arm-linux-gnueabihf
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Automatic core dumper analysis
@@ -192,7 +214,7 @@ jobs:
       run: python .ci/cue.py -T 60M test
     - name: Upload tapfiles Artifact
       if: ${{ always() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: tapfiles ${{ matrix.name }}
         path: '**/O.*/*.tap'
@@ -217,10 +239,10 @@ jobs:
       matrix:
         # Job names also name artifacts, character limitations apply
         include:
-          - name: "CentOS-7"
-            image: centos:7
-            cmp: gcc
-            configuration: default
+          #- name: "CentOS-7"
+          #  image: centos:7
+          #  cmp: gcc
+          #  configuration: default
 
           - name: "Fedora-33"
             image: fedora:33
@@ -259,11 +281,15 @@ jobs:
         # people would rather just break all existing scripts...
         [ -e /usr/bin/python ] || ln -sf python3 /usr/bin/python
         python --version
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         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
@@ -272,7 +298,7 @@ jobs:
       run: python .ci/cue.py -T 20M test
     - name: Upload tapfiles Artifact
       if: ${{ always() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: tapfiles ${{ matrix.name }}
         path: '**/O.*/*.tap'

.github/workflows/codeql.yml

@@ -0,0 +1,64 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: 7.0
+    tags: 'R7.0.*'
+  pull_request:
+    branches: 7.0
+    paths-ignore:
+      - '.appveyor/*'
+      - '.tools/*'
+      - 'documentation/*'
+      - 'startup/*'
+      - '**/*.md'
+      - '**/*.html'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on:
+      - ubuntu-latest
+    # - windows-latest
+    # Supported by CodeQL which would check the Windows
+    # port, but needs more work here to set it up
+
+    permissions:
+      # Required for all workflows:
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ cpp ]
+
+    steps:
+      - name: Checkout Repositories
+        uses: actions/checkout@v4
+        with:
+          submodules: false
+
+      - name: Install Packages
+        run: |
+          sudo apt-get update
+          sudo apt-get install --yes libreadline-dev
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          config-file: ./.github/codeql/config.yml
+
+      - name: Build C/C++
+        run: |
+          echo '*** Building with these versions >>>'
+          g++ --version
+          make --version
+          perl --version
+          echo '<<<'
+          make -sj2 || echo '*** Ignoring build failure for CodeQL ***'
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:${{ matrix.language }}"

.gitignore

@@ -3,6 +3,7 @@
 /lib/
 /db/
 /dbd/
+/doc/
 /html/
 /include/
 /templates/
@@ -17,3 +18,8 @@ O.*/
 *.log
 .*.swp
 .DS_Store
+.iocsh_history
+RPMS
+SRPMS
+BUILDROOT
+*.rpm

.lgtm.yml

@@ -1,50 +0,0 @@
-# Configuration for lgtm.com
-#
-
-path_classifiers:
-  test:
-    - exclude: /
-    - test
-    - "modules/*/test*"
-  library:
-    - modules/libcom/src/yacc
-    - modules/libcom/src/flex
-  template:
-    - src/template
-    - modules/ca/src/template
-    - modules/database/src/template
-
-extraction:
-  cpp:
-    prepare:
-      packages:
-        - "libreadline-dev"
-    index:
-      build_command:
-        - "g++ --version"
-        - "make --version"
-        - "perl --version"
-        - "make -sj2 || echo '*** Build failed, ignored for lgtm ***'"
-
-  python:
-    index:
-      include:
-        - src/tools
-
-  # Interpreted languages to be excluded
-  javascript:
-    index:
-      exclude:
-        - "*"
-
-  # Compiled languages to be excluded
-  java:
-    index:
-      build_command: "echo No Java code in this project"
-  csharp:
-    index:
-      build_command: "echo No C# code in this project"
-  go:
-    index:
-      build_command: "echo No Go code in this project"
-

.readthedocs.yaml

@@ -0,0 +1,36 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+build:
+  os: ubuntu-22.04
+  tools:
+      python: "3.9"
+  apt_packages:
+    - graphviz
+    - rsync
+  jobs:
+    pre_build:
+      - make inc
+      - make -C documentation rtd
+
+# Build documentation in the documentation/O.Common directory with Sphinx
+sphinx:
+  configuration: documentation/O.Common/rtd-src/conf.py
+
+# Build documentation with MkDocs
+#mkdocs:
+#  configuration: mkdocs.yml
+
+# Optionally build your docs in additional formats such as PDF and ePub
+#formats: []
+
+submodules:
+    exclude: all
+
+python:
+   install:
+      - requirements: documentation/requirements.txt

.tools/make-tar.sh

@@ -136,19 +136,20 @@ sed -i -e 's|^\./||' "$TDIR"/list.1
 
 # Exclude files
 sed \
-  -e '/\/\.ci\//d' \
+  -e '/\/\.appveyor\.yml$/d' \
+  -e '/\/\.appveyor\//d' \
   -e '/\/\.ci-local\//d' \
-  -e '/\/\.tools\//d' \
-  -e '/\/jenkins\//d' \
+  -e '/\/\.ci\//d' \
+  -e '/\/\.cproject$/d' \
   -e '/\/\.github\//d' \
   -e '/\/\.gitmodules$/d' \
   -e '/\/\.hgtags$/d' \
-  -e '/\/\.cproject$/d' \
-  -e '/\/\.project$/d' \
   -e '/\/\.lgtm\.yml$/d' \
-  -e '/\/\.travis\.yml$/d' \
-  -e '/\/\.appveyor\.yml$/d' \
+  -e '/\/\.project$/d' \
   -e '/\/\.readthedocs\.yml$/d' \
+  -e '/\/\.tools\//d' \
+  -e '/\/\.travis\.yml$/d' \
+  -e '/\/jenkins\//d' \
   "$TDIR"/list.1 > "$TDIR"/list.2
 
 if ! diff -U 0 "$TDIR"/list.1 "$TDIR"/list.2

Makefile

@@ -30,3 +30,6 @@ copysrc:
 
 tar:
 	tar cfjP epics_base-$(EPICS_VERSION_NUMBER).tar.bz2 $(INSTALL_LOCATION)
+
+rpm:
+	rpmbuild -bb epics-base.spec

configure/CONFIG.gnuCommon

@@ -27,16 +27,16 @@ RANLIB = $(GNU_BIN)/$(CMPLR_PREFIX)ranlib$(CMPLR_SUFFIX)
 ASAN_FLAGS_YES = -fsanitize=address
 ASAN_LDFLAGS_YES = $(ASAN_FLAGS_YES)
 
+# 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.
 PROF_CFLAGS_YES = -p
 GPROF_CFLAGS_YES = -pg
 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_NO = -g
 

configure/CONFIG_BASE

@@ -45,10 +45,13 @@ FIND_PM = $(wildcard $(EPICS_BASE)/lib/perl/$(1))
 #---------------------------------------------------------------
 # EPICS Base build tools and tool flags
 
+PODTOMD_pl       = $(TOOLS)/podToMD.pl
+PODTOMD          = $(PERL) $(PODTOMD_pl)
 PODTOHTML_pl     = $(TOOLS)/podToHtml.pl
 PODTOHTML_dep    = $(PODTOHTML_pl) $(call FIND_PM,EPICS/PodHtml.pm)
 PODTOHTML        = $(PERL) $(PODTOHTML_pl)
 CONVERTRELEASE   = $(PERL) $(call FIND_TOOL,convertRelease.pl)
+FILTERMAKEFLAGS  = $(PERL) $(call FIND_TOOL,filterMakeflags.pl)
 FULLPATHNAME     = $(PERL) $(TOOLS)/fullPathName.pl
 GENVERSIONHEADER = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG) $(QUESTION_FLAG)
 
@@ -65,6 +68,24 @@ INSTALL_LIBRARY = $(INSTALL)
 MKMF       = $(PERL) $(TOOLS)/mkmf.pl
 REPLACEVAR = $(PERL) $(TOOLS)/replaceVAR.pl
 
+#---------------------------------------------------------------
+# How to portably check the flags to make
+# GNUmake versions before 4.0 gave different values
+makeflags := $(shell $(FILTERMAKEFLAGS) $(MAKEFLAGS))
+define checkflags
+  make-$1 := $(findstring $1,$(makeflags))
+endef
+# This is extensible to most single letter flags:
+$(foreach flag,s q, $(eval $(call checkflags,$(flag))))
+
+# Silent builds - suppress messages during 'make -s'
+NOP = :
+ECHO = @$(if $(make-s),$(NOP),echo)
+QUIET_FLAG := $(if $(make-s),-q,)
+
+# Convert 'make -q' flag into '-i' for genVersionHeader.pl
+QUESTION_FLAG := $(if $(make-q),-i,)
+
 #---------------------------------------------------------------
 # tools for cleaning out unwanted files
 CVSCLEAN = $(call FIND_TOOL,cvsclean.pl)

configure/CONFIG_BASE_VERSION

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

configure/CONFIG_CA_VERSION

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

configure/CONFIG_COMMON

@@ -81,23 +81,6 @@ FINAL_LOCATION              = $(INSTALL_ABSOLUTE)
 # IOC's view of install path
 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,$(makeflags))
-endef
-# This is extensible to most single letter flags:
-$(foreach flag,s q, $(eval $(call checkflags,$(flag))))
-
-# Silent builds - suppress messages during 'make -s'
-NOP = :
-ECHO = @$(if $(make-s),$(NOP),echo)
-QUIET_FLAG := $(if $(make-s),-q,)
-
-# Convert 'make -q' flag into '-i' for genVersionHeader.pl
-QUESTION_FLAG := $(if $(make-q),-i,)
-
 #-------------------------------------------------------
 ifdef T_A
 
@@ -422,9 +405,9 @@ INSTALL_LIB_INSTALLS = $(addprefix $(INSTALL_LIB)/,$(notdir $(LIB_INSTALLS)))
 
 #---------------------------------------------------------------
 # Installed file permissions
-BIN_PERMISSIONS = 555
-LIB_PERMISSIONS = 444
-SHRLIB_PERMISSIONS = 555
+BIN_PERMISSIONS = 755
+LIB_PERMISSIONS = 644
+SHRLIB_PERMISSIONS = 755
 INSTALL_PERMISSIONS = 444
 
 #---------------------------------------------------------------
@@ -486,4 +469,9 @@ COMMON_INC += $(filter $(COMMON_DIR)/%, \
             $(foreach dir, $(ALL_SRC_DIRS), \
                 $(addsuffix /$(file), $(dir)))) $(COMMON_DIR)/$(file))))
 
+COMMON_DOCS += $(filter $(COMMON_DIR)/%, \
+    $(foreach file, $(DOCS), \
+        $(firstword $(wildcard $(file) \
+            $(foreach dir, $(ALL_SRC_DIRS), \
+                $(addsuffix /$(file), $(dir)))) $(COMMON_DIR)/$(file))))
 endif

configure/CONFIG_DATABASE_MODULE

@@ -12,6 +12,7 @@ DBDTORECTYPEH_pl  = $(EPICS_BASE_HOST_BIN)/dbdToRecordtypeH.pl
 DBDTORECTYPEH_dep = $(DBDTORECTYPEH_pl) $(call FIND_PM,DBD/Rec*.pm)
 DBDTOMENUH_pl     = $(EPICS_BASE_HOST_BIN)/dbdToMenuH.pl
 DBDTOMENUH_dep    = $(DBDTOMENUH_pl) $(call FIND_PM,DBD/Menu.pm)
+DBDTOMD_pl        = $(EPICS_BASE_HOST_BIN)/dbdToMD.pl
 DBDTOHTML_pl      = $(EPICS_BASE_HOST_BIN)/dbdToHtml.pl
 DBDTOHTML_dep     = $(DBDTOHTML_pl) $(call FIND_PM,EPICS/Pod*Html.pm)
 REGRECDEVDRV_pl   = $(EPICS_BASE_HOST_BIN)/registerRecordDeviceDriver.pl
@@ -21,6 +22,7 @@ REGRECDEVDRV_dep  = $(REGRECDEVDRV_pl)
 DBEXPAND                   = $(PERL) $(DBDEXPAND_pl)
 DBTORECORDTYPEH            = $(PERL) $(DBDTORECTYPEH_pl)
 DBTOMENUH                  = $(PERL) $(DBDTOMENUH_pl)
+DBDTOMD                    = $(PERL) $(DBDTOMD_pl)
 DBDTOHTML                  = $(PERL) $(DBDTOHTML_pl)
 REGISTERRECORDDEVICEDRIVER = $(PERL) $(REGRECDEVDRV_pl)
 

configure/CONFIG_DATABASE_VERSION

@@ -1,7 +1,7 @@
 # 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

configure/CONFIG_LIBCOM_VERSION

@@ -1,7 +1,7 @@
 # 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

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

@@ -197,7 +197,7 @@ endif
 # build dependancies, clean rule
 
 inc: $(COMMON_INC) $(INSTALL_INC) $(COMMON_DBDS) $(COMMON_DBDCATS) \
-	$(INSTALL_DBDS) $(INSTALL_DBD_INSTALLS)
+	$(INSTALL_DBDS) $(INSTALL_DBD_INSTALLS) $(COMMON_DOCS)
 
 build: $(COMMON_DBS) $(INSTALL_DBS) \
 	$(DBDDEPENDS_FILES) $(TARGETS) \
@@ -427,6 +427,26 @@ $(foreach file, $(DBD_INSTALLS), $(eval $(call DBD_INSTALLS_template, $(file))))
 
 .PRECIOUS: $(COMMON_DBDS) $(COMMON_DIR)/%.dbd
 
+#---------------------------------------------------------------
+# Markdown files
+
+$(COMMON_DIR)/%.md: %.dbd.pod $(DBDTOMD_pl)
+	@$(RM) $(notdir $@)
+	$(DBDTOMD) $(DBDFLAGS) -o $(notdir $@) $<
+	@$(MV) $(notdir $@) $@
+
+$(COMMON_DIR)/%.md: %.pod $(PODTOMD_pl)
+	@$(RM) $(notdir $@)
+	$(PODTOMD) -o $(notdir $@) $<
+	@$(MV) $(notdir $@) $@
+
+$(COMMON_DIR)/%.md: ../%.pl $(PODTOMD_pl)
+	@$(RM) $(notdir $@)
+	$(PODTOMD) -o $(notdir $@) $<
+	@$(MV) $(notdir $@) $@
+
+.PRECIOUS: $(COMMON_DIR)/%.md
+
 #---------------------------------------------------------------
 # HTML files
 

configure/RULES_BUILD

@@ -22,7 +22,8 @@ vpath %.cpp $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.rc $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.h $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.hpp $(USR_VPATH) $(ALL_SRC_DIRS)
-vpath %.html $(USR_VPATH) $(ALL_SRC_DIRS)
+vpath %.html $(USR_VPATH) $(ALL_SRC_DIRS) $(COMMON_DIR)
+vpath %.md $(USR_VPATH) $(ALL_SRC_DIRS) $(COMMON_DIR)
 vpath %.skel.static $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.y $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.l $(USR_VPATH) $(ALL_SRC_DIRS)
@@ -128,7 +129,7 @@ endif
 #---------------------------------------------------------------
 # Read dependency files
 
-ifneq (inc,$(strip $(MAKECMDGOALS)))
+ifneq ($(filter-out inc,$(strip $(MAKECMDGOALS))),)
 ifneq (,$(strip $(HDEPENDS_FILES)))
 $(filter-out $(wildcard *$(DEP)), $(HDEPENDS_FILES)): | $(COMMON_INC)
 -include $(HDEPENDS_FILES)
@@ -182,12 +183,12 @@ build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODTARGETS) \
 	$(TARGETS) $(TESTSCRIPTS) $(INSTALL_LIB_INSTALLS)
 
 inc: $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS) $(INSTALLS_CFG) \
-	$(INSTALL_HTMLS) $(INSTALLS_PERL_MODULES) $(INSTALL_SCRIPTS)
+	$(INSTALL_HTMLS) $(INSTALLS_PERL_MODULES) $(INSTALL_SCRIPTS) \
+	$(INSTALL_DOCS)
 
 buildInstall: \
 	$(INSTALL_PROD) $(INSTALL_MUNCHS) \
 	$(INSTALL_TCLLIBS) $(INSTALL_TCLINDEX) \
-	$(INSTALL_DOCS) \
 	$(INSTALL_OBJS) \
 	$(INSTALL_TEMPLATE) \
 	$(INSTALL_BIN_INSTALLS)
@@ -514,6 +515,13 @@ ifneq (,$(strip $(SHRLIB_VERSION)))
 	@$(RM) $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@)
 	ln -s $< $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@)
 endif # SHRLIB_VERSION
+else  # SHRLIB_SUFFIX
+ifeq ($(BUILD_CLASS),HOST)
+ifneq (,$(strip $(SHRLIB_VERSION)))
+	@$(RM) $@.$(SHRLIB_VERSION)
+	ln -s $< $@.$(SHRLIB_VERSION)
+endif # HOST
+endif # SHRLIB_VERSION
 endif # SHRLIB_SUFFIX
 
 ifneq ($(INSTALL_TCLLIB),$(INSTALL_BIN))
@@ -545,11 +553,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)/%
@@ -568,6 +576,10 @@ $(INSTALL_INCLUDE)/compiler/$(CMPLR_CLASS)/%: %
 	$(ECHO) "Installing compiler dependent include file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
+$(INSTALL_DOC)/%: $(COMMON_DIR)/%
+	$(ECHO) "Installing generated doc $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+
 $(INSTALL_DOC)/%: %
 	$(ECHO) "Installing doc $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(INSTALL_DOC)

configure/os/CONFIG.Common.RHEL7-x86_64

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

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

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

configure/os/CONFIG.Common.RHEL8-x86_64

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

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

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

configure/os/CONFIG.Common.RHEL9-x86_64

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

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

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

configure/os/CONFIG.Common.RTEMS

@@ -65,7 +65,7 @@ CXXFLAGS = $($(BUILD_CLASS)_CXXFLAGS) $(POSIX_CXXFLAGS) $(OPT_CXXFLAGS)\
  $(USR_CXXFLAGS) $(CMD_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS)\
  $(STATIC_CXXFLAGS) $(OP_SYS_CXXFLAGS) $(LIBRARY_SRC_CFLAGS)
 
-LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(CMD_LDFLAGS)\
+LDFLAGS += $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(CMD_LDFLAGS)\
  $(POSIX_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS)\
  $($(BUILD_CLASS)_LDFLAGS) $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
 
@@ -102,15 +102,47 @@ OS_CLASS = RTEMS
 # Operating system compile & link flags
 OP_SYS_CFLAGS += -D__LINUX_ERRNO_EXTENSIONS__
 
-OP_SYS_CFLAGS_NET_yes = -DRTEMS_LEGACY_STACK
-OP_SYS_CFLAGS += $(OP_SYS_CFLAGS_NET_$(RTEMS_HAS_NETWORKING))
-
-ifeq ($(RTEMS_HAS_POSIX_API),yes)
-POSIX_CPPFLAGS = -D_GNU_SOURCE -D_DEFAULT_SOURCE
+# Has RTEMS been built with the internal legacy stack?
+ifeq ($(RTEMS_LEGACY_NETWORKING_INTERNAL),yes)
+RTEMS_HAS_NETWORKING = yes
+RTEMS_NETWORKING = legacy_internal
 endif
 
-OP_SYS_LDLIBS_posix_NET_yes = -ltftpfs -lnfs -lz -ltelnetd
-OP_SYS_LDLIBS_posix_NET_no = -ltftpfs -lbsd -lz
+# Has RTEMS been built with the legacy stack as a separate package?
+ifeq ($(RTEMS_LEGACY_NETWORKING),yes)
+RTEMS_HAS_NETWORKING = yes
+RTEMS_NETWORKING = legacy
+endif
+
+# Has RTEMS been built with the libbsd stack as a separate package?
+ifeq ($(RTEMS_BSD_NETWORKING),yes)
+RTEMS_HAS_NETWORKING = yes
+RTEMS_NETWORKING = bsd
+endif
+
+RTEMS_LEGACY_NET_LIB_no=
+
+# Legacy network with RTEMS 5 and earlier
+RTEMS_NET_LIB_legacy_internal=-lnfs
+OP_SYS_CFLAGS_NET_legacy_internal = -DRTEMS_LEGACY_STACK
+
+# Legacy network with RTEMS 6 is a separate package and library
+RTEMS_NET_LIB_legacy=-lnfs -lnetworking -lnfs
+OP_SYS_CFLAGS_NET_legacy = -DRTEMS_LEGACY_STACK
+
+# LibBSD network with RTEMS 5 and 6 is a separate package and library
+RTEMS_NET_LIB_bsd=-lbsd
+OP_SYS_CFLAGS_NET_bsd = -DRTEMS_LIBBSD_STACK
+
+# Set the networking flags
+OP_SYS_CFLAGS += $(OP_SYS_CFLAGS_NET_$(RTEMS_NETWORKING))
+
+POSIX_CPPFLAGS_posix = -D_GNU_SOURCE -D_DEFAULT_SOURCE
+POSIX_CPPFLAGS = $(POSIX_CPPFLAGS_$(OS_API))
+
+OP_SYS_LDLIBS_posix_NET_yes = -ltftpfs -lz -ltelnetd
+OP_SYS_LDLIBS_posix_NET_yes += $(RTEMS_NET_LIB_$(RTEMS_NETWORKING))
+OP_SYS_LDLIBS_posix_NET_no = -ltftpfs -lz
 OP_SYS_LDLIBS_score_NET_yes = -lnfs
 OP_SYS_LDLIBS_score_NET_no = -lnfs
 OP_SYS_LDLIBS += -lrtemsCom -lCom

configure/os/CONFIG.Common.RTEMS-mvme2700

@@ -1,7 +1,6 @@
 #
 # Author: Matt Rippa
 #
-RTEMS_BSP = mvme2307
 RTEMS_TARGET_CPU = powerpc
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 ARCH_DEP_CFLAGS += -DHAVE_PPCBUG
@@ -23,3 +22,9 @@ define MUNCH_CMD
 endef
 
 include $(CONFIG)/os/CONFIG.Common.RTEMS
+
+ifeq ($(shell test $(RTEMS_VERSION) -ge 5; echo $$?),0)
+RTEMS_BSP = mvme2700
+else
+RTEMS_BSP = mvme2307
+endif

configure/os/CONFIG.Common.RTEMS-pc386

@@ -25,7 +25,7 @@ include $(CONFIG)/os/CONFIG.Common.RTEMS
 OP_SYS_LDFLAGS += -Wl,-Ttext,0x100000
 
 # This check must appear after the above include
-ifeq ($(RTEMS_VERSION),5)
+ifeq ($(shell test $(RTEMS_VERSION) -ge 5; echo $$?),0)
   $(info *** This target is not compatible with the configured RTEMS version.)
   $(info *** Build the RTEMS-pc686 (-qemu) target for RTEMS 5.x)
   $(error Can't continue)

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)
+ifeq ($(shell test $(RTEMS_VERSION) -lt 5; echo $$?),0)
   $(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.T2-ppc604

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

configure/os/CONFIG.Common.UnixCommon

@@ -8,7 +8,7 @@
 #-------------------------------------------------------
 
 # Unix valid build types
-VALID_BUILDS = Host Ioc Command
+VALID_BUILDS = $(if $(filter HOST,$(BUILD_CLASS)),Host) Ioc Command
 
 #-------------------------------------------------------
 # Unix prefix and suffix definitions

configure/os/CONFIG.Common.V69-ppc32

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

configure/os/CONFIG.Common.V69-ppc604

@@ -1,6 +1,6 @@
 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
+#export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH:%=%:)($(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
 
 # -fno-implicit-fp causes error: "unable to find a register to spill in class 'FLOAT_REGS'"
 ARCH_DEP_CFLAGS = -mcpu=604 -mstrict-align

configure/os/CONFIG.Common.deb10-x86_64

@@ -1,22 +1,16 @@
-# Cross Debian 10 with gcc 8.3
+# Debian 10
 
 # Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
 
-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
+BUILD_CLASS = HOST
 
 STD_CXXFLAGS = -std=c++17
+
+ifneq ($(EPICS_HOST_ARCH),$(T_A))
+# Cross compile
+GNU_DIR = /opt/xgcc/gcc-8.3.0-deb10
+GNU_TARGET = x86_64-deb10-linux-gnu
+SYSROOT = $(GNU_DIR)/$(GNU_TARGET)/sys-root
+CMPLR_PREFIX = $(GNU_TARGET)-
+endif

configure/os/CONFIG.Common.deb12-x86_64

@@ -0,0 +1,17 @@
+# Debian 12
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+
+BUILD_CLASS = HOST
+
+STD_CXXFLAGS = -std=c++17
+
+ifneq ($(EPICS_HOST_ARCH),$(T_A))
+# Cross compile
+GNU_DIR = /opt/xgcc/gcc-12.2.0-deb12
+GNU_TARGET = x86_64-deb12-linux-gnu
+SYSROOT = $(GNU_DIR)/$(GNU_TARGET)/sys-root
+CMPLR_PREFIX = $(GNU_TARGET)-
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(SYSROOT)/lib/x86_64-linux-gnu
+endif

configure/os/CONFIG.Common.gcc8-ppc4xxFP

@@ -5,17 +5,10 @@ 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
+GNU_DIR    = /opt/xgcc/gcc-8.5.0
+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
+ARCH_DEP_CPPFLAGS = -m32 -mcpu=440fp -mhard-float
+ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(GNU_DIR)/$(GNU_TARGET)/sys-root/lib/powerpc-linux-gnu
+
+STD_CXXFLAGS = -std=c++17

configure/os/CONFIG.Common.iosCommon

@@ -42,12 +42,6 @@ ARCH_DEP_LDFLAGS += $(ARCH_DEP_FLAGS)
 OP_SYS_CFLAGS += -isysroot $(SDK_DIR)
 OP_SYS_LDFLAGS += -isysroot $(SDK_DIR)
 
-#--------------------------------------------------
-# Always compile in debugging symbol table information
-#
-OPT_CFLAGS_YES += -g
-OPT_CXXFLAGS_YES += -g
-
 #-------------------------------------------------------
 # Compiler definitions:
 

configure/os/CONFIG.Common.linuxCommon

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

configure/os/CONFIG.Common.moxa42-armv6l

@@ -3,10 +3,9 @@
 # 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_DIR=/opt/moxa/arm-linux-4.4.2-v4
 GNU_TARGET=arm
 ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(GNU_DIR)/arm-none-linux-gnueabi/lib
-ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(INSTALL_LIB)
 
 COMMANDLINE_LIBRARY = READLINE_NCURSES
 

configure/os/CONFIG.Common.mvl40-xscale_be

@@ -7,7 +7,7 @@ COMMANDLINE_LIBRARY = READLINE_CURSES
 
 ARCH_CLASS = xscale
 
-GNU_DIR=/afs/psi.ch/project/embeddedlinux/moxa/xscale_be/armv5teb-montavista-linuxeabi
+GNU_DIR=/opt/moxa/xscale_be/armv5teb-montavista-linuxeabi
 
 ARCH_DEP_CFLAGS += -funwind-tables
 

configure/os/CONFIG.Common.nilrt7-armv7a

@@ -1,4 +1,5 @@
 # National Instruments CompactRIO running LabView RT 19.5.1
+# requires RPM gcc-c++-arm-linux-gnu
 
 # Include definitions common to all Linux targets
 include $(CONFIG)/os/CONFIG.Common.linuxCommon
@@ -8,10 +9,13 @@ 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
+GNU_BIN = /opt/RHEL7/bin
+
+# Needed on RHEL9:
+export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)/usr/$$LIB:/opt/RHEL7/$$LIB
 
 ARCH_DEP_CPPFLAGS += -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon
-ARCH_DEP_CXXFLAGS += -I$(SYSROOT)/usr/include/c++/4.7.2/arm-nilrt-linux-gnueabi/
-ARCH_DEP_CXXFLAGS += -I$(SYSROOT)/usr/include/c++/4.7.2/
+ARCH_DEP_CXXFLAGS += -I=/usr/include/c++/4.7.2/arm-nilrt-linux-gnueabi
+ARCH_DEP_CXXFLAGS += -I=/usr/include/c++/4.7.2
 
 COMMANDLINE_LIBRARY = READLINE_NCURSES

configure/os/CONFIG.Common.raspbian-arm

@@ -10,13 +10,13 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon
 # 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/
+# $(SDK_DIR)/$(SDK_TARGET)/arm-linux-gnueabihf/libc/lib/arm-linux-gnueabihf/
 # and manually created links libtinfo.so.5 and libreadline.so.
 # For gcc-linaro-arm-linux-gnueabihf-raspbian, an existing incompatible
 # libtinfo.so.5 is in the way. Remove it.
 # (Built with glibc 2.16 like installed on Raspbian 9 but toolchain uses glibc 2.13.)
 # Also copy /usr/include/readline/ directory from some readline 6 installation
-# to $(SDK_DIR)/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/usr/include/
+# to $(SDK_DIR)/$(SDK_TARGET)/arm-linux-gnueabihf/libc/usr/include/
 
 ARCH_CLASS = arm
 
@@ -25,10 +25,10 @@ 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
+# 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
+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
@@ -37,5 +37,8 @@ SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian
 # SDK_TARGET = arm-bcm2708hardfp-linux-gnueabi
 # SDK_TARGET = arm-bcm2708-linux-gnueabi
 
+# gcc 4.9.3 for 64 bit hosts
+# arm-rpi-4.9.3-linux-gnueabihf
+
 GNU_DIR = $(SDK_DIR)/$(SDK_TARGET)
 GNU_TARGET = $(if $(filter arm-bcm2708%,SDK_TARGET),$(SDK_TARGET),arm-linux-gnueabihf)

configure/os/CONFIG.Linux.windows-x64

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

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

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

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

@@ -12,7 +12,10 @@ include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
 SYSROOT = /opt/RHEL7
 
 # "Cross" TOOLSET progs need to find their libraries
-LD_LIBRARY_PATH = $(TOOLSET_DIR:%=$(SYSROOT)%/usr/$$LIB)
+export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(TOOLSET_DIR:%=$(SYSROOT)%/usr/$$LIB)
+
+# The linker has problems to find indirectly referenced libraries
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(INSTALL_LIB)
 
 # These programs have library problems when using them
 # from SYSROOT but without TOOLSET.

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

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

configure/os/CONFIG.RHEL9-x86_64.Common

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

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

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

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

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

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

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

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

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

configure/os/CONFIG.darwinCommon.darwinCommon

@@ -39,12 +39,6 @@ OP_SYS_CFLAGS += -fno-common
 #
 OP_SYS_CPPFLAGS += -Ddarwin
 
-#
-# Always compile in debugging symbol table information
-#
-OPT_CFLAGS_YES += -g
-OPT_CXXFLAGS_YES += -g
-
 #
 # Libraries for command-line editing.
 #

configure/os/CONFIG.deb10-x86_64.Common

@@ -0,0 +1,3 @@
+#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.deb10-x86_64.deb10-x86_64

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

configure/os/CONFIG.deb12-x86_64.Common

@@ -0,0 +1,3 @@
+#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.deb12-x86_64.deb12-x86_64

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

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

@@ -2,13 +2,23 @@
 # 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
+GNU_DIR=/usr
 
 # Include common gnu compiler definitions
 include $(CONFIG)/CONFIG.gnuCommon
 
+GNU_BIN = $(GNU_DIR)/bin
+GNU_LIB = $(GNU_DIR)/lib
+
+CMPLR_CLASS = clang
+
+CC = $(GNU_BIN)/$(CMPLR_PREFIX)cc$(CMPLR_SUFFIX)
+CCC = $(GNU_BIN)/$(CMPLR_PREFIX)c++$(CMPLR_SUFFIX)
+CPP = $(CC) -x c -E
+
+GNU_LDLIBS_YES =
+
 STATIC_LDFLAGS_YES= -Wl,-Bstatic
 STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic
 STATIC_LDLIBS_NO=
-

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

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

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.deb12-x86_64

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

configure/os/CONFIG_SITE.Common.linuxCommon

@@ -18,6 +18,8 @@ GNU_DIR = $(SYSROOT)$(TOOLSET_DIR)
 TARGET_CPPFLAGS += $(SYSROOT:%=--sysroot=%)
 TARGET_LDFLAGS  += $(SYSROOT:%=--sysroot=%)
 
-ifeq ($(filter SL% RHEL%,$(T_A)),)
-VALID_BUILDS = Ioc Command
-endif
+# backward compatibility: Keep unversioned libs
+# in order to prevent dynamic linking problems
+# when minor changes increment *_MAINTENANCE_VERSION
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
+LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)

configure/os/CONFIG_SITE.Common.vxWorksCommon

@@ -18,82 +18,12 @@ 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 = /ade/vxWorks/$(VXWORKS_VERSION)
-WIND_BASE = /afs/psi.ch/project/vxworks/VxWorks$(VXWORKS_VERSION)
+WIND_BASE = /opt/VxWorks/VxWorks$(VXWORKS_VERSION)
 
-#--------------------------------------------------
-# Modules we cannot build with old compiler
-
-PV_MODULES = pv% normativeTypes
-SKIP_BUILDS_5 = $(PV_MODULES)
-SKIP_BUILDS_OLD = $(PV_MODULES)
-SKIP_BUILDS_6 = $(SKIP_BUILDS_$(VX_OLD_GCC))
-SKIP_BUILDS = $(SKIP_BUILDS_$(VXWORKS_MAJOR_VERSION))
+# For the license counter
+export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH:%=%:)$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib

configure/os/CONFIG_SITE.RHEL7-x86_64.Common

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

@@ -4,8 +4,4 @@ include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
 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
+#CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64

configure/os/CONFIG_SITE.RHEL9-x86_64.Common

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

configure/os/CONFIG_SITE.UnixCommon.Common

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

configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86

@@ -6,11 +6,3 @@
 #  GNU_DIR used when COMMANDLINE_LIBRARY is READLINE
 #GNU_DIR=C:/cygwin
 
-
-# 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
-

configure/os/CONFIG_SITE.linux-aarch64.linux-aarch64

@@ -3,10 +3,3 @@
 # Site specific definitions for native linux-aarch64 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
-

configure/os/CONFIG_SITE.linux-x86.Common

@@ -11,10 +11,6 @@ INSTALL_LOCATION=/usr/local/epics/base-$(EPICS_VERSION).$(EPICS_REVISION).$(EPIC
 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
@@ -38,7 +34,7 @@ CROSS_COMPILER_TARGET_ARCHS += eldk52-e500v2
 
 # DeltaTau PowerPMAC
 CROSS_COMPILER_TARGET_ARCHS += eldk42-ppc4xxFP
-#CROSS_COMPILER_TARGET_ARCHS += eldk53-ppc4xxFP
+CROSS_COMPILER_TARGET_ARCHS += eldk53-ppc4xxFP
 
 # Test other vxWorks versions
 #CROSS_COMPILER_TARGET_ARCHS += V66-ppc603
@@ -48,9 +44,6 @@ CROSS_COMPILER_TARGET_ARCHS += eldk42-ppc4xxFP
 # (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

configure/os/CONFIG_SITE.linux-x86.RTEMS

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

configure/os/CONFIG_SITE.linux-x86_64.Common

@@ -21,8 +21,15 @@ CROSS_COMPILER_TARGET_ARCHS += windows-x64
 #CROSS_COMPILER_TARGET_ARCHS += yocto21-aarch64
 CROSS_COMPILER_TARGET_ARCHS += yocto40-aarch64
 
-# Debian 10
+# Debian
 CROSS_COMPILER_TARGET_ARCHS += deb10-x86_64
+CROSS_COMPILER_TARGET_ARCHS += deb12-x86_64
 
 # Newer DeltaTau PowerPMAC
-#CROSS_COMPILER_TARGET_ARCHS += gcc8-ppc4xxFP
+CROSS_COMPILER_TARGET_ARCHS += gcc8-ppc4xxFP
+
+# Raspberry Pi
+CROSS_COMPILER_TARGET_ARCHS += raspbian-arm
+
+# NI Linux Real-Time 7.x
+CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a

configure/toolchain.c

@@ -30,9 +30,26 @@ MSVC_VER = _MSC_VER
 #ifdef __rtems__
 #include <rtems/score/cpuopts.h>
 #  if __RTEMS_MAJOR__>=5
-OS_API = posix
+     OS_API = posix
 #  else
-OS_API = score
+     OS_API = score
+#  endif
+#  if defined(RTEMS_NETWORKING)
+     /* legacy stack circa RTEMS <= 5 and networking internal to RTEMS */
+     RTEMS_LEGACY_NETWORKING_INTERNAL = yes
+#  else
+#    if !defined(__has_include)
+       /* assume old GCC implies RTEMS < 5 with mis-configured BSP */
+#      error rebuild BSP with --enable-network
+#    elif __has_include(<machine/rtems-net-legacy.h>)
+       /* legacy stack circa RTEMS > 5 */
+       RTEMS_LEGACY_NETWORKING = yes
+#    elif __has_include(<machine/rtems-bsd-version.h>)
+       /* libbsd stack */
+       RTEMS_BSD_NETWORKING = yes
+#    else
+#      error Cannot determine RTEMS network configuration
+#    endif
 #  endif
 #endif
 
@@ -47,3 +64,7 @@ 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/.gitignore

@@ -1,3 +0,0 @@
-*.db
-epics-base.tag
-html/

documentation/Doxyfile@

@@ -759,10 +759,10 @@ WARN_LOGFILE           =
 # spaces.
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = ../mainpage.dox \
-                         ../RELEASE_NOTES.md \
+INPUT                  = ../RELEASE_NOTES.md \
                          ../README.md \
-                         @TOP@/include
+                         @TOP@/include \
+                         @TOP@/doc
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1833,7 +1833,7 @@ MAN_LINKS              = NO
 # captures the structure of the code including all documentation.
 # The default value is: NO.
 
-GENERATE_XML           = NO
+GENERATE_XML           = YES
 
 # The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -1841,7 +1841,7 @@ GENERATE_XML           = NO
 # The default directory is: xml.
 # This tag requires that the tag GENERATE_XML is set to YES.
 
-XML_OUTPUT             = xml
+XML_OUTPUT             = @RTD_SRC@/xml
 
 # If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
 # listings (including syntax highlighting and cross-referencing information) to
@@ -1946,7 +1946,7 @@ ENABLE_PREPROCESSING   = YES
 # The default value is: NO.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-MACRO_EXPANSION        = NO
+MACRO_EXPANSION        = YES
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
 # the macro expansion is limited to the macros specified with the PREDEFINED and
@@ -1986,7 +1986,17 @@ INCLUDE_FILE_PATTERNS  =
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = __cplusplus
+PREDEFINED             = __cplusplus \
+                         LIBCOM_API \
+                         DBCORE_API \
+                         LIBCA_API \
+                         DBRECSTD_API \
+                         EPICS_ALWAYS_INLINE \
+                         epicsShareExtern \
+                         epicsShareClass \
+                         epicsShareFunc \
+                         epicsShareAPI \
+                         epicsStdCall
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The

documentation/HEADER_h.md

@@ -0,0 +1,4 @@
+# @HEADER@.h
+
+```{doxygenfile} @HEADER@.h
+```

documentation/KnownProblems.html

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <title>Known Problems in EPICS 7.0.3.1</title>
-</head>
-
-<body>
-<h1 style="text-align: center">EPICS 7.0.3.1: Known Problems</h1>
-
-<p>Any patch files linked below should be applied at the root of the
-base-7.0.3.1 tree. Download them, then use the GNU Patch program as
-follows:</p>
-
-<blockquote><pre>% <b>cd <i>/path/to/</i>base-7.0.3.1</b>
-% <b>patch -p1 &lt; <i>/path/to/</i>file.patch</b></pre></blockquote>
-
-<p>The following problems were known by the developers at the time of this
-release:</p>
-
-<ul>
-
-<!-- Items added after release should be formatted thusly:
-  <li>YYYY-MM-DD: Description of problem.
-    <a href="fix.patch">This patch</a> fixes the problem.
-    ...</li>
--->
-
-</ul>
-
-</body>
-</html>

documentation/Makefile

@@ -7,25 +7,168 @@ EXPAND_ME += EPICS_REVISION
 EXPAND_ME += EPICS_MODIFICATION
 EXPAND_ME += EPICS_PATCH_LEVEL
 EXPAND_ME += OS_CLASS CMPLR_CLASS
+EXPAND_ME += RTD_SRC
 
-HTMLS += ComponentReference.html
+DOXYGEN ?= doxygen
 
-TARGETS += doxygen
+libcom_HEADERS += adjustment
+libcom_HEADERS += alarm
+libcom_HEADERS += alarmString
+libcom_HEADERS += asTrapWrite
+libcom_HEADERS += bucketLib
+libcom_HEADERS += cantProceed
+libcom_HEADERS += compilerDependencies
+libcom_HEADERS += cvtFast
+libcom_HEADERS += dbmf
+libcom_HEADERS += devLibVME
+libcom_HEADERS += devLibVMEImpl
+libcom_HEADERS += ellLib
+libcom_HEADERS += envDefs
+libcom_HEADERS += epicsAlgorithm
+libcom_HEADERS += epicsAssert
+libcom_HEADERS += epicsAtomic
+libcom_HEADERS += epicsEvent
+libcom_HEADERS += epicsExit
+libcom_HEADERS += epicsExport
+libcom_HEADERS += epicsGeneralTime
+libcom_HEADERS += epicsGuard
+libcom_HEADERS += epicsMessageQueue
+libcom_HEADERS += epicsMutex
+libcom_HEADERS += epicsReadline
+libcom_HEADERS += epicsRingBytes
+libcom_HEADERS += epicsRingPointer
+libcom_HEADERS += epicsSignal
+libcom_HEADERS += epicsSpin
+libcom_HEADERS += epicsStackTrace
+libcom_HEADERS += epicsStdio
+libcom_HEADERS += epicsStdlib
+libcom_HEADERS += epicsString
+libcom_HEADERS += epicsTempFile
+libcom_HEADERS += epicsThread
+libcom_HEADERS += epicsTime
+libcom_HEADERS += epicsTypes
+libcom_HEADERS += epicsUnitTest
+libcom_HEADERS += errlog
+libcom_HEADERS += freeList
+libcom_HEADERS += iocsh
+libcom_HEADERS += ipAddrToAsciiAsynchronous
+libcom_HEADERS += logClient
+libcom_HEADERS += macLib
+libcom_HEADERS += osiPoolStatus
+libcom_HEADERS += osiProcess
+libcom_HEADERS += osiSock
+libcom_HEADERS += postfix
+libcom_HEADERS += shareLib
+libcom_HEADERS += testMain
+libcom_HEADERS += yajl_alloc
+libcom_HEADERS += yajl_common
+libcom_HEADERS += yajl_gen
+libcom_HEADERS += yajl_parse
 
-DOXYGEN = doxygen
-ME = documentation/O.$(T_A)/html
-GH_FILES = $(ME)/ $(ME)/.nojekyll $(ME)/*.* $(ME)/*/*.*
+database_HEADERS += chfPlugin
+database_HEADERS += dbChannel
+database_HEADERS += dbCommon
+database_HEADERS += dbDefs
+database_HEADERS += dbExtractArray
+database_HEADERS += dbLink
+database_HEADERS += dbServer
+database_HEADERS += dbState
+database_HEADERS += dbStaticLib
+database_HEADERS += dbUnitTest
+database_HEADERS += devLib
+database_HEADERS += devSup
+database_HEADERS += drvSup
+database_HEADERS += initHooks
+
+record_HEADERS += aaiRecord
+record_HEADERS += aaoRecord
+record_HEADERS += aiRecord
+record_HEADERS += aoRecord
+record_HEADERS += aSubRecord
+record_HEADERS += biRecord
+record_HEADERS += boRecord
+record_HEADERS += calcRecord
+record_HEADERS += calcoutRecord
+record_HEADERS += compressRecord
+record_HEADERS += dfanoutRecord
+record_HEADERS += eventRecord
+record_HEADERS += fanoutRecord
+record_HEADERS += histogramRecord
+record_HEADERS += int64inRecord
+record_HEADERS += int64outRecord
+record_HEADERS += longinRecord
+record_HEADERS += longoutRecord
+record_HEADERS += lsiRecord
+record_HEADERS += lsoRecord
+record_HEADERS += mbbiRecord
+record_HEADERS += mbbiDirectRecord
+record_HEADERS += mbboRecord
+record_HEADERS += mbboDirectRecord
+record_HEADERS += permissiveRecord
+record_HEADERS += printfRecord
+record_HEADERS += selRecord
+record_HEADERS += seqRecord
+record_HEADERS += stateRecord
+record_HEADERS += stringinRecord
+record_HEADERS += stringoutRecord
+record_HEADERS += subRecord
+record_HEADERS += subArrayRecord
+record_HEADERS += waveformRecord
+
+menu_HEADERS += menuAlarmSevr
+menu_HEADERS += menuAlarmStat
+menu_HEADERS += menuConvert
+menu_HEADERS += menuFtype
+menu_HEADERS += menuIvoa
+menu_HEADERS += menuOmsl
+menu_HEADERS += menuPini
+menu_HEADERS += menuPost
+menu_HEADERS += menuPriority
+menu_HEADERS += menuScan
+menu_HEADERS += menuSimm
+menu_HEADERS += menuYesNo
+
+HEADER_TYPES = libcom database record menu
+
+HEADER_MD_FILES = $(foreach t, $(HEADER_TYPES), \
+    $(addsuffix _h.md, $($t_HEADERS)))
+API_RST_FILES = $(addsuffix -api.rst, $(HEADER_TYPES))
+
+RTD_SRC = $(COMMON_DIR)/rtd-src
+
+DOCS += README.md
+DOCS += RELEASE_NOTES.md
 
 include $(TOP)/configure/RULES
 
-doxygen: Doxyfile ../mainpage.dox $(INSTALL_HTMLS)
+$(HEADER_MD_FILES): %_h.md: ../HEADER_h.md
+	$(EXPAND_TOOL) -t $(INSTALL_LOCATION) -DHEADER=$* $< $@
+
+$(API_RST_FILES): %-api.rst: ../%-API.rst
+	@$(RM) $@
+	@$(ECHO) Creating $@
+	@$(CP) $< $@
+	@$(foreach h, $($*_HEADERS), \
+	    echo "   $h_h.rst" >> $@;)
+
+ifndef T_A
+doxygen rtd sphinx: inc
+	$(MAKE) -C O.$(EPICS_HOST_ARCH) $@
+else
+
+doxygen: Doxyfile
+	@$(MKDIR) $(RTD_SRC)
 	$(DOXYGEN)
-	rsync -av $(TOP)/html/ html/
 
-.PHONY: doxygen
+rtd: doxygen $(API_RST_FILES) $(HEADER_MD_FILES)
+	rsync -av $(INSTALL_DOC)/ $(RTD_SRC)/
+	rsync -av $(HEADER_MD_FILES) $(RTD_SRC)/
+	rsync -av $(API_RST_FILES) $(RTD_SRC)/
+	rsync -av ../index.rst ../conf.py $(RTD_SRC)/
 
-commit: doxygen
-	$(TOUCH) html/.nojekyll
-	(cd $(TOP) && $(CURDIR)/../commit-gh.sh $(GH_FILES))
+sphinx: rtd
+	cd $(COMMON_DIR); $(PYTHON) -m sphinx rtd-src readthedocs
+	rsync -av $(COMMON_DIR)/readthedocs $(INSTALL_HTML)/
+endif
 
-.PHONY: commit
+.PHONY: doxygen rtd sphinx

documentation/README.md

@@ -1,27 +1,7 @@
-# Installation Instructions {#install}
+# Installation instructions
 
 ## EPICS Base Release 7.0.x
 
------
-
-### Table of Contents
-
-  - [What is EPICS base?](#what-is-epics-base?)
-  - [What is new in this release?](#what-is-new-in-this-release?)
-  - [Copyright](#copyright)
-  - [Supported platforms](#supported-platforms)
-  - [Supported compilers](#supported-compilers)
-  - [Software requirements](#software-requirements)
-  - [Host system storage requirements](#host-system-storage-requirements)
-  - [Documentation](#documentation)
-  - [Directory Structure](#directory-structure)
-  - [Site-specific build configuration](#site-specific-build-configuration)
-  - [Building EPICS base](#building-epics-base)
-  - [Example application and extension](#example-application-and-extension)
-  - [Multiple host platforms](#multiple-host-platforms)
-
------
-
 ### What is EPICS base?
 
 The Experimental Physics and Industrial Control Systems (EPICS) is an
@@ -36,8 +16,8 @@ interfaces) of various types.
 
 ### What is new in this release?
 
-Please check the `documentation/RELEASE_NOTES.md` file for
-description of changes and release migration details.
+Please check the [release notes](RELEASE_NOTES.md)
+for description of changes and release migration details.
 
 ### Copyright
 
@@ -80,8 +60,7 @@ executable must be found through your normal search path.
 
 #### Unzip and tar (Winzip on WIN32 systems)
 
-You must have tools available to unzip and untar the EPICS base
-distribution file.
+You may need tools to unzip and untar the EPICS base distribution file.
 
 #### Target systems
 
@@ -91,7 +70,7 @@ running as processes on the host platform.
 
 #### vxWorks
 
-You must have vxWorks 6.8 or later installed if any of your target
+You must have vxWorks 6.8 or 6.9 installed if any of your target
 systems are vxWorks systems; the C++ compiler from older versions cannot
 compile recently developed code. The vxWorks installation provides the
 cross-compiler and header files needed to build for these targets. The
@@ -120,16 +99,10 @@ readline is available and will then use it. RTEMS targets may be
 configured to use `LIBTECLA` if available, and on vxWorks the OS's
 ledLib line-editing library is normally used.
 
-### Host system storage requirements
-
-The compressed tar file is approximately 3 MB in size. The
-distribution source tree takes up approximately 21 MB. A 64-bit host
-architecture may need around 610 MB to compile, while cross-compiled
-targets are somewhat smaller.
-
 ### Documentation
 
-EPICS documentation is available through the [EPICS website](https://epics.anl.gov/) at Argonne.
+EPICS documentation is available from the
+[EPICS Documentation Website](https://docs.epics-controls.org/).
 
 Release specific documentation can also be found in the
 `base/documentation` directory of the distribution.
@@ -143,8 +116,10 @@ Release specific documentation can also be found in the
     base/configure      Build rules and OS-independent config files
     base/configure/os   OS-dependent build config files
     base/documentation  Distribution documentation
-    base/src            Source code in various subdirectories
+    base/src            Source code for templates and build tools
+    base/modules        Source code for distribution submodules
     base/startup        Scripts for setting up path and environment
+    base/test           Unit tests for build tools
 ```
 
 #### Directories created by the build
@@ -158,7 +133,8 @@ configuration variable if that has been set.
     cfg               Installed build configuration files
     db                Installed database files
     dbd               Installed database definition files
-    html              Installed html documentation
+    doc               Installed Markdown documentation
+    html              Installed HTML documentation
     include           Installed header files
     include/os        Installed OS-specific header files in subdirs
     include/compiler  Installed compiler-specific header files
@@ -169,12 +145,11 @@ configuration variable if that has been set.
 
 #### `base/documentation` Directory
 
-This contains documents on how to setup, build, and install EPICS.
+This contains EPICS reference documentation.
 
 ```
     README.md           This file
     RELEASE_NOTES.md    Notes on release changes
-    KnownProblems.html  List of known problems and workarounds
 ```
 
 #### `base/startup` Directory
@@ -272,8 +247,7 @@ need C and C++ compilers in your search path. When building base you
 must have `echo` in your search path. For Unix host builds you will
 also need `cp`, `rm`, `mv`, and `mkdir` in your search path. Some Unix
 systems may also need `ar` and `ranlib`, and the C/C++ compilers may
-require `as` and `ld` in your path. On Solaris systems you need
-`uname` in your path.
+require `as` and `ld` in your path.
 
 * **`LD_LIBRARY_PATH`**
 EPICS shared libraries and executables normally contain the full path
@@ -290,7 +264,6 @@ Shared libraries are now built by default on all Unix type hosts.
 
 To configure EPICS, you may want to modify some values set in the
 following files:
->>>>>>> mirror/3.15
 
 ```
     configure/CONFIG_SITE      Build settings. Specify target archs.

documentation/RELEASE_NOTES.md

@@ -1,4 +1,4 @@
-# EPICS 7.0 Release Notes    {#releasenotes}
+# EPICS 7.0 Release Notes
 
 These release notes describe changes that have been made since the previous
 release of this series of EPICS Base. **Note that changes which were merged up
@@ -20,7 +20,130 @@ should also be read to understand what has changed since earlier releases:
 
 **This version of EPICS has not been released yet.**
 
-## Changes made on the 7.0 branch since 7.0.7
+## Changes made on the 7.0 branch since 7.0.8.1
+
+### DBE_PROPERTY event rate changed
+
+Updating property fields now only post DBE_PROPERTY events if the
+field actually changed.
+
+### Allow users to delete previously created records from the database
+
+From this release, record instances and aliases that have already been loaded
+by an IOC can be removed from the database again before the call to iocInit
+by loading a second instance of the named records but using `"#"` in place of
+the record type. Values for the fields are not required or advised, just use
+an empty record body { }. This is useful when a template defines records that
+are not wanted in some IOCs, without having to split or duplicate the original
+template.
+
+For example this will remove the record named "unwanted":
+
+```
+record("#", "unwanted") { }
+```
+
+## 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`
 
@@ -63,7 +186,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.
 
@@ -118,7 +241,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
@@ -130,14 +255,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
@@ -584,33 +720,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,
@@ -700,33 +809,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>
@@ -183,35 +179,56 @@ everything that has to be done since it's so easy to miss steps.</p>
           <li><tt>git grep UNRELEASED</tt> and insert the module version to any
             doxygen annotations that have a <tt>@since UNRELEASED</tt> comment.
             Commit (don't push yet).</li>
+
           <li>Check that the module's Release Notes have been updated to cover
             all changes; add items as necessary, and set the module version
-            number and release date if appropriate. Convert to HTML and view in
-            a browser to check the formatting:
-            <blockquote><tt>
-              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>
+            number and release date if appropriate.
+            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>
-
-          <li>Tag the module:
+            <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):
             <blockquote><tt>
-              git tag -m 'ANJ: Tag for EPICS 7.0.7' &lt;module-version&gt;
+              git ci -m 'Final commit for &lt;module-version&gt;'
               </tt></blockquote>
             </li>
 
+          <li>Tag the module:
+            <blockquote><tt>
+              git tag -m 'ANJ: Tag for EPICS 7.0.8.2' &lt;module-version&gt;
+              </tt></blockquote>
+            </li>
+
+          <li>Generate documentation or Release Notes using one of these:
+            <ul>
+              <li>For older modules with a RELEASE_NOTES.md file convert it to
+                HTML and view in a browser to check the formatting as follows:
+                <blockquote><tt>
+                  cd base-7.0/modules/&lt;module&gt;/documentation<br />
+                  pandoc -f gfm -t html -o RELEASE_NOTES.html RELEASE_NOTES.md
+                  </tt></blockquote>
+
+              <li>For newer modules with release_notes.dox file, generate the
+                new github-pages website as follows:
+                <blockquote><tt>
+                  cd base-7.0/modules/&lt;module&gt;/documentation<br />
+                  make commit
+                  git push --force upstream gh-pages
+                  </tt></blockquote>
+                <i>Q: Delay this <tt>git push</tt> until later?</i></li>
+              </ul></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 +238,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 +288,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.2
           </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 +322,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.2 ../base-7.0.8.2.tar.gz base-7.0.8.2/
           </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.2.tar.gz
           </tt></blockquote>
         </td>
       </tr>
@@ -318,8 +335,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 +385,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 +393,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.2.tar.gz base-7.0.8.2.tar.gz.asc epics-controls:download/base<br />
           </tt></blockquote>
         </td>
       </tr>
@@ -392,22 +410,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.2">
+          Create release from tag R7.0.8.2</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>

documentation/commit-gh.sh

@@ -1,45 +0,0 @@
-#!/bin/sh
-set -e -x
-# Usage: commit-gh <sub-directory-prefix> <files...>
-#
-# Creates a commit containing only the files in the sub-directory provided as an argument
-#
-# Does not disturb the working copy or index
-
-prefix="$1"
-shift
-
-# Commit to this branch
-BRANCH=refs/heads/gh-pages
-
-# Use the main branch description as the gh-pages commit message
-MSG=`git describe --tags --always`
-
-# Scratch space
-TDIR=`mktemp -d -p $PWD`
-
-# Automatic cleanup of scratch space
-trap 'rm -rf $TDIR' INT TERM QUIT EXIT
-
-export GIT_INDEX_FILE="$TDIR/index"
-
-# Add listed files to a new (empty) index
-git update-index --add "$@"
-
-# Write the index into the repo, get tree hash
-TREE=`git write-tree --prefix="$prefix"`
-
-echo "TREE $TREE"
-git cat-file -p $TREE
-
-# Create a commit with our new tree
-# Reference current branch head as parent (if any)
-CMT=`git commit-tree -m "$MSG" $TREE`
-
-echo "COMMIT $CMT"
-git cat-file -p $CMT
-
-# Update the branch with the new commit tree hash
-git update-ref $BRANCH $CMT
-
-echo "Done"

documentation/conf.py

@@ -0,0 +1,130 @@
+# Configuration file for the Sphinx documentation builder.
+#
+# This file only contains a selection of the most common options. For a full
+# list see the documentation:
+# http://www.sphinx-doc.org/en/master/config
+
+# -- Path setup --------------------------------------------------------------
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+import os
+import sys
+
+sys.path.insert(0, os.path.abspath("."))
+
+# -- Project information -----------------------------------------------------
+
+project = "EPICS Base Documentation"
+copyright = "EPICS Controls"
+author = "The EPICS Collaboration"
+
+# -- General configuration ---------------------------------------------------
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+
+extensions = [
+    "hoverxref.extension",
+    "breathe",
+    "sphinx.ext.mathjax",
+    "sphinx.ext.ifconfig",
+    "sphinx.ext.graphviz",
+    "sphinx_copybutton",
+    "sphinx.ext.intersphinx",
+    'myst_parser',
+]
+
+# Setup the breathe extension
+breathe_projects = {"epics-base": "xml"}
+
+breathe_default_project = "epics-base"
+
+# Tell sphinx what the primary language being documented is.
+primary_domain = "cpp"
+
+# Tell sphinx what the pygments highlight language should be.
+highlight_language = "cpp"
+
+# Add any paths that contain templates here, relative to this directory.
+# templates_path = ()
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This pattern also affects html_static_path and html_extra_path.
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store", "O.*", "venv"]
+
+# Intersphinx links to subprojects
+intersphinx_mapping = {
+    "epics": ("https://docs.epics-controls.org/en/latest/", None),
+}
+intersphinx_disabled_reftypes = ["*"]
+hoverxref_role_types = {
+    "hoverxref": "tooltip",
+    "ref": "modal",
+    "confval": "tooltip",
+    "mod": "modal",
+    "class": "modal",
+    "obj": "tooltip",
+}
+
+hoverxref_intersphinx_types = {
+    "readthedocs": "modal",
+    "sphinx": "tooltip",
+}
+
+hoverxref_domains = [
+    "py",
+]
+
+# Enabled Markdown extensions.
+# See here for what they do:
+# https://myst-parser.readthedocs.io/en/latest/syntax/optional.html
+myst_enable_extensions = [
+    "amsmath",
+    "colon_fence",
+    "deflist",
+    "dollarmath",
+    "fieldlist",
+    "html_image",
+    "replacements",
+    "smartquotes",
+    "strikethrough",
+    "tasklist",
+]
+
+# Allows auto-generated header anchors:
+# https://myst-parser.readthedocs.io/en/latest/syntax/optional.html#auto-generated-header-anchors
+myst_heading_anchors = 4
+
+
+# -- Options for HTML output -------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = "sphinx_rtd_theme"
+
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+# html_static_path = ['_static']
+
+# html_css_files = [
+#    'css/custom.css',
+# ]
+
+master_doc = "index"
+
+# html_theme_options = {
+#    'logo_only': True,
+# }
+# html_logo = "images/EPICS_white_logo_v02.png"
+
+# html_extra_path = ['../html']
+
+# Breathe directives

documentation/database-API.rst

@@ -0,0 +1,7 @@
+IOC Database C/C++ APIs
+=======================
+
+.. toctree::
+   :maxdepth: 1
+   :caption: IOC Header Files
+

documentation/index.rst

@@ -0,0 +1,30 @@
+EPICS Base Documentation
+========================
+
+
+.. toctree::
+   :hidden:
+
+   EPICS Documentation Index <https://docs.epics-controls.org/en/latest/>
+
+.. toctree::
+   :maxdepth: 1
+   :caption: General Information
+
+   README
+   RELEASE_NOTES
+
+.. toctree::
+   :maxdepth: 2
+   :caption: IOC Component Reference
+
+   ComponentReference
+
+.. toctree::
+   :maxdepth: 1
+   :caption: C/C++ Headers
+
+   libcom-api
+   database-api
+   record-api
+   menu-api

documentation/libcom-API.rst

@@ -0,0 +1,7 @@
+Common Library C/C++ APIs
+=========================
+
+.. toctree::
+   :maxdepth: 1
+   :caption: LibCom Header Files
+

documentation/mainpage.dox

@@ -1,15 +0,0 @@
-/**
-@mainpage EPICS Base
-
-Documentation index
-
-@li @ref releasenotes
-@li @ref install
-@li <a href="ComponentReference.html">EPICS Component Reference Manual</a>
-@li <a href="filters.html">Field Modifiers and Channel Filters</a>
-@li <a href="links.html">Extensible IOC Database Links</a>
-@li <a href="CAref.html">Channel Access Reference Manual</a>
-@li <a href="msi.html">msi: Macro Substitution and Include Tool</a>
-@li <a href="CA.html">Perl 5 Interface to Channel Access</a>
-
-*/

documentation/menu-API.rst

@@ -0,0 +1,7 @@
+C/C++ Headers from Menus
+========================
+
+.. toctree::
+   :maxdepth: 1
+   :caption: Generated Menu Header Files
+

documentation/record-API.rst

@@ -0,0 +1,7 @@
+C/C++ Headers from Record Types
+===============================
+
+.. toctree::
+   :maxdepth: 1
+   :caption: Generated Record Header Files
+

documentation/requirements.txt

@@ -0,0 +1,6 @@
+sphinx==7.2.6
+myst-parser==2.0.0
+breathe==4.35.0
+sphinx_copybutton==0.5.2
+sphinx-hoverxref==1.3.0
+sphinx-rtd-theme==2.0.0

epics-base.sh

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

epics-base.spec

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

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/Makefile.local

@@ -0,0 +1,2 @@
+SUBMODULES += pcas
+pcas_DEPEND_DIRS = ca

modules/ca/src/client/Makefile

@@ -118,7 +118,6 @@ EXPAND_VARS = INSTALL_BIN=$(FINAL_LOCATION)/bin/$(T_A)
 SRC_DIRS += $(CURDIR)/test
 PROD_HOST += ca_test
 ca_test_SRCS = ca_test_main.c ca_test.c
-ca_test_LIBS  = ca Com
 ca_test_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
 
 OBJS_vxWorks += ca_test

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