Use split() for fetching last tag with darcs

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

.appveyor.yml

@@ -52,6 +52,8 @@ environment:
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
   - CMP: vs2015
   - CMP: vs2013
+  - CMP: vs2012
+  - CMP: vs2010
   - CMP: gcc
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     # TODO: static linking w/ readline isn't working.  Bypass auto-detect
@@ -65,6 +67,11 @@ platform:
 # Matrix configuration: exclude sets of jobs
 matrix:
   exclude:
+  # VS2012 and older installs don't have the 64 bit compiler
+  - platform: x64
+    CMP: vs2012
+  - platform: x64
+    CMP: vs2010
   # Exclude more jobs to reduce build time
   # Skip 32-bit for "middle-aged" compilers
   - platform: x86

.appveyor/epics-base-7.yml

@@ -59,6 +59,8 @@ environment:
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
   - CMP: vs2015
   - CMP: vs2013
+  - CMP: vs2012
+  - CMP: vs2010
   - CMP: gcc
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     # TODO: static linking w/ readline isn't working.  Bypass auto-detect
@@ -72,6 +74,11 @@ platform:
 # Matrix configuration: exclude sets of jobs
 matrix:
   exclude:
+  # VS2012 and older installs don't have the 64 bit compiler
+  - platform: x64
+    CMP: vs2012
+  - platform: x64
+    CMP: vs2010
   # Exclude more jobs to reduce build time
   # Skip 32-bit for "middle-aged" compilers
   - platform: x86

.gitattributes

@@ -1,11 +1,9 @@
-.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
+.ci/          export-ignore
+.tools/       export-ignore
+.github/      export-ignore
+.appveyor/    export-ignore
+.appveyor.yml export-ignore
+README        export-subst
 
 #Which files need CRLF handling
 # default to automatic

.github/codeql/config.yml

@@ -1,22 +0,0 @@
-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@v4
+      - uses: actions/checkout@v3
       - name: EditorConfig-Action
         uses: greut/eclint-action@v0

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

@@ -15,6 +15,7 @@ on:
       - 'startup/*'
       - '.appveyor/*'
       - '.tools/*'
+      - '.lgtm.yml'
       - '.gitattributes'
       - '**/*.html'
       - '**/*.md'
@@ -24,10 +25,10 @@ on:
       - 'startup/*'
       - '.appveyor/*'
       - '.tools/*'
+      - '.lgtm.yml'
       - '.gitattributes'
       - '**/*.html'
       - '**/*.md'
-  workflow_dispatch:
 
 env:
     SETUP_PATH: .ci-local:.ci
@@ -50,18 +51,15 @@ jobs:
       matrix:
         # Job names also name artifacts, character limitations apply
         include:
-          - os: ubuntu-24.04
-            cmp: gcc
-            name: "Ub-24 gcc-13 c++20 Werror"
+          - 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
@@ -69,89 +67,88 @@ jobs:
                                   -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"
+                                  -Wno-error=format-security
+                                  -Wno-error=stringop-overread'"
 
-          - os: ubuntu-22.04
+          - os: ubuntu-20.04
             cmp: gcc
             configuration: default
             cross: "windows-x64-mingw"
-            name: "Ub-22 gcc + MinGW"
+            name: "Ub-20 gcc-9 + MinGW"
 
-          - os: ubuntu-22.04
+          - os: ubuntu-20.04
             cmp: gcc
             configuration: static
             cross: "windows-x64-mingw"
-            name: "Ub-22 gcc + MinGW, static"
+            name: "Ub-20 gcc-9 + MinGW, static"
 
-          - os: ubuntu-22.04
+          - os: ubuntu-20.04
             cmp: gcc
             configuration: static
             extra: "CMD_CXXFLAGS=-std=c++11"
-            name: "Ub-22 gcc C++11, static"
+            name: "Ub-20 gcc-9 C++11, static"
 
-          - os: ubuntu-22.04
+          - os: ubuntu-20.04
             cmp: gcc
             configuration: static
             extra: "CMD_CFLAGS=-funsigned-char CMD_CXXFLAGS=-funsigned-char"
-            name: "Ub-22 gcc unsigned char"
+            name: "Ub-20 gcc-9 unsigned char"
 
-          - os: ubuntu-22.04
+          - os: ubuntu-20.04
             cmp: clang
             configuration: default
-            name: "Ub-22 clang"
+            name: "Ub-20 clang-10"
 
-          - os: ubuntu-22.04
+          - os: ubuntu-20.04
             cmp: clang
             configuration: default
             extra: "CMD_CXXFLAGS=-std=c++11"
-            name: "Ub-22 clang C++11"
+            name: "Ub-20 clang-10 C++11"
 
-          - os: ubuntu-22.04
+          - os: ubuntu-20.04
             cmp: gcc
             configuration: default
             cross: "RTEMS-pc686-qemu@5"
-            name: "Ub-22 gcc + RT-5.1 pc686"
+            name: "Ub-20 gcc-9 + RT-5.1 pc686"
 
-          - os: ubuntu-22.04
+          - os: ubuntu-20.04
             cmp: gcc
             configuration: default
             cross: "RTEMS-beatnik@5"
             test: NO
-            name: "Ub-22 gcc + RT-5.1 beatnik"
+            name: "Ub-20 gcc-9 + RT-5.1 beatnik"
 
-          - os: ubuntu-22.04
+          - os: ubuntu-20.04
             cmp: gcc
             configuration: default
             cross: "RTEMS-xilinx_zynq_a9_qemu@5"
             test: NO
-            name: "Ub-22 gcc + RT-5.1 xilinx_zynq_a9_qemu"
+            name: "Ub-20 gcc-9 + RT-5.1 xilinx_zynq_a9_qemu"
 
-          - os: ubuntu-22.04
+          - os: ubuntu-20.04
             cmp: gcc
             configuration: default
             cross: "RTEMS-uC5282@5"
             test: NO
-            name: "Ub-22 gcc + RT-5.1 uC5282"
+            name: "Ub-20 gcc-9 + RT-5.1 uC5282"
 
-          - os: ubuntu-22.04
+          - os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            name: "Ub-22 gcc + RT-4.10"
+            name: "Ub-20 gcc-9 + RT-4.10"
             cross: "RTEMS-pc386-qemu@4.10"
             test: NO
 
-          - os: ubuntu-22.04
+          - os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            name: "Ub-22 gcc + RT-4.9"
+            name: "Ub-20 gcc-9 + RT-4.9"
             cross: "RTEMS-pc386-qemu@4.9"
 
           - os: macos-latest
             cmp: clang
             configuration: default
-            name: "MacOS clang"
+            name: "MacOS clang-12"
 
           - os: windows-2019
             cmp: vs2019
@@ -196,7 +193,7 @@ jobs:
             cross: linux-arm@arm-linux-gnueabihf
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         submodules: true
     - name: Automatic core dumper analysis
@@ -214,7 +211,7 @@ jobs:
       run: python .ci/cue.py -T 60M test
     - name: Upload tapfiles Artifact
       if: ${{ always() }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: tapfiles ${{ matrix.name }}
         path: '**/O.*/*.tap'
@@ -239,13 +236,8 @@ jobs:
       matrix:
         # Job names also name artifacts, character limitations apply
         include:
-          - name: "CentOS-8"
-            image: centos:8
-            cmp: gcc
-            configuration: default
-
-          - name: "Rocky-9"
-            image: rockylinux:9
+          - name: "CentOS-7"
+            image: centos:7
             cmp: gcc
             configuration: default
 
@@ -260,87 +252,50 @@ jobs:
             configuration: default
 
     steps:
-    - name: "Fix repo URLs on CentOS-8"
-      # centos:8 is frozen, repos are in the vault
-      if: matrix.image=='centos:8'
+    - name: "Build newer Git"
+      # actions/checkout@v2 wants git >=2.18
+      # centos:7 has 1.8
+      if: matrix.image=='centos:7'
       run: |
-        sed -i -e "s|mirrorlist=|#mirrorlist=|" \
-        -e "s|#baseurl=http://mirror|baseurl=http://vault|" \
-        /etc/yum.repos.d/CentOS-Linux-{BaseOS,AppStream,Extras,Plus}.repo
+        yum -y install curl make gcc curl-devel expat-devel gettext-devel openssl-devel zlib-devel perl-ExtUtils-MakeMaker
+        curl https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.29.0.tar.gz | tar -xz
+        cd git-*
+        make -j2 prefix=/usr/local all
+        make prefix=/usr/local install
+        cd ..
+        rm -rf git-*
+        type -a git
+        git --version
     - name: "Redhat setup"
       run: |
-        dnf -y install python3 gdb make perl gcc-c++ glibc-devel readline-devel ncurses-devel perl-devel perl-Test-Simple
-        git --version || dnf -y install git
-        python3 --version
-    - uses: actions/checkout@v4
+        dnfyum() {
+            dnf -y "$@" || yum -y "$@"
+            return $?
+        }
+        dnfyum install python3 gdb make perl gcc-c++ glibc-devel readline-devel ncurses-devel perl-devel perl-Test-Simple
+        git --version || dnfyum install git
+        # rather than just bite the bullet and link python3 -> python,
+        # people would rather just break all existing scripts...
+        [ -e /usr/bin/python ] || ln -sf python3 /usr/bin/python
+        python --version
+    - uses: actions/checkout@v3
       with:
         submodules: true
     - name: Automatic core dumper analysis
       uses: mdavidsaver/ci-core-dumper@master
     - name: Prepare and compile dependencies
-      run: python3 .ci/cue.py prepare
+      run: python .ci/cue.py prepare
     - name: Build main module
-      run: python3 .ci/cue.py build
+      run: python .ci/cue.py build
     - name: Run main module tests
-      run: python3 .ci/cue.py -T 20M test
+      run: python .ci/cue.py -T 20M test
     - name: Upload tapfiles Artifact
       if: ${{ always() }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: tapfiles ${{ matrix.name }}
         path: '**/O.*/*.tap'
         if-no-files-found: ignore
     - name: Collect and show test results
       if: ${{ always() }}
-      run: python3 .ci/cue.py -T 5M test-results
-
-  build-docker:
-    name: Docker CentOS-7
-    runs-on: ubuntu-latest
-    env:
-      CMP: gcc
-      BCFG: default
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: true
-    
-    - name: Run...
-      run: |
-        env > env.list
-        cat <<EOF > runit.sh
-        #!/bin/sh
-        set -e -x
-        cd /io
-        id
-
-        sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
-        sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
-        sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
-        yum -y install epel-release
-        yum -y install \
-          curl make gcc curl-devel expat-devel gettext-devel openssl-devel zlib-devel perl-ExtUtils-MakeMaker \
-          python3 gdb make perl gcc-c++ glibc-devel readline-devel ncurses-devel perl-devel perl-Test-Simple \
-          libevent-devel sudo re2c
-        [ -e /usr/bin/python ] || ln -sf /usr/bin/python3 /usr/bin/python
-
-        # fake out cue.py
-        ln -s /bin/true /usr/bin/apt-get
-
-        # quiet warnings spam from perl
-        export LANG=C
-
-        python --version
-        python .ci/cue.py prepare
-        python .ci/cue.py build
-        python .ci/cue.py -T 15M test
-        python .ci/cue.py test-results
-        EOF
-        chmod +x runit.sh
-        docker run --rm --quiet \
-          --pull=always \
-          --env-file env.list \
-          -v `pwd`:/io \
-          centos:7 \
-          /io/runit.sh
+      run: python .ci/cue.py -T 5M test-results

.github/workflows/codeql.yml

@@ -1,64 +0,0 @@
-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,7 +3,6 @@
 /lib/
 /db/
 /dbd/
-/doc/
 /html/
 /include/
 /templates/

.gitmodules

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

.lgtm.yml

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

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

Makefile

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

configure/CONFIG.gnuCommon

@@ -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,13 +45,10 @@ 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)
 
@@ -68,24 +65,6 @@ 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,7 +48,7 @@ EPICS_VERSION = 7
 EPICS_REVISION = 0
 
 # EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 9
+EPICS_MODIFICATION = 7
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included in the official EPICS version number if zero
@@ -71,3 +71,6 @@ endif
 EPICS_SHORT_VERSION=$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)$(EPICS_PATCH_VSTRING)
 EPICS_VERSION_NUMBER=$(EPICS_SHORT_VERSION)$(EPICS_DEV_SNAPSHOT)$(EPICS_SITE_VSTRING)
 EPICS_VERSION_STRING="EPICS Version $(EPICS_VERSION_NUMBER)"
+
+# Provide this in case anyone is still using the old name
+COMMIT_DATE="-no-date-"

configure/CONFIG_CA_VERSION

@@ -2,7 +2,7 @@
 
 EPICS_CA_MAJOR_VERSION = 4
 EPICS_CA_MINOR_VERSION = 14
-EPICS_CA_MAINTENANCE_VERSION = 6
+EPICS_CA_MAINTENANCE_VERSION = 3
 
 # Development flag, set to zero for release versions
 

configure/CONFIG_COMMON

@@ -81,6 +81,23 @@ 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
 
@@ -405,9 +422,9 @@ INSTALL_LIB_INSTALLS = $(addprefix $(INSTALL_LIB)/,$(notdir $(LIB_INSTALLS)))
 
 #---------------------------------------------------------------
 # Installed file permissions
-BIN_PERMISSIONS = 755
-LIB_PERMISSIONS = 644
-SHRLIB_PERMISSIONS = 755
+BIN_PERMISSIONS = 555
+LIB_PERMISSIONS = 444
+SHRLIB_PERMISSIONS = 555
 INSTALL_PERMISSIONS = 444
 
 #---------------------------------------------------------------
@@ -469,9 +486,4 @@ 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,7 +12,6 @@ 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
@@ -22,7 +21,6 @@ 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 = 24
+EPICS_DATABASE_MINOR_VERSION = 22
 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 = 24
+EPICS_LIBCOM_MINOR_VERSION = 22
 EPICS_LIBCOM_MAINTENANCE_VERSION = 1
 
 # Development flag, set to zero for release versions

configure/CONFIG_SITE

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

configure/CONFIG_SITE_ENV

@@ -92,6 +92,3 @@ EPICS_IOC_LOG_FILE_NAME=
 EPICS_IOC_LOG_FILE_COMMAND=
 EPICS_IOC_LOG_FILE_LIMIT=1000000
 
-# Set to 'YES' to call abort() rather than suspend the current thread
-# when an assert() fails
-EPICS_ABORT_ON_ASSERT=NO

configure/Makefile

@@ -34,9 +34,5 @@ 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) $(COMMON_DOCS)
+	$(INSTALL_DBDS) $(INSTALL_DBD_INSTALLS)
 
 build: $(COMMON_DBS) $(INSTALL_DBS) \
 	$(DBDDEPENDS_FILES) $(TARGETS) \
@@ -427,26 +427,6 @@ $(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,8 +22,7 @@ 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) $(COMMON_DIR)
-vpath %.md $(USR_VPATH) $(ALL_SRC_DIRS) $(COMMON_DIR)
+vpath %.html $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.skel.static $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.y $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.l $(USR_VPATH) $(ALL_SRC_DIRS)
@@ -101,6 +100,23 @@ include $(CONFIG)/RULES_FILE_TYPE
 
 include $(CONFIG)/RULES.Db
 
+#---------------------------------------------------------------
+# Do not build anything if current path matches SKIP_BUILDS
+
+ifneq (,$(strip $(SKIP_BUILDS)))
+CURRENT_MODULE=$(subst modules/,,$(subst $(realpath $(TOP)/..)/,,$(subst $(realpath $(dir $(lastword $(MAKEFILE_LIST)))..)/,,$(realpath ..))))
+ifneq ($(filter $(SKIP_BUILDS) $(addsuffix /%,$(SKIP_BUILDS)),$(CURRENT_MODULE)),)
+$(info Skipping $(CURRENT_MODULE) for $(T_A))
+PROD=
+TESTPROD=
+LIBRARY=
+TESTLIBRARY=
+LOADABLE_LIBRARY=
+TESTS=
+SRC_FILES=
+endif
+endif
+
 #---------------------------------------------------------------
 # Include defines and rules for prod, library and test* targets
 
@@ -112,7 +128,7 @@ endif
 #---------------------------------------------------------------
 # Read dependency files
 
-ifneq ($(filter-out inc,$(strip $(MAKECMDGOALS))),)
+ifneq (inc,$(strip $(MAKECMDGOALS)))
 ifneq (,$(strip $(HDEPENDS_FILES)))
 $(filter-out $(wildcard *$(DEP)), $(HDEPENDS_FILES)): | $(COMMON_INC)
 -include $(HDEPENDS_FILES)
@@ -166,12 +182,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_DOCS)
+	$(INSTALL_HTMLS) $(INSTALLS_PERL_MODULES) $(INSTALL_SCRIPTS)
 
 buildInstall: \
 	$(INSTALL_PROD) $(INSTALL_MUNCHS) \
 	$(INSTALL_TCLLIBS) $(INSTALL_TCLINDEX) \
+	$(INSTALL_DOCS) \
 	$(INSTALL_OBJS) \
 	$(INSTALL_TEMPLATE) \
 	$(INSTALL_BIN_INSTALLS)
@@ -227,7 +243,7 @@ $(LOADABLE_SHRLIBNAME): FINAL_DIR=$(INSTALL_SHRLIB)
 
 $(TESTPRODNAME) $(PRODNAME): $(PRODUCT_OBJS) $(PROD_RESS) $(PROD_DEPLIBS)
 
-$(TESTPRODNAME) $(PRODNAME): %$(EXE): | $(INSTALL_LIB)
+$(TESTPRODNAME) $(PRODNAME): %$(EXE):
 	@$(RM) $@
 	$(LINK.cpp)
 	$(MT_EXE_COMMAND)
@@ -330,10 +346,6 @@ $(LOADABLE_SHRLIBNAME): $(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX):
 	$(LINK.shrlib)
 	$(MT_DLL_COMMAND)
 
-$(LIBNAME) $(SHRLIBNAME) $(LOADABLE_SHRLIBNAME): | $(INSTALL_LIB)
-$(INSTALL_LIB):
-	@$(MKDIR) $@
-
 #---------------------------------------------------------------
 # C++ munching for VxWorks
 
@@ -533,11 +545,11 @@ endif # LOADABLE_SHRLIB_SUFFIX
 ifneq ($(INSTALL_CONFIGS),)
 $(INSTALL_CONFIG)/%: %
 	$(ECHO) "Installing config file $@"
-	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $(abspath $< $(@D))
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_CONFIG)/%: ../%
 	$(ECHO) "Installing config file $@"
-	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $(abspath $< $(@D))
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 endif
 
 $(INSTALL_INCLUDE)/%: $(COMMON_DIR)/%
@@ -556,10 +568,6 @@ $(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

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

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

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

configure/os/CONFIG.Common.RHEL8-x86_64

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

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

@@ -0,0 +1,3 @@
+include $(CONFIG)/os/CONFIG.Common.linux-clang
+
+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,47 +102,15 @@ OS_CLASS = RTEMS
 # Operating system compile & link flags
 OP_SYS_CFLAGS += -D__LINUX_ERRNO_EXTENSIONS__
 
-# Has RTEMS been built with the internal legacy stack?
-ifeq ($(RTEMS_LEGACY_NETWORKING_INTERNAL),yes)
-RTEMS_HAS_NETWORKING = yes
-RTEMS_NETWORKING = legacy_internal
+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
 endif
 
-# 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_posix_NET_yes = -ltftpfs -lnfs -lz -ltelnetd
+OP_SYS_LDLIBS_posix_NET_no = -ltftpfs -lbsd -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,6 +1,7 @@
 #
 # Author: Matt Rippa
 #
+RTEMS_BSP = mvme2307
 RTEMS_TARGET_CPU = powerpc
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 ARCH_DEP_CFLAGS += -DHAVE_PPCBUG
@@ -22,9 +23,3 @@ 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 ($(shell test $(RTEMS_VERSION) -ge 5; echo $$?),0)
+ifeq ($(RTEMS_VERSION),5)
   $(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
-ifeq ($(shell test $(RTEMS_VERSION) -lt 5; echo $$?),0)
+ifneq ($(firstword $(subst ., ,$(RTEMS_VERSION))),5)
   $(info *** This target is not compatible with the configured RTEMS version.)
   $(info *** Build the RTEMS-pc386 (-qemu) target for RTEMS 4.x)
   $(error Can't continue)

configure/os/CONFIG.Common.RTEMS49-pc386

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

configure/os/CONFIG.Common.RTEMS51-pc686

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

configure/os/CONFIG.Common.T2-ppc604

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

configure/os/CONFIG.Common.V62-ppc604

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

configure/os/CONFIG.Common.V63-ppc603

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

configure/os/CONFIG.Common.V63-ppc604

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

configure/os/CONFIG.Common.V64-ppc604

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

configure/os/CONFIG.Common.V66-ppc603

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

configure/os/CONFIG.Common.V66-ppc604

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

configure/os/CONFIG.Common.V67-ppc604

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

configure/os/CONFIG.Common.V69-ppc32

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

configure/os/CONFIG.Common.V69-ppc604

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

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

configure/os/CONFIG.Common.eldk42-ppc4xxFP

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

configure/os/CONFIG.Common.eldk51-ppc4xxSF

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

configure/os/CONFIG.Common.eldk52-e500v2

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

configure/os/CONFIG.Common.eldk53-ppc4xxFP

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

configure/os/CONFIG.Common.fslqoriq20-e6500_64

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

configure/os/CONFIG.Common.gcc8-ppc4xxFP

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

configure/os/CONFIG.Common.iosCommon

@@ -42,6 +42,12 @@ 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.linux-clang

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

configure/os/CONFIG.Common.moxa42-armv6l

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

configure/os/CONFIG.Common.mvl40-xscale_be

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

configure/os/CONFIG.Common.nilrt7-armv7a

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

configure/os/CONFIG.Common.raspbian-arm

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

configure/os/CONFIG.Common.yocto21-aarch64

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

configure/os/CONFIG.Common.yocto40-aarch64

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

configure/os/CONFIG.Linux.windows-x64

@@ -0,0 +1,6 @@
+include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
+
+VALID_BUILDS = Ioc Command
+
+PATH := /opt/wine-msvc-2017/bin/x64:$(PATH)
+export WINEPREFIX = $(HOME)/.wine-$(EPICS_HOST_ARCH)

configure/os/CONFIG.RHEL7-x86_64.Common

@@ -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.RHEL7-x86_64.RHEL7-x86_64

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

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

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

configure/os/CONFIG.RHEL8-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.RHEL8-x86_64.RHEL7-x86_64

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

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

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

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

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

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

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

configure/os/CONFIG.darwin-aarch64-debug.Common

@@ -1,11 +0,0 @@
-# CONFIG.darwin-aarch64-debug.Common
-#
-# Definitions for darwin-aarch64-debug host builds - darwin-aarch64 target build with debug compiler flags
-# Sites may override these definitions in CONFIG_SITE.darwin-aarch64-debug.Common
-#-------------------------------------------------------
-
-include $(CONFIG)/os/CONFIG.darwin-aarch64.Common
-
-# Removes -O optimization and adds -g compile option
-HOST_OPT=NO
-

configure/os/CONFIG.darwin-aarch64.darwin-aarch64-debug

@@ -1,14 +0,0 @@
-# CONFIG.darwin-aarch64.darwin-aarch64-debug
-#
-# Definitions for darwin-aarch64 host - darwin-aarch64-debug target build with debug compiler flags
-# Sites may override these definitions in CONFIG_SITE.darwin-aarch64.darwin-aarch64-debug
-#-------------------------------------------------------
-
--include $(CONFIG)/os/CONFIG.Common.darwin-aarch64
--include $(CONFIG)/os/CONFIG.darwin-aarch64.darwin-aarch64
--include $(CONFIG)/os/CONFIG_SITE.Common.darwin-aarch64
--include $(CONFIG)/os/CONFIG_SITE.darwin-aarch64.darwin-aarch64
-
-
-BUILD_CLASS=HOST
-HOST_OPT = NO

configure/os/CONFIG.darwin-x86-debug.Common

@@ -1,11 +0,0 @@
-# CONFIG.darwin-x86-debug.Common
-#
-# Definitions for darwin-x86-debug host builds - darwin-x86 target build with debug compiler flags
-# Sites may override these definitions in CONFIG_SITE.darwin-x86-debug.Common
-#-------------------------------------------------------
-
-include $(CONFIG)/os/CONFIG.darwin-x86.Common
-
-# Removes -O optimization and adds -g compile option
-HOST_OPT=NO
-

configure/os/CONFIG.darwinCommon.darwinCommon

@@ -39,6 +39,12 @@ 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.freebsd-x86_64.freebsd-x86_64

@@ -2,23 +2,13 @@
 # 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
+GNU_DIR=/usr/local
 
 # 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 -nologo -l 0x409 $(INCLUDES) -fo $@ $<
+RCCMD = rc -l 0x409 $(INCLUDES) -fo $@ $<
 
 ARCMD = lib -nologo -verbose -out:$@ $(LIB_OPT_LDFLAGS) $(LIBRARY_LD_OBJS)
 

configure/os/CONFIG_SITE.Common.RTEMS

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

configure/os/CONFIG_SITE.Common.UnixCommon

@@ -0,0 +1,2 @@
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
+LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)

configure/os/CONFIG_SITE.Common.deb10-x86_64

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

configure/os/CONFIG_SITE.Common.gcc8-ppc4xxFP

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

configure/os/CONFIG_SITE.Common.linuxCommon

@@ -8,3 +8,16 @@
 # They must be set in the host+target specific file instead:
 #   CONFIG_SITE.<linux-arch>.<linux-arch>
 
+COMMANDLINE_LIBRARY = READLINE
+
+USR_CXXFLAGS += $(STD_CXXFLAGS)
+STD_CXXFLAGS = -std=c++11
+
+TOOLSET_DIR      = $(TOOLSET:%=$(TOOLSET_LOCATION)/%/root)
+GNU_DIR = $(SYSROOT)$(TOOLSET_DIR)
+TARGET_CPPFLAGS += $(SYSROOT:%=--sysroot=%)
+TARGET_LDFLAGS  += $(SYSROOT:%=--sysroot=%)
+
+ifeq ($(filter SL% RHEL%,$(T_A)),)
+VALID_BUILDS = Ioc Command
+endif

configure/os/CONFIG_SITE.Common.vxWorksCommon

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

configure/os/CONFIG_SITE.RHEL7-x86_64.Common

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

@@ -0,0 +1,11 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
+
+# Improved error checking with clang
+CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64-clang
+
+# Build for old RHEL7 64 bit
+CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64
+
+# NI Linux Real-Time 7.x
+# requires RPM gcc-c++-arm-linux-gnu
+CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a

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

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

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

configure/os/CONFIG_SITE.linux-x86_64.Common

@@ -7,3 +7,22 @@
 #CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
 #CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100
 
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
+
+GNU_HOST_ARCH_64=x86_64
+
+# Windows cross builds using Wine
+CROSS_COMPILER_TARGET_ARCHS += windows-x64
+
+# IOxOS IFC1211
+#CROSS_COMPILER_TARGET_ARCHS += fslqoriq20-e6500_64
+
+# Zynq
+#CROSS_COMPILER_TARGET_ARCHS += yocto21-aarch64
+CROSS_COMPILER_TARGET_ARCHS += yocto40-aarch64
+
+# Debian 10
+CROSS_COMPILER_TARGET_ARCHS += deb10-x86_64
+
+# Newer DeltaTau PowerPMAC
+#CROSS_COMPILER_TARGET_ARCHS += gcc8-ppc4xxFP

configure/toolchain.c

@@ -30,26 +30,9 @@ 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
-#  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
+OS_API = score
 #  endif
 #endif
 

documentation/.gitignore

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

documentation/ComponentReference.pod

@@ -163,8 +163,8 @@ Database Link types, which are documented here:
 
 Corrections to these documents can be submitted as patch files to the EPICS
 core developers, or as GitHub  pull requests to the 7.0 branch of Base.
-These document sources can be found under C<modules/database/src> tree, mostly
-in the C<std/rec> and C<ioc/db> directories in files with extension C<.dbd.pod>.
+These document sources can be found under `modules/database/src` tree, mostly
+in the `std/rec` and `ioc/db` directories in files with extension `.dbd.pod`.
 The documentation source format is a combination of the EPICS DBD file format
-with an extended version of Perl's POD (plain old documentation); run
-C<perldoc pod> for details of POD.
+with an extended version of Perl's POD (plain old documentation); run `perldoc
+pod` for details of POD.

documentation/Doxyfile@

@@ -759,10 +759,10 @@ WARN_LOGFILE           =
 # spaces.
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = ../RELEASE_NOTES.md \
+INPUT                  = ../mainpage.dox \
+                         ../RELEASE_NOTES.md \
                          ../README.md \
-                         @TOP@/include \
-                         @TOP@/doc
+                         @TOP@/include
 
 # 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           = YES
+GENERATE_XML           = NO
 
 # 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           = YES
 # The default directory is: xml.
 # This tag requires that the tag GENERATE_XML is set to YES.
 
-XML_OUTPUT             = @RTD_SRC@/xml
+XML_OUTPUT             = 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        = YES
+MACRO_EXPANSION        = NO
 
 # 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,17 +1986,7 @@ 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 \
-                         LIBCOM_API \
-                         DBCORE_API \
-                         LIBCA_API \
-                         DBRECSTD_API \
-                         EPICS_ALWAYS_INLINE \
-                         epicsShareExtern \
-                         epicsShareClass \
-                         epicsShareFunc \
-                         epicsShareAPI \
-                         epicsStdCall
+PREDEFINED             = __cplusplus
 
 # 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

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

documentation/KnownProblems.html

@@ -0,0 +1,34 @@
+<?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,168 +7,25 @@ EXPAND_ME += EPICS_REVISION
 EXPAND_ME += EPICS_MODIFICATION
 EXPAND_ME += EPICS_PATCH_LEVEL
 EXPAND_ME += OS_CLASS CMPLR_CLASS
-EXPAND_ME += RTD_SRC
 
-DOXYGEN ?= doxygen
+HTMLS += ComponentReference.html
 
-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
+TARGETS += doxygen
 
-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
+DOXYGEN = doxygen
+ME = documentation/O.$(T_A)/html
+GH_FILES = $(ME)/ $(ME)/.nojekyll $(ME)/*.* $(ME)/*/*.*
 
 include $(TOP)/configure/RULES
 
-$(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: Doxyfile ../mainpage.dox $(INSTALL_HTMLS)
 	$(DOXYGEN)
+	rsync -av $(TOP)/html/ html/
 
-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)/
+.PHONY: doxygen
 
-sphinx: rtd
-	cd $(COMMON_DIR); $(PYTHON) -m sphinx rtd-src readthedocs
-	rsync -av $(COMMON_DIR)/readthedocs $(INSTALL_HTML)/
-endif
+commit: doxygen
+	$(TOUCH) html/.nojekyll
+	(cd $(TOP) && $(CURDIR)/../commit-gh.sh $(GH_FILES))
 
-.PHONY: doxygen rtd sphinx
+.PHONY: commit

documentation/README.md

@@ -1,7 +1,27 @@
-# Installation instructions
+# Installation Instructions {#install}
 
 ## 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
@@ -16,8 +36,8 @@ interfaces) of various types.
 
 ### What is new in this release?
 
-Please check the [release notes](RELEASE_NOTES.md)
-for description of changes and release migration details.
+Please check the `documentation/RELEASE_NOTES.md` file for
+description of changes and release migration details.
 
 ### Copyright
 
@@ -60,7 +80,8 @@ executable must be found through your normal search path.
 
 #### Unzip and tar (Winzip on WIN32 systems)
 
-You may need tools to unzip and untar the EPICS base distribution file.
+You must have tools available to unzip and untar the EPICS base
+distribution file.
 
 #### Target systems
 
@@ -70,7 +91,7 @@ running as processes on the host platform.
 
 #### vxWorks
 
-You must have vxWorks 6.8 or 6.9 installed if any of your target
+You must have vxWorks 6.8 or later 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
@@ -99,10 +120,16 @@ 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 from the
-[EPICS Documentation Website](https://docs.epics-controls.org/).
+EPICS documentation is available through the [EPICS website](https://epics.anl.gov/) at Argonne.
 
 Release specific documentation can also be found in the
 `base/documentation` directory of the distribution.
@@ -116,10 +143,8 @@ 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 for templates and build tools
-    base/modules        Source code for distribution submodules
+    base/src            Source code in various subdirectories
     base/startup        Scripts for setting up path and environment
-    base/test           Unit tests for build tools
 ```
 
 #### Directories created by the build
@@ -133,8 +158,7 @@ configuration variable if that has been set.
     cfg               Installed build configuration files
     db                Installed database files
     dbd               Installed database definition files
-    doc               Installed Markdown documentation
-    html              Installed HTML 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
@@ -145,11 +169,12 @@ configuration variable if that has been set.
 
 #### `base/documentation` Directory
 
-This contains EPICS reference documentation.
+This contains documents on how to setup, build, and install EPICS.
 
 ```
     README.md           This file
     RELEASE_NOTES.md    Notes on release changes
+    KnownProblems.html  List of known problems and workarounds
 ```
 
 #### `base/startup` Directory
@@ -247,7 +272,8 @@ 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.
+require `as` and `ld` in your path. On Solaris systems you need
+`uname` in your path.
 
 * **`LD_LIBRARY_PATH`**
 EPICS shared libraries and executables normally contain the full path
@@ -264,6 +290,7 @@ 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
+# EPICS 7.0 Release Notes    {#releasenotes}
 
 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
@@ -8,214 +8,19 @@ under the 3.15 release to which they were originally committed.** Thus it is
 important to read more than just the first section to understand everything that
 has changed in each release.
 
-The external PVA submodules each have their own individual release notes files.
-However the entries describing changes included in those submodules since EPICS
-7.0.5 have now been copied into the appropriate place of this file.
+The PVA submodules each have their own individual sets of release notes which
+should also be read to understand what has changed since earlier releases:
 
-__This version of EPICS has not been released yet.__
+- [normativeTypes](https://github.com/epics-base/normativeTypesCPP/blob/master/documentation/RELEASE_NOTES.md)
+- [pvAccess](http://epics-base.github.io/pvAccessCPP/pvarelease_notes.html)
+- [pvData](http://epics-base.github.io/pvDataCPP/release_notes.html)
+- [pvDatabase](https://github.com/epics-base/pvDatabaseCPP/blob/master/documentation/RELEASE_NOTES.md)
+- [pva2pva](https://epics-base.github.io/pva2pva/release_notes.html)
+- [pvaClient](https://github.com/epics-base/pvaClientCPP/blob/master/documentation/RELEASE_NOTES.md)
 
-## Changes made on the 7.0 branch since 7.0.9
+**This version of EPICS has not been released yet.**
 
-__Add new items below here__
-
-### Reduce symbol and macro pollution from epicsAtomic.h on WIN32
-
-`epicsAtomic.h` no longer pulls in as many unneeded declarations and macros from
-`windows.h`. Prior to this change, including `epicsAtomic.h` at the wrong time
-could result in unexpected compiler errors. Due to the nature of `windows.h`,
-some unneeded declarations are still pulled in, however the number is greatly reduced.
-Code that needs these declarations should explicitly include `windows.h` before `epicsAtomic.h`.
-
-### epicsExport simplifications
-
-`epicsExportAddress()`, `epicsExportRegistrar()` and `epicsRegisterFunction()`
-no longer require to be wrapped in `extern "C" { }` in C++ code.
-
-### New `dbServerStats()` API for iocStats
-
-A new routine provides the ability to request channel and client counts from
-named server layers that implement the `stats()` method, or to get a summary
-of the counts from all registered server layers. A preprocessor macro
-`HAS_DBSERVER_STATS` macro is defined in the `dbServer.h` header file to
-simplify code that needs to support older versions of Base as well.
-
------
-
-## EPICS Release 7.0.9
-
-### Core documentation published at ReadTheDocs
-
-The `documentation` directory's `Makefile` can now run various publication scripts including Sphinx and Doxygen to generate formatted documentation that is now being published
-[at docs.epics-controls.org](https://docs.epics-controls.org/projects/base/en/latest/index.html)
-and integrated into the main [EPICS Documentation website](https://docs.epics-controls.org/en/latest/index.html).
-The best place to find out more about these mechanisms is the
-[Contribution Guide](https://docs.epics-controls.org/en/latest/CONTRIBUTING.html)
-although it doesn't currently cover the new processes added to epics-base.
-
-Much of the documentation generated from .dbd.pod files at build time is now
-also being converted into MarkDown (.md) files and installed into the top-level
-`doc` directory. Some users might find it quicker to look up information about a
-record type by opening these files in a text editor intead of opening a browser
-and loading the HTML versions or finding and opening the files from the EPICS
-Documentation site.
-
-### Post monitors from compress record when it's reset
-
-Writing into a compress record's `RES` field now posts a monitor event instead
-of only changing `VAL`. Monitor clients will therefore receive an empty array.
-
-### The AMSG error message propagates through MSS links
-
-A database link with the MSS attribute will now propagate not only SEVR and
-STAT, but also AMSG. This field contains additional information that complements
-STAT. Links with MS or MSI attributes do not propagate STAT, and therefore do
-not propagate AMSG, either.
-
-Channel Access links do not propagate AMSG, regardless of the MSS attribute,
-because the message is not available as Channel metadata.
-
-### Reloading record aliases
-
-Aliases can now be defined more than once as long as they still refer to the
-same record, unless the global variable `dbRecordsOnceOnly` is non-zero.
-This allows database files to be loaded multiple times, even if they contain
-alias definitions.
-
-### `DBE_PROPERTY` event rate changed
-
-Updating property fields now only posts `DBE_PROPERTY` events if the
-field actually changed.
-
-### Changes to msi related to include paths
-
-There are two changes to `msi` included here.
-
-`msi` now treats files included by .template or .substutiions files in a more
-consistent way: for relative paths, it will always look relative to the current
-working directory if no `-I` flags are passed, and if they are passed then it
-will search for the _relative_ path from each of those flags. That is, the
-following will now find the file `bar.template` located at
-`/some/path/rel/path/bar.template`
-```
-$ cat foo.substitutions
-file rel/path/bar.template {
- # contents
-}
-$ msi -I /some/path foo.substitutions
-```
-
-Note that this does provide one change from previous behaviour: when opening a
-file from the command line, `msi` will not use the `-I`-specified paths to
-search for the file, but will only work relative to the current working
-directory, consistent with most commandline utilities.
-
-### 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") {}
-```
-
-### Only keep readline history for interactive sessions
-
-Previously, all IOCsh commands were persisited in the libreadline history
-(when readline support is included).
-Going forward, only interactive commands are saved.
-
-### Type change to asTrap serverSpecific data
-
-Change `void*` to `dbChannel*` in `asTrapWriteBeforeWithData()` and
-`asTrapWriteMessage::serverSpecific` to reflect the reality since
-the `dbAddr*` to `dbChannel*` migration.
-External code wishing to support both before and after 3.15 should
-already be conditionally casting to/from the appropriate type.
-
-### Fix issues with `_FORTIFY_SOURCE=3`
-
-This release fixes the false positives failures whhen building with `_FORTIFY_SOURCE` level 3.
-The override introduced in 7.0.8.1 has been removed.
-
-### Other
-
-- genVersionHeader: work with git submodules and worktrees.
-- avoid UB with self `pthread_join()`
-- freebsd: Add support for x86 and amd64 builds
-- Clear AMSG when SEVR becomes zero.
-- `seqRecord` fix support for link `DLY0`
-- Add `ABORT_ON_ASSERT` flag to `CONFIG_SITE_ENV`
-- rationalize osdMutex
-
-### Submodule updates
-
-The pvDatabase module was updated to version 4.7.2:
-
-* Resolved issue with changed field set in the case where the top level (master)
-field ("_") is not requested by the client, but the master field callback causes
-all fields to be marked as updated, rather than only those fields that have
-actually been modified.
-
------
-
-## 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
+## Changes made on the 7.0 branch since 7.0.7
 
 ### bi "Raw Soft Channel" use MASK
 
@@ -402,50 +207,6 @@ The floating point modulo function `FMOD(NUM,DEN)` has been added to the CALC
 expression engine and is available to all software using that (calc and calcout
 record types, access security library and some extensions).
 
-### Submodule updates
-
-The pvData module was updated to version 8.0.6:
-
-- Compatible changes
-  - Actually enable JSON-5 output in PVStructure::Formatter::JSON when available.
-  - Fix unaligned access issues for some ARM/Linux targets.
-
-The pvAccess module was updated to version 7.1.7:
-
-- Changes
-  - Registering the PVA server with the IOC now sets the `PVAS_SERVER_PORT`
-    variable in the environment.
-
-The pva2pva module was updated to version 1.4.1:
-
-- Bug Fixes
-  - `dbLoadGroup` was fixed
-- Additions
-  - Support for "meta" member at top of array of structs
-
-The pvDatabase module was updated to version 4.7.1:
-
-* Added data distributor plugin which can be used for distributing data between
-  a group of clients. The plugin is triggered by the request string of the
-  form:
-
-  `_[distributor=group:<group id>;set:<set_id>;trigger:<field_name>;updates:<n_updates>;mode:<update_mode>]`
-
-  The plugin parameters are optional and are described bellow:
-
-  - group: this parameter indicates a group that client application belongs to (default value: "default"); groups of clients are completely independent of each other
-
-  - set: this parameter designates a client set that application belongs to within its group (default value: "default")
-
-  - trigger: this is the PV structure field that distinguishes different channel updates (default value: "timeStamp"); for example, for area detector images one could use the "uniqueId" field of the NTND structure
-
-  - updates: this parameter configures how many sequential updates a client (or a set of clients) will receive before the data distributor starts updating the next one (default value: "1")
-
-  - mode: this parameter configures how channel updates are to be distributed between clients in a set:
-    - one: update goes to one client per set
-    - all: update goes to all clients in a set
-    - default is "one" if client set id is not specified, and "all" if set id is specified
-
 -----
 
 ## EPICS Release 7.0.7
@@ -524,10 +285,10 @@ changed to `(p)->dtor`.
 The order over operations when processing a waveformRecord is adjusted
 so that updates to NORD is posted with the correct timestamp.
 
-### Automatic `COMMANDLINE_LIBRARY` with newer compilers
+### Automatic COMMANDLINE_LIBRARY w/ newer compilers
 
 When built with a compiler supporting `__has_include<>`, the presence
-of a `readline/readline.h` header will be used to automatically determine
+of the `<readline/readline.h>` will be used to automatically determine
 a default value for `COMMANDLINE_LIBRARY`.
 
 Mingw builds with readline support now link `-ltermcap` instead of `-lcurses`.
@@ -696,44 +457,6 @@ or if unsupported (`$TERM` not set, or Windows < 10).
 The `dbnd` server side filter now passes through alarm and property
 change events, even when not exceeding the deadband.
 
-### Submodule updates
-
-The pvData module was updated to version 8.0.5:
-
-- Compatible changes
- - Internal changes to use the YAJL API for generating JSON and JSON-5 output.
-
-The pvAccess module was updated to version 7.1.6:
-
-- Changes to caProvider
-  - Bug fix related to enum values.
-  - More internal changes to improve performance when connecting tens of
-    thousands of CA channels.
-- Several minor internal improvements.
-
-The pva2pva module was updated to version 1.4.0:
-
-- Bug Fixes
- - Apply ACF when writing to atomic group
-- Additions
- - Add new "structure" to @ref qsrv_group_map_types
-- Changes
- - Add Access Security hooks for single and group writes.
- - Enable "Async Soft Channel" for output links
- - When built against Base 7.0.6.1, set timeStamp.userTag from UTAG field.
- - Add DTYP="QSRV Set UTag" for longin, which sets UTAG=VAL.
-
-The pvDatabase module was updated to version 4.7.0:
-
-* Added support for the whole structure (master field) server side plugins.
-  The whole structure is identified as the `_` string, and a pvRequest string
-  that applies a plugin to it takes the form:
-
-  `field(_[XYZ=A:3;B:uniqueId])`
-
-  where `XYZ` is the name of a specific filter plugin that takes parameters
-  `A` and `B` with values `3` and `uniqueId` respectively.
-
 -----
 
 ## EPICS Release 7.0.6.1
@@ -800,15 +523,6 @@ This was done to simplify the code and may have improved performance slightly fo
 
 Many of the built-in record types have had improvements to their documentation with additional fields added to the tables, rewrites of descriptions and links to other documents added or fixed.
 
-### Submodule updates
-
-The pvAccess module was updated to version 7.1.4:
-
-- Changes to caProvider
-  - Resolve issues with pv structures that don't have a value field
-  - Add NULL checks for handling unusual structures
-  - Speed up channel creation when using large numbers of channels
-
 -----
 
 ## EPICS Release 7.0.6
@@ -819,7 +533,7 @@ These target architectures have been removed:
 
 + darwin-ppc, darwin-ppcx86
 + linux-386, linux-486, linux-586, linux-686, linux-athlon (cross-build)
-+ linux-cris, linux-cris\_v10, linux-cris\_v32 (cross-build)
++ linux-cris, linux-cris_v10, linux-cris_v32 (cross-build)
 + RTEMS-at91rm9200ek, RTEMS-gen68360, RTEMS-mcp750, RTEMS-mvme167,
 RTEMS-psim (cross-build)
 
@@ -837,9 +551,9 @@ running on RTEMS 5:
 
 - RTEMS-beagleboneblack
 - RTEMS-pc686
-- RTEMS-qoriq\_e500 (MVME2500)
-- RTEMS-xilinx\_zynq\_a9\_qemu
-- RTEMS-xilinx\_zynq\_zedboard
+- RTEMS-qoriq_e500 (MVME2500)
+- RTEMS-xilinx_zynq_a9_qemu
+- RTEMS-xilinx_zynq_zedboard
 
 The EPICS support for RTEMS 4 has always relied on RTEMS-specific
 kernel APIs which cannot be used on an SMP system, so a new port was
@@ -851,7 +565,7 @@ to run `make distclean` if switching a single source tree from one
 to the other (both header files and dependency files are different
 between the two and must be cleaned out).
 
-The configuration variable `RTEMS_VERSION` in the EPICS config file
+The configuration variable RTEMS_VERSION in the EPICS config file
 `configure/os/CONFIG_SITE.Common.RTEMS` must be set to the full 3-
 part version number for RTEMS 4 releases, e.g. `4.9.1`, `4.10.2`
 but for RTEMS 5.1 and later it must only contain the major version
@@ -933,6 +647,33 @@ 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,
@@ -1049,38 +790,32 @@ 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.
 
-### Submodule updates
+### Timeouts for Unit Test Programs
 
-The pvAccess module was updated to version 7.1.4:
+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.
 
-- Changes
-  - Adjust argument parsing with pvput (Jesus Vasquez).
+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:
 
-The pva2pva module was updated to version 1.3.1:
+```
+  TESTSCRIPTS_HOST += hourLongTest.t
+  hourLongTest.t: export EPICS_UNITTEST_TIMEOUT=3600
+```
 
-- Bug Fixes
- - Correct handling for server side filters.
-- Changes
- - Syncing softMain.cpp with epics-base
+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.
 
-The pvDatabase module was updated to version 4.6.0:
-
-* Access Security is now supported.
-* <b>special</b> has been revised and extended.
-* addRecord, removeRecord, processRecord, and traceRecord are replaced by pvdbcr versions.
-* <b>support</b> is DEPRECATED
-
-The pvaClient module was updated to version 4.8.0:
-
-* `PvaClientNTMultiData::getChannelChangeFlags` is a new method. It fixes
-  issue #66.
-* Fix for issue #68. Both `PvaClientArray` and `PvaClientField` are not longer
-  present. Neither was previously implemented.
-* Several public methods are now protected. They were never meant to be called
-  by clients.
-* Issue #70 has been fixed.
-* Changes was made to increase the performance of `pvaMultiChannel`.
-* doxygen changes were made.
+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.
 
 -----
 
@@ -1119,7 +854,7 @@ compile device supports as loadable modules.
 ### Priority inversion safe Posix mutexes
 
 On Posix systems, epicsMutex now support priority inheritance if available.
-The IOC needs to run with `SCHED_FIFO` engaged to use these.
+The IOC needs to run with SCHED_FIFO engaged to use these.
 Support for Posix implementations before POSIX.1-2001 (`_XOPEN_SOURCE < 500`,
 glibc version &lt; 2.3.3) has been dropped.
 
@@ -1252,14 +987,14 @@ properly handle zero-length arrays. The `caget`, `caput` and `camonitor`
 client programs are known to work with empty arrays as long as they were
 built with this or a later version of EPICS.
 
-#### Change to the db\_access.h `dbr_size_n(TYPE, COUNT)` macro
+#### Change to the db_access.h `dbr_size_n(TYPE, COUNT)` macro
 
 When called with COUNT=0 this macro no longer returns the number of bytes
 required for a scalar (1 element) but for an empty array (0 elements).
 Make sure code that uses this doesn't call it with COUNT=0 when it really
 means COUNT=1.
 
-Note that the db\_access.h header file is included by cadef.h so the change
+Note that the db_access.h header file is included by cadef.h so the change
 can impact Channel Access client programs that use this macro.
 
 #### Channel Access support for zero-length arrays
@@ -1369,35 +1104,6 @@ GNUmake added the directive `undefine` in version 3.82 to allow variables to
 be undefined. Support for this has been added to the EPICS Release file parser,
 so `undefine` can now be used in configure/RELEASE files to unset variables.
 
-
-### Submodule updates
-
-The pvData module was updated to version 8.0.4:
-
-- Incompatible changes
- - Remove `ByteBuffer::align()`
-- Compatible changes
- - Deprecate `SerializableControl::alignBuffer()` and
-   `DeserializableControl::alignData()`
- - `shared_vector_convert<>()` fix convert of empty, untyped, array
-
-The pvAccess module was updated to version 7.1.3:
-
-- Bug fixes
-  - Increase default TCP timeout to 40 seconds.
-    Applies a 4/3 multiplier on `$EPICS_PVA_CONN_TMO` for compatibility.
-  - CA Provider implementation restructured to simplify, reduce duplication
-    and fix issues #163 and #165.
-- Changes
-  - Enable building of pvtools to all except vxWorks, RTEMS and iOS.
-
-The pva2pva module was updated to version 1.3.0:
-
-- Changes
- - Add `dbLoadGroup()` iocsh function to read group JSON definitions
-   from a file.  Mappings in files must refer to full record names
-   instead of fields.  eg. 'recname.VAL' instead of 'VAL'.
-
 -----
 
 ## EPICS Release 7.0.4.1
@@ -1463,7 +1169,7 @@ The following launchpad bugs have fixes included in this release:
   operators on aarch64
 - [lp: 1853148](https://bugs.launchpad.net/bugs/1853148), mingw compiler
   problem with printf/scanf formats
-- [lp: 1852653](https://bugs.launchpad.net/bugs/1852653), `USE_TYPED_DSET`
+- [lp: 1852653](https://bugs.launchpad.net/bugs/1852653), USE_TYPED_DSET
   incompatible with C++
 - [lp: 1862328](https://bugs.launchpad.net/bugs/1862328), Race condition on
   IOC start leaves rsrv unresponsive
@@ -1473,7 +1179,7 @@ The following launchpad bugs have fixes included in this release:
 - [lp: 1868680](https://bugs.launchpad.net/bugs/1868680), Access Security file
   reload (asInit) fails
 
-### `*_API` macros in EPICS headers
+### \*_API macros in EPICS headers
 
 Internally, the Com and ca libraries now express dllimport/export (Windows)
 and symbol visibility (GCC) using library-specific macros (eg. `LIBCOM_API`)
@@ -1707,7 +1413,7 @@ The API functions `epicsGetExecDir()` and `epicsGetExecName()` are also
 added to `osiFileName.h` to provide runtime access to the directory or
 filename of the executable with which the process was started.
 
-### Decouple `LINKER_USE_RPATH` and `STATIC_BUILD`
+### Decouple LINKER_USE_RPATH and STATIC_BUILD
 
 Previously, setting `STATIC_BUILD=NO` implied `LINKER_USE_RPATH=NO`.
 This is no longer the case.  Setting `LINKER_USE_RPATH=YES` will
@@ -2286,7 +1992,7 @@ number instead, like this:
 Channel Access does not (and probably never will) directly support 64-bit
 integer types, so the new field types are presented to the CA server as
 `DBF_DOUBLE` values. This means that field values larger than 2^52
-(0x10\_0000\_0000\_0000 = 4503599627370496) cannot be transported over Channel
+(0x10_0000_0000_0000 = 4503599627370496) cannot be transported over Channel
 Access without their least significant bits being truncated. The EPICS V4
 pvAccess network protocol _can_ transport 64-bit data types however, and a
 future release of the pvaSrv module will connect this ability to the fields of

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>Core Developers</strong></dt>
-    <dd>Responsible for maintaining the EPICS software</dd>
+  <dt><strong>Platform Developers</strong> (informal)</dt>
+    <dd>Responsible for individual operating system platforms</dd>
   <dt><strong>Application Developers</strong></dt>
     <dd>Responsible for support modules that depend on EPICS Base.</dd>
-  <dt><strong>Website Editors</strong></dt>
-    <dd>Responsible for the EPICS websites</dd>
+  <dt><strong>APS Website Editor</strong> (Andrew Johnson)</dt>
+    <dd>Responsible for the APS EPICS website</dd>
 </dl>
 
 <form>
@@ -72,22 +72,23 @@ everything that has to be done since it's so easy to miss steps.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Notify core developers about the upcoming release and ask about any
-        remaining tasks that must be finished.</td>
+      <td>Email all developers about the upcoming release and ask for a list
+        of 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.</td>
+        appropriately. All bugs that have been fixed should have been marked
+        as Fix Committed.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</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>
+      <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>
       </tr>
     <tr>
       <td>&nbsp;</td>
@@ -96,7 +97,6 @@ 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,8 +104,13 @@ 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.
-        Update the release version number in the tags and messages below.</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>
       </tr>
     <tr>
       <th colspan="3">Testing</th>
@@ -113,7 +118,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 internal test programs on all available host platforms using
+      <td>Run the built-in test programs on all available host platforms using
         <blockquote><tt>
           make -s runtests
         </tt></blockquote></td>
@@ -151,7 +156,6 @@ 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>
@@ -163,8 +167,8 @@ everything that has to be done since it's so easy to miss steps.</p>
     </tr>
     <tr>
       <td><input type="checkbox"></td>
-      <td>Core Developers</td>
-      <td>Reach a consensus that the software is ready to release.</td>
+      <td>Release Manager</td>
+      <td>Obtain a positive <q>Ok to release</q> from developers.</td>
       </tr>
     <tr>
       <th colspan="3">Creating the final release version</th>
@@ -179,56 +183,35 @@ 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.
-            Commit these changes (don't push).</li>
+            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>
 
           <li>Edit the module's release version file
-            <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 ci -m 'Final commit for &lt;module-version&gt;'
-              </tt></blockquote>
-            </li>
+            <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:
             <blockquote><tt>
-              git tag -m 'ANJ: Tag for EPICS 7.0.8.2' &lt;module-version&gt;
+              git tag -m 'ANJ: Tag for EPICS 7.0.7' &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, check the module's status matches the tag:
+            newly-tagged version, but don't commit yet:
             <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
@@ -238,8 +221,7 @@ 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
-            (assumed to be the <tt>upstream</tt> remote):
+          <li>Push commits and the new tag to the submodule's GitHub repository:
             <blockquote><tt>
               cd base-7.0/modules/&lt;module&gt;<br />
               git push --follow-tags upstream master
@@ -288,9 +270,10 @@ 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.8.2
+          git tag -m 'ANJ: Tagged for release' R7.0.7
           </tt></blockquote>
-        <p>Don't push to GitHub yet.</p>
+        <p>Don't push anything to the Launchpad repository
+          yet.</p>
         </td>
       </tr>
     <tr>
@@ -322,12 +305,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.8.2 ../base-7.0.8.2.tar.gz base-7.0.8.2/
+          ./.tools/make-tar.sh R7.0.7 ../base-7.0.7.tar.gz base-7.0.7/
           </tt></blockquote>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
           cd ..<br />
-          gpg --armor --sign --detach-sig base-7.0.8.2.tar.gz
+          gpg --armor --sign --detach-sig base-7.0.7.tar.gz
           </tt></blockquote>
         </td>
       </tr>
@@ -335,9 +318,8 @@ 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. 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):
+        least one supported platform. When this succeeds the commits and new git
+        tag can be pushed to the Launchpad repository:
         <blockquote><tt>
           git push --follow-tags upstream 7.0
           </tt></blockquote>
@@ -385,7 +367,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.org</th>
+      <th colspan="3">Publish to epics-controls</th>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
@@ -393,7 +375,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.8.2.tar.gz base-7.0.8.2.tar.gz.asc epics-controls:download/base<br />
+          scp base-7.0.7.tar.gz base-7.0.7.tar.gz.asc epics-controls:download/base<br />
           </tt></blockquote>
         </td>
       </tr>
@@ -410,22 +392,22 @@ everything that has to be done since it's so easy to miss steps.</p>
       </tr>
 
     <tr>
-      <th colspan="3">Publish to GitHub</th>
+      <th colspan="3">Publish to Launchpad</th>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
       <td>Release Manager</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>
+      <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>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
       <td>Release Manager</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>
+      <td>Find all Launchpad bug reports with the status Fix Committed which
+        have been fixed in this release and mark them Fix Released.</td>
       </tr>
 
     <tr>

documentation/commit-gh.sh

@@ -0,0 +1,45 @@
+#!/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"