AppVeyor: whitelist 7.0 branch

The AppVeyor epics-base-7 project is supposed to pull the .appveyor.yml from this branch to only build commits and pull requests from/for 7.0.

.appveyor.yml

@@ -1,11 +1,24 @@
-# AppVeyor configuration for EPICS Base
+# .appveyor.yml for use with EPICS Base ci-scripts
+# (see: https://github.com/epics-base/ci-scripts)
 
-# Ralph Lange <ralph.lange@gmx.de>
-# Copyright (c) 2016-2017 ITER Organization
+# branches to build
+branches:
+  # whitelist
+  only:
+    - 7.0
 
 # Version format
 version: base-{branch}-{build}
 
+#---------------------------------#
+#       build cache               #
+#---------------------------------#
+# The AppVeyor cache allowance is way too small (1GB per account across all projects, branches and jobs)
+# to be used for the dependency builds.
+
+cache:
+  - C:\Users\appveyor\.tools
+
 #---------------------------------#
 #       repository cloning        #
 #---------------------------------#
@@ -16,20 +29,22 @@ init:
   - git config --global core.autocrlf true
 
 # Set clone depth (do not fetch complete history)
-clone_depth: 50
+clone_depth: 5
 
 # Skipping commits affecting only specific files
 skip_commits:
   files:
     - 'documentation/*'
-    - 'templates/*'
     - '**/*.html'
     - '**/*.md'
+    - '.travis.yml'
 
 #---------------------------------#
 #   build matrix configuration    #
 #---------------------------------#
 
+image: Visual Studio 2015
+
 # Build Configurations: dll/static, regular/debug
 configuration:
   - dynamic
@@ -37,29 +52,45 @@ configuration:
   - dynamic-debug
   - static-debug
 
-# Environment variables: compiler toolchain
+# Environment variables: compiler toolchain, base version, setup file, ...
 environment:
-  matrix:
-  - TOOLCHAIN: 10.0
-  - TOOLCHAIN: 11.0
-  - TOOLCHAIN: 12.0
-  - TOOLCHAIN: 14.0
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    TOOLCHAIN: 2017
-  - TOOLCHAIN: cygwin
-  - TOOLCHAIN: mingw
+  # common / default variables for all jobs
+  SETUP_PATH: .ci-local:.ci
+  BASE: SELF
+  EPICS_TEST_IMPRECISE_TIMING: YES
 
-# Platform: architecture
+  matrix:
+  - CMP: vs2019
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+  - CMP: vs2017
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+  - CMP: vs2015
+  - CMP: vs2013
+  - CMP: vs2012
+  - CMP: vs2010
+  - CMP: gcc
+
+# Platform: processor architecture
 platform:
   - x86
   - x64
 
-# Matrix configuration: allow specific failing jobs
+# Matrix configuration: exclude sets of jobs
 matrix:
   exclude:
-  # VS Express installs don't have the 64 bit compiler
+  # VS2012 and older installs don't have the 64 bit compiler
   - platform: x64
-    TOOLCHAIN: 10.0
+    CMP: vs2012
+  - platform: x64
+    CMP: vs2010
+  - platform: x64
+    CMP: vs2008
+  # Exclude more jobs to reduce build time
+  # Skip 32-bit for "middle-aged" compilers
+  - platform: x86
+    CMP: vs2017
+  - platform: x86
+    CMP: vs2015
 
 #---------------------------------#
 #     building & testing          #
@@ -67,13 +98,33 @@ matrix:
 
 install:
   - cmd: git submodule update --init --recursive
-  - cmd: .ci/appveyor-prepare.bat
+  - cmd: python .ci/cue.py prepare
 
 build_script:
-  - cmd: .ci/appveyor-make.bat
+  - cmd: python .ci/cue.py build
 
 test_script:
-  - cmd: .ci/appveyor-make.bat runtests
+  - cmd: python .ci/cue.py test
+
+on_finish:
+  - ps: Get-ChildItem *.tap -Recurse -Force | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+  - cmd: python .ci/cue.py build test-results -s
+
+#---------------------------------#
+#         debugging               #
+#---------------------------------#
+
+## if you want to connect by remote desktop to a failed build, uncomment these lines
+## note that you will need to connect within the usual build timeout limit (60 minutes)
+## so you may want to adjust the build matrix above to just build the one of interest
+
+# print the connection info
+#init:
+#  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+
+# block a failed build (until the watchdog barks)
+#on_failure:
+#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
 #---------------------------------#
 #         notifications           #
@@ -81,6 +132,9 @@ test_script:
 
 notifications:
 
-  - provider: Slack
-    incoming_webhook:
-      secure: RYOm3FIUYeZGjWKaeTVKwq+C3fzK54AKwbmAoECED45mex3lN+8HmrC845a6mg9xPUJ/ND51RopWVaKDD9/UzaM0SO195RQLKqUTIUafiuM=
+  - provider: Email
+    to:
+      - core-talk@aps.anl.gov
+    on_build_success: false
+
+  - provider: GitHubPullRequest

.ci-local/travis-fixup.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e -u -x
+
+env|grep TRAVIS
+
+[ "$TRAVIS_OS_NAME" = "linux" ] || exit 0
+
+# Ensure there is an interface with a (correct) broadcast address
+# eg. 'trusty' VMs have interface broadcast address mis-configured
+# (why oh why do people insist on setting this explicitly?)
+
+sudo ip tuntap add dev tap42 mode tap
+
+sudo ip addr add 192.168.240.1/24 broadcast + dev tap42
+
+sudo ip link set dev tap42 up
+
+# note that this device will be UP but not RUNNING
+# so java will see it as not UP since java confuses UP and RUNNING

.ci/appveyor-make.bat

@@ -1,137 +0,0 @@
-:: Universal build script for AppVeyor (https://ci.appveyor.com/)
-:: Environment:
-::     TOOLCHAIN      -  toolchain version   [10.0/11.0/12.0/14.0/2017/cygwin/mingw]
-::     CONFIGURATION  -  determines EPICS build   [dynamic/static]
-::     PLATFORM       -  architecture   [x86/x64]
-::
-:: All command line args are passed to make
-
-Setlocal EnableDelayedExpansion
-
-set "ST="
-if /i "%CONFIGURATION%"=="static" set ST=-static
-
-set OS=64BIT
-if "%PLATFORM%"=="x86" set OS=32BIT
-
-echo [INFO] Platform: %OS%
-
-:: Use parallel make, except for 3.14
-set "MAKEARGS=-j2 -Otarget"
-if "%APPVEYOR_REPO_BRANCH%"=="3.14" set MAKEARGS=
-
-if "%TOOLCHAIN%"=="cygwin" (
-    set "MAKE=make"
-    if "%OS%"=="64BIT" (
-        set "EPICS_HOST_ARCH=cygwin-x86_64"
-        set "INCLUDE=C:\cygwin64\include;%INCLUDE%"
-        set "PATH=C:\cygwin64\bin;%PATH%"
-        echo [INFO] Cygwin Toolchain 64bit
-    ) else (
-        set "EPICS_HOST_ARCH=cygwin-x86"
-        set "INCLUDE=C:\cygwin\include;%INCLUDE%"
-        set "PATH=C:\cygwin\bin;%PATH%"
-        echo [INFO] Cygwin Toolchain 32bit
-    )
-    echo [INFO] Compiler Version
-    gcc -v
-    goto Finish
-)
-
-if "%TOOLCHAIN%"=="mingw" (
-    set "MAKE=mingw32-make"
-    if "%OS%"=="64BIT" (
-        set "EPICS_HOST_ARCH=windows-x64-mingw"
-        set "INCLUDE=C:\tools\mingw64\include;%INCLUDE%"
-        set "PATH=C:\tools\mingw64\bin;%PATH%"
-        echo [INFO] MinGW Toolchain 64bit
-    ) else (
-        set "EPICS_HOST_ARCH=win32-x86-mingw"
-        set "INCLUDE=C:\tools\mingw32\include;%INCLUDE%"
-        set "PATH=C:\tools\mingw32\bin;%PATH%"
-        echo [INFO] MinGW Toolchain 32bit
-    )
-    echo [INFO] Compiler Version
-    gcc -v
-    goto Finish
-)
-
-set "VSINSTALL=C:\Program Files (x86)\Microsoft Visual Studio %TOOLCHAIN%"
-if not exist "%VSINSTALL%\" set "VSINSTALL=C:\Program Files (x86)\Microsoft Visual Studio\%TOOLCHAIN%\Community"
-if not exist "%VSINSTALL%\" goto MSMissing
-
-set "MAKE=C:\tools\make"
-
-echo [INFO] APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE%
-
-if "%OS%"=="64BIT" (
-    set EPICS_HOST_ARCH=windows-x64%ST%
-    :: VS 2017
-    if exist "%VSINSTALL%\VC\Auxiliary\Build\vcvars64.bat" (
-        call "%VSINSTALL%\VC\Auxiliary\Build\vcvars64.bat"
-        where cl
-        if !ERRORLEVEL! NEQ 0 goto MSMissing
-        goto MSFound
-    )
-    if exist "%VSINSTALL%\VC\vcvarsall.bat" (
-        call "%VSINSTALL%\VC\vcvarsall.bat" amd64
-        where cl
-        if !ERRORLEVEL! NEQ 0 (
-            call "%VSINSTALL%\VC\vcvarsall.bat" x86_amd64
-            where cl
-            if !ERRORLEVEL! NEQ 0 goto MSMissing
-        )
-        goto MSFound
-    )
-    if exist "%VSINSTALL%\VC\bin\amd64\vcvars64.bat" (
-        call "%VSINSTALL%\VC\bin\amd64\vcvars64.bat"
-        where cl
-        if !ERRORLEVEL! NEQ 0 goto MSMissing
-        goto MSFound
-    )
-) else (
-    set EPICS_HOST_ARCH=win32-x86%ST%
-    :: VS 2017
-    if exist "%VSINSTALL%\VC\Auxiliary\Build\vcvars32.bat" (
-        call "%VSINSTALL%\VC\Auxiliary\Build\vcvars32.bat"
-        where cl
-        if !ERRORLEVEL! NEQ 0 goto MSMissing
-        goto MSFound
-    )
-    if exist "%VSINSTALL%\VC\vcvarsall.bat" (
-        call "%VSINSTALL%\VC\vcvarsall.bat" x86
-        where cl
-        if !ERRORLEVEL! NEQ 0 goto MSMissing
-        goto MSFound
-    )
-    if exist "%VSINSTALL%\VC\bin\vcvars32.bat" (
-        call "%VSINSTALL%\VC\bin\vcvars32.bat"
-        where cl
-        if !ERRORLEVEL! NEQ 0 goto MSMissing
-        goto MSFound
-    )
-    if exist "%VSINSTALL%\Common7\Tools\vsvars32.bat" (
-        call "%VSINSTALL%\Common7\Tools\vsvars32.bat"
-        where cl
-        if !ERRORLEVEL! NEQ 0 goto MSMissing
-        goto MSFound
-    )
-)
-
-:MSMissing
-echo [INFO] Installation for MSVC Toolchain %TOOLCHAIN% / %OS% seems to be missing
-exit 1
-
-:MSFound
-echo [INFO] Microsoft Visual Studio Toolchain %TOOLCHAIN%
-echo [INFO] Compiler Version
-cl
-
-:Finish
-echo [INFO] EPICS_HOST_ARCH: %EPICS_HOST_ARCH%
-echo [INFO] Make version
-%MAKE% --version
-echo [INFO] Perl version
-perl --version
-
-%MAKE% %MAKEARGS% %*

.ci/appveyor-prepare.bat

@@ -1,70 +0,0 @@
-:: Build script for AppVeyor (https://ci.appveyor.com/)
-:: Environment:
-::     TOOLCHAIN      -  Toolchain Version  [9.0/10.0/11.0/12.0/14.0/cygwin/mingw]
-::     CONFIGURATION  -  determines EPICS build  [dynamic/static, -debug]
-::     PLATFORM       -  "x86" -> use 32bit architecture
-::
-:: Prepares an Appveyor build by excuting the following steps
-::     - Set up configure\CONFIG_SITE for static vs. dynamic build
-::     - Install Cygwin / Mingw  (TOOLCHAIN setting) in the in the appropriate flavor
-::     - Download and install Make-4.1 from EPICS download page
-
-Setlocal EnableDelayedExpansion
-
-set OS=64BIT
-if "%PLATFORM%"=="x86" set OS=32BIT
-
-echo [INFO] Platform: %OS%
-
-if "%TOOLCHAIN%"=="cygwin" (
-    echo.%CONFIGURATION% | findstr /C:"static">nul && (
-        echo SHARED_LIBRARIES=NO>> configure\CONFIG_SITE
-        echo STATIC_BUILD=YES>> configure\CONFIG_SITE
-        echo [INFO] EPICS set up for static build
-    ) || (
-        echo [INFO] EPICS set up for dynamic build
-    )
-    echo.%CONFIGURATION% | findstr /C:"debug">nul && (
-        echo HOST_OPT=NO>> configure\CONFIG_SITE
-        echo [INFO] EPICS set up for debug build
-    ) || (
-        echo [INFO] EPICS set up for optimized build
-    )
-    if "%OS%"=="64BIT" (
-        echo [INFO] Installing Cygwin 64bit and dependencies
-        @powershell -Command "(new-object net.webclient).DownloadFile('http://www.cygwin.com/setup-x86_64.exe', 'C:\cygwin64\setup-x86_64.exe')"
-        C:\cygwin64\setup-x86_64.exe -q -P "libreadline-devel,libncursesw-devel"
-    ) else (
-        echo [INFO] Installing Cygwin 32bit and dependencies
-        @powershell -Command "(new-object net.webclient).DownloadFile('http://www.cygwin.com/setup-x86.exe', 'C:\cygwin\setup-x86.exe')"
-        C:\cygwin\setup-x86.exe -q -P "libreadline-devel,libncursesw-devel"
-    )
-)
-
-if "%TOOLCHAIN%"=="mingw" (
-    echo.%CONFIGURATION% | findstr /C:"static">nul && (
-        echo SHARED_LIBRARIES=NO>> configure\CONFIG_SITE
-        echo STATIC_BUILD=YES>> configure\CONFIG_SITE
-        echo [INFO] EPICS set up for static build
-    ) || (
-        echo [INFO] EPICS set up for dynamic build
-    )
-    echo.%CONFIGURATION% | findstr /C:"debug">nul && (
-        echo HOST_OPT=NO>> configure\CONFIG_SITE
-        echo [INFO] EPICS set up for debug build
-    ) || (
-        echo [INFO] EPICS set up for optimized build
-    )
-    if "%OS%"=="64BIT" (
-        echo [INFO] Installing MinGW 64bit
-        cinst mingw || cinst mingw
-    ) else (
-        echo [INFO] Installing MinGW 32bit
-        cinst mingw --x86 || cinst mingw --x86
-    )
-)
-
-echo [INFO] Installing Make 4.1
-curl -fsS --retry 3 -o C:\tools\make-4.1.zip https://epics.anl.gov/download/tools/make-4.1-win64.zip
-cd \tools
-"C:\Program Files\7-Zip\7z" e make-4.1.zip

.ci/checkout-modules.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# Checkout submodules on their appropriate branches
-#
-
-git submodule foreach '\
-    git checkout `git config -f $toplevel/.gitmodules submodule.$name.branch` && \
-    git pull '

.ci/travis-build.sh

@@ -1,77 +0,0 @@
-#!/bin/sh
-set -e -x
-
-die() {
-  echo "$1" >&2
-  exit 1
-}
-
-CACHEKEY=1
-
-export EPICS_HOST_ARCH=`perl src/tools/EpicsHostArch.pl`
-
-[ -e configure/os/CONFIG_SITE.Common.linux-x86 ] || die "Wrong location: $PWD"
-
-case "$CMPLR" in
-clang)
-  echo "Host compiler is clang"
-  cat << EOF >> configure/os/CONFIG_SITE.Common.$EPICS_HOST_ARCH
-GNU         = NO
-CMPLR_CLASS = clang
-CC          = clang
-CCC         = clang++
-EOF
-  ;;
-*) echo "Host compiler is default";;
-esac
-
-if [ "$STATIC" = "YES" ]
-then
-  echo "Build static libraries/executables"
-  cat << EOF >> configure/CONFIG_SITE
-SHARED_LIBRARIES=NO
-STATIC_BUILD=YES
-EOF
-fi
-
-# requires wine and g++-mingw-w64-i686
-if [ "$WINE" = "32" ]
-then
-  echo "Cross mingw32"
-  sed -i -e '/CMPLR_PREFIX/d' configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
-  cat << EOF >> configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
-CMPLR_PREFIX=i686-w64-mingw32-
-EOF
-  cat << EOF >> configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS+=win32-x86-mingw
-EOF
-fi
-
-# set RTEMS to eg. "4.9" or "4.10"
-if [ -n "$RTEMS" ]
-then
-  echo "Cross RTEMS${RTEMS} for pc386"
-  curl -L "https://github.com/mdavidsaver/rsb/releases/download/20171203-${RTEMS}/i386-rtems${RTEMS}-trusty-20171203-${RTEMS}.tar.bz2" \
-  | tar -C / -xmj
-
-  sed -i -e '/^RTEMS_VERSION/d' -e '/^RTEMS_BASE/d' configure/os/CONFIG_SITE.Common.RTEMS
-  cat << EOF >> configure/os/CONFIG_SITE.Common.RTEMS
-RTEMS_VERSION=$RTEMS
-RTEMS_BASE=$HOME/.rtems
-EOF
-  cat << EOF >> configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS += RTEMS-pc386-qemu
-EOF
-
-  # find local qemu-system-i386
-  echo -n "Using QEMU: "
-  type qemu-system-i386 || echo "Missing qemu"
-fi
-
-make -j2 $EXTRA
-
-if [ "$TEST" != "NO" ]
-then
-   make -j2 tapfiles
-   make -s test-results
-fi

.gitmodules

@@ -22,3 +22,7 @@
     path = modules/pva2pva
     url = https://github.com/epics-base/pva2pva
     branch = master
+[submodule ".ci"]
+    path = .ci
+    url = https://github.com/epics-base/ci-scripts
+    branch = master

.tools/adjustver.py

@@ -0,0 +1,102 @@
+#!/usr/bin/env python3
+
+import logging
+import sys
+import re
+from io import StringIO
+
+_log = logging.getLogger(__name__)
+
+def main(args):
+    logging.basicConfig(level=args.level)
+
+    if args.dev is True:
+        actions=[
+            ('DEVELOPMENT_FLAG', '1'),
+            ('DEV_SNAPSHOT', '-DEV'),
+        ]
+
+    elif args.dev is False:
+        actions=[
+            ('DEVELOPMENT_FLAG', '0'),
+            ('DEV_SNAPSHOT', ''),
+        ]
+
+    elif args.version:
+        M=re.match(r'R?(\d+).(\d+).(\d+)(?:.(\d+))?(-.*)?', args.version)
+        actions=[
+            ('SITE_VERSION', None),
+            ('SHORT_VERSION', None),
+
+            ('MINOR_VERSION', M[2]),
+            ('REVISION', M[2]),
+
+            ('MODIFICATION', M[3]),
+            ('MAINTENANCE_VERSION', M[3]),
+
+            ('PATCH_LEVEL', M[4] or '0'),
+
+            ('DEVELOPMENT_FLAG', '1' if (M[5] or '').upper().endswith('-DEV') else '0'),
+            ('DEV_SNAPSHOT', M[5] or ''),
+
+            ('MAJOR_VERSION', M[1]),
+            ('VERSION', M[1]), # plain _VERSION must be last to resolve ambiguity
+        ]
+
+    elif args.dry_run:
+        _log.debug('Print existing')
+        for fname in args.conf:
+            print('# ', fname)
+            with open(fname, 'r') as F:
+                sys.stdout.write(F.read())
+        return
+
+    else:
+        print('One of --version, --release, --dev, or --dry-run is required')
+        sys.exit(1)
+
+    for name, val in actions:
+        _log.debug('Pattern "%s" -> "%s"', name, val)
+
+    for fname in args.conf:
+        OUT=StringIO()
+
+        with open(fname, 'r') as F:
+            for line in F:
+                _log.debug('Line: %s', repr(line))
+                for name, val in actions:
+                    M = re.match(r'(\s*[A-Z_]+' + name + r'\s*=[\t ]*)(\S*)(\s*)', line)
+                    if M and val is None:
+                        _log.debug('Ignore')
+                        OUT.write(line)
+                        break
+                    elif M:
+                        _log.debug('  Match %s -> %s', M.re.pattern, M.groups())
+                        OUT.write(M[1]+val+M[3])
+                        break
+                else:
+                    _log.debug('No match')
+                    OUT.write(line)
+
+        if args.dry_run:
+            print('# ', fname)
+            print(OUT.getvalue())
+        else:
+            with open(fname, 'w') as F:
+                F.write(OUT.getvalue())
+
+def getargs():
+    from argparse import ArgumentParser
+    P = ArgumentParser()
+    P.add_argument('-n','--dry-run', action='store_true', default=False)
+    P.add_argument('-d','--debug', dest='level', action='store_const',
+                   const=logging.DEBUG, default=logging.INFO)
+    P.add_argument('-V', '--version', help='A version in R1.2.3-xyz or 1.2.3 form')
+    P.add_argument('-D', '--dev', action='store_true', default=None)
+    P.add_argument('-R', '--release', dest='dev', action='store_false')
+    P.add_argument('conf', nargs='+',
+                   help='A configure/CONFIG_*_VERSION file name')
+    return P
+
+if __name__=='__main__':
+    main(getargs().parse_args())

.tools/make-tar.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Make tar for git repo w/ one level of sub modules.
 #
@@ -9,43 +9,91 @@ die() {
   exit 1
 }
 
-TOPREV="$1"
-FINALTAR="$2"
-PREFIX="$3"
+maybedie() {
+  if [ "$DEVMODE" ]; then
+    echo "Warning: $1" >&2
+  else
+    echo "Error: $1" >&2
+    exit 1
+  fi
+}
 
-if ! [ "$TOPREV" ]
-then
+usage() {
    cat <<EOF >&2
-usage: $0 [rev] [outfile.tar.gz] [prefix/]
+usage: $0 [-v] [-s] <rev> [<outfile> [<prefix>]]
 
   <rev> may be any git revision spec. (tag, branch, or commit id).
 
-  Output file may be .tar.gz, .tar.bz2, or any extension supported by "tar -a".
-  If output file name is omitted, "base-<rev>.tar.gz" will be used.
-  If <prefix> is omitted, the default prefix is "base-<rev>/".
+  If provided, <outfile> must end with ".tar", ".tar.gz" or ".tar.bz2".
+  If <outfile> is omitted, "base-<rev>.tar.gz" will be used.
+  If provided, <prefix> must end with "/".  If <prefix> is omitted,
+  the default is "base-<rev>/".
+
+  Options:
+
+    -v   Enable verbose prints
+    -d   Enable permissive developer mode
 EOF
    exit 1
-fi
+}
 
-[ "$FINALTAR" ] || FINALTAR="base-$TOPREV.tar.gz"
-[ "$PREFIX" ] || PREFIX="base-$TOPREV/"
+export DEVMODE=
+
+while getopts "vd" OPT
+do
+    case "$OPT" in
+    v) set -x;;
+    d) DEVMODE=1;;
+    ?) echo "Unknown option"
+       usage;;
+    esac
+done
+shift $(($OPTIND - 1))
+
+TOPREV="$1"
+FINALTAR="$2"
+PREFIX="${3:-}"
+
+[ "$TOPREV" ] || usage
+
+case "$FINALTAR" in
+"")
+  TAROPT=-z
+  FINALTAR="base-$TOPREV.tar.gz"
+  ;;
+*.tar)
+  TAROPT=""
+  ;;
+*.tar.gz)
+  TAROPT=-z
+  ;;
+*.tar.bz2)
+  TAROPT=-j
+  ;;
+*)
+  die "outfile must end with '.tar.gz' or '.tar.bz2'"
+  ;;
+esac
 
 case "$PREFIX" in
-*/) ;;
-*)  die "Prefix must end with '/'";;
+"")
+  PREFIX="base-$TOPREV/"
+  ;;
+*/)
+  ;;
+*)
+  die "Prefix must end with '/'"
+  ;;
 esac
 
 # Check for both <tag> and R<tag>
-if [ "$TOPREV" = "HEAD" ]
-then
-  true
-elif ! [ `git tag -l $TOPREV` ]
+if ! [ `git tag -l $TOPREV` ]
 then
   if [ `git tag -l R$TOPREV` ]
   then
     TOPREV="R$TOPREV"
   else
-    die "No tags exist '$TOPREV' or 'R$TOPREV'"
+    maybedie "No tags exist '$TOPREV' or 'R$TOPREV'"
   fi
 fi
 
@@ -66,11 +114,17 @@ git archive --prefix=$PREFIX $TOPREV | tar -C "$TDIR"/tar -x
 #
 # sub-modules appear in tree as eg.:
 #  160000 commit c3a6cfcf0dad4a4eeecf59b474710d06ff3eb68a  modules/ca
-git ls-tree -r $TOPREV | awk '/^[0-9]+ commit / {print $3, $4}' | \
+git ls-tree -r $TOPREV | \
+  awk '/^[0-9]+ commit / && $4 != ".ci" {print $3, $4}' | \
 while read HASH MODDIR
 do
     echo "Visiting $HASH $MODDIR"
-    git -C $MODDIR archive --prefix=${PREFIX}${MODDIR}/ $HASH | tar -C "$TDIR"/tar -x
+    if [ -e $MODDIR/.git ]
+    then
+        git -C $MODDIR archive --prefix=${PREFIX}${MODDIR}/ $HASH | tar -C "$TDIR"/tar -x
+    else
+        maybedie "  Submodule not checked out."
+    fi
 done
 
 # make a list of files copied and filter out undesirables
@@ -82,13 +136,17 @@ sed -i -e 's|^\./||' "$TDIR"/list.1
 
 # Exclude files
 sed \
-  -e '/\/\.\?ci\//d' \
+  -e '/\/\.ci\//d' \
+  -e '/\/\.ci-local\//d' \
   -e '/\/\.tools\//d' \
   -e '/\/jenkins\//d' \
   -e '/\/\.git/d' \
+  -e '/\/\.hgtags$/d' \
+  -e '/\/\.cproject$/d' \
   -e '/\/\.project$/d' \
   -e '/\/\.travis\.yml$/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
@@ -97,16 +155,14 @@ then
 fi
 
 # Use the filtered list to build the final tar
-#  The -a option chooses compression automatically based on output file name.
-
-tar -C "$TDIR"/tar --files-from="$TDIR"/list.2 -caf "$FINALTAR"
+tar -c $TAROPT -C "$TDIR"/tar -T "$TDIR"/list.2 -f "$FINALTAR"
 
 echo "Wrote $FINALTAR"
 
-tar -taf "$FINALTAR" > "$TDIR"/list.3
+tar -t $TAROPT -f "$FINALTAR" > "$TDIR"/list.3
 
 # make sure we haven't picked up anything extra
 if ! diff -u "$TDIR"/list.2 "$TDIR"/list.3
 then
-    echo "Oops! Tarfile diff against plan shown above"
+    die "Oops! Tarfile diff against plan shown above"
 fi

.travis.yml

@@ -1,27 +1,91 @@
-sudo: false
-dist: trusty
-language: c
-compiler:
-  - gcc
+# .travis.yml for use with EPICS Base ci-scripts
+# (see: https://github.com/epics-base/ci-scripts)
+
+language: cpp
+compiler: gcc
+dist: xenial
+
+cache:
+  directories:
+  - $HOME/.cache
+
+env:
+  global:
+    - SETUP_PATH=.ci-local:.ci
+    - BASE=SELF
+    - EPICS_TEST_IMPRECISE_TIMING=YES
+
 addons:
   apt:
     packages:
+    # for all EPICS builds
     - libreadline6-dev
     - libncurses5-dev
     - perl
+    # for clang compiler
     - clang
+    # for mingw builds (32bit and 64bit)
     - g++-mingw-w64-i686
+    - g++-mingw-w64-x86-64
+    # for RTEMS cross builds
     - qemu-system-x86
+  homebrew:
+    packages:
+    # for all EPICS builds
+    - bash
+    update: true
+
+install:
+  - ./.ci-local/travis-fixup.sh
+  - python .ci/cue.py prepare
+
 script:
-  - .ci/travis-build.sh
-env:
-  - CMPLR=gcc
-  - CMPLR=clang
-  - CMPLR=gcc   STATIC=YES
-  - CMPLR=clang STATIC=YES
-  - CMPLR=gcc   EXTRA=CMD_CXXFLAGS=-std=c++11
-  - CMPLR=clang EXTRA=CMD_CXXFLAGS=-std=c++11
-  - WINE=32 TEST=NO STATIC=YES
-  - WINE=32 TEST=NO STATIC=NO
-  - RTEMS=4.10 TEST=YES
-  - RTEMS=4.9  TEST=YES
+  - python .ci/cue.py build
+  - python .ci/cue.py test
+  - python .ci/cue.py test-results
+
+# Define build jobs
+
+jobs:
+  include:
+
+# Different configurations of default gcc and clang
+  - dist: bionic
+
+  - dist: xenial
+
+  - dist: bionic
+    env: BCFG=static EXTRA="CMD_CXXFLAGS=-std=c++11"
+
+  - dist: trusty
+    env: EXTRA="CMD_CXXFLAGS=-std=c++11"
+
+  - dist: bionic
+    compiler: clang
+
+  - compiler: clang
+
+  - dist: trusty
+    compiler: clang
+    env: BCFG=static
+
+# Cross-compilations to Windows using MinGW and WINE
+
+  - env: WINE=32 TEST=NO BCFG=static
+
+  - env: WINE=32 TEST=NO
+
+# Cross-compilation to RTEMS
+
+  - env: RTEMS=4.10
+
+  - env: RTEMS=4.9
+
+# MacOS build
+
+  - os: osx
+    env:
+      - EXTRA="CMD_CFLAGS=-mmacosx-version-min=10.7"
+      - EXTRA1="CMD_CXXFLAGS=-mmacosx-version-min=10.7 -std=c++11 -stdlib=libc++"
+      - EXTRA2="CMD_LDXFLAGS=-mmacosx-version-min=10.7 -std=c++11 -stdlib=libc++"
+    compiler: clang

configure/CONFIG

@@ -58,9 +58,9 @@ include $(CONFIG)/CONFIG_BASE_VERSION
 include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).Common
 -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
 
+# Parse configure/RELEASE to find all upstream modules
 RELEASE_TOPS := $(shell $(CONVERTRELEASE) -T $(TOP) releaseTops)
 
-
 ifdef T_A
 
   #  Cross compile specific definitions

configure/CONFIG.gnuCommon

@@ -3,8 +3,7 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
+# EPICS Base is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 

configure/CONFIG_BASE

@@ -42,9 +42,10 @@ FIND_TOOL = $(firstword $(wildcard $(TOOLS)/$(1) $(EPICS_BASE)/src/tools/$(1)))
 PODTOHTML        = $(PERL) $(TOOLS)/podToHtml.pl
 CONVERTRELEASE   = $(PERL) $(call FIND_TOOL,convertRelease.pl)
 FULLPATHNAME     = $(PERL) $(TOOLS)/fullPathName.pl
-TAPTOJUNIT       = $(PERL) $(TOOLS)/tap-to-junit-xml.pl
 GENVERSIONHEADER = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG) $(QUESTION_FLAG)
 
+MAKERPATH = $(PYTHON) $(TOOLS)/makeRPath.py
+
 #---------------------------------------------------------------
 # tools for installing libraries and products
 INSTALL = $(PERL) $(TOOLS)/installEpics.pl $(QUIET_FLAG)
@@ -60,3 +61,13 @@ REPLACEVAR = $(PERL) $(TOOLS)/replaceVAR.pl
 # tools for cleaning out unwanted files
 CVSCLEAN = $(call FIND_TOOL,cvsclean.pl)
 DEPCLEAN = $(call FIND_TOOL,depclean.pl)
+
+#---------------------------------------------------------------
+# Tools for testing
+TAPTOJUNIT                 = $(PERL) $(TOOLS)/tap-to-junit-xml.pl
+PROVE                      = $(PERL) $(TOOLS)/epicsProve.pl
+PROVE.tap                  = $(PROVE) --ext .tap --exec "$(CAT)"
+
+TEST_FAILURE_FILENAME      = .tests-failed.log
+TEST_FAILURE_FILE          = $(TOP)/$(TEST_FAILURE_FILENAME)
+PROVE_FAILURE              = echo $(abspath .)>> $(TEST_FAILURE_FILE)

configure/CONFIG_BASE_VERSION

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

configure/CONFIG_CA_VERSION

@@ -0,0 +1,12 @@
+# Version number for the Channel Access API and shared library
+
+EPICS_CA_MAJOR_VERSION = 4
+EPICS_CA_MINOR_VERSION = 13
+EPICS_CA_MAINTENANCE_VERSION = 8
+
+# Development flag, set to zero for release versions
+
+EPICS_CA_DEVELOPMENT_FLAG = 1
+
+# Immediately after a release the MAINTENANCE_VERSION
+# will be incremented and the DEVELOPMENT_FLAG set to 1

configure/CONFIG_COMMON

@@ -38,6 +38,8 @@ BUILD_ARCHS = $(EPICS_HOST_ARCH) $(CROSS1) $(CROSS2)
 # otherwise override this in os/CONFIG_SITE.<host_arch>.Common
 PERL = perl -CSD
 
+PYTHON = python
+
 #-------------------------------------------------------
 # Check configure/RELEASE file for consistency
 CHECK_RELEASE_YES = checkRelease
@@ -304,7 +306,7 @@ LDLIBS = $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS)\
 CPPFLAGS = $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS) $(OPT_CPPFLAGS)\
  $(DEBUG_CPPFLAGS) $(WARN_CPPFLAGS) $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS)\
  $(USR_CPPFLAGS) $(CMD_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS)\
- $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
+ $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS) $(API_CPPFLAGS)
 
 #--------------------------------------------------
 # ar definition default
@@ -376,14 +378,14 @@ PATH_FILTER = $(1)$(warning PATH_FILTER is deprecated; used for $(1))
 #	each list starts with the destination directory name(s)
 #	to make sure it's there
 
-INSTALL_PROD= $(PRODNAME:%= $(INSTALL_BIN)/%)
-INSTALL_LIBS= $(LIBNAME:%=$(INSTALL_LIB)/%)
-INSTALL_MUNCHS= $(MUNCHNAME:%=$(INSTALL_BIN)/%)
-INSTALL_SHRLIBS= $(SHRLIBNAME:%=$(INSTALL_SHRLIB)/%)
-INSTALL_LOADABLE_SHRLIBS= $(LOADABLE_SHRLIBNAME:%=$(INSTALL_SHRLIB)/%)
-INSTALL_DLLSTUB_LIBS=$(DLLSTUB_LIBNAME:%=$(INSTALL_LIB)/%)
-INSTALL_TCLLIBS=$(TCLLIBNAME:%=$(INSTALL_TCLLIB)/%)
-INSTALL_TCLINDEX=$(TCLINDEX:%=$(INSTALL_TCLLIB)/%)
+INSTALL_PROD = $(PRODNAME:%= $(INSTALL_BIN)/%)
+INSTALL_LIBS = $(LIBNAME:%=$(INSTALL_LIB)/%)
+INSTALL_MUNCHS = $(MUNCHNAME:%=$(INSTALL_BIN)/%)
+INSTALL_SHRLIBS = $(SHRLIBNAME:%=$(INSTALL_SHRLIB)/%)
+INSTALL_LOADABLE_SHRLIBS = $(LOADABLE_SHRLIBNAME:%=$(INSTALL_SHRLIB)/%)
+INSTALL_DLLSTUB_LIBS = $(DLLSTUB_LIBNAME:%=$(INSTALL_LIB)/%)
+INSTALL_TCLLIBS = $(TCLLIBNAME:%=$(INSTALL_TCLLIB)/%)
+INSTALL_TCLINDEX = $(TCLINDEX:%=$(INSTALL_TCLLIB)/%)
 INSTALL_SCRIPTS = $(SCRIPTS:%= $(INSTALL_BIN)/%)
 INSTALL_OBJS = $(OBJSNAME:%= $(INSTALL_BIN)/%)
 

configure/CONFIG_DATABASE_MODULE

@@ -24,3 +24,5 @@ MSI3_15                    = $(EPICS_DATABASE_HOST_BIN)/msi$(HOSTEXE)
 
 # Libraries needed to link a basic IOC
 EPICS_BASE_IOC_LIBS = dbRecStd dbCore ca Com
+
+HAS_registerAllRecordDeviceDrivers=YES

configure/CONFIG_DATABASE_VERSION

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

configure/CONFIG_ENV

@@ -3,9 +3,8 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 #   Author: Andrew Johnson
 #   Date:   20 April 1995
@@ -54,8 +53,3 @@ EPICS_IOC_IGNORE_SERVERS=""
 # EPICS_IOC_LOG_PORT Log server port number etc.
 EPICS_IOC_LOG_PORT=7004
 
-# Other services:
-
-EPICS_CMD_PROTO_PORT=
-EPICS_AR_PORT=7002
-

configure/CONFIG_LIBCOM_MODULE

@@ -5,18 +5,10 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# Set EPICS_LIBCOM if necessary
-ifndef EPICS_LIBCOM
-  EPICS_LIBCOM = $(if $(BUILDING_LIBCOM),$(INSTALL_LOCATION),$(EPICS_BASE))
-
-  # Paths to tools built here
-  EPICS_LIBCOM_HOST_BIN ?= $(EPICS_LIBCOM)/bin/$(EPICS_HOST_ARCH)
-endif
-
 # Set location of locally generated tools
-YACC = $(abspath $(EPICS_LIBCOM_HOST_BIN))/antelope$(HOSTEXE)
-LEX = $(abspath $(EPICS_LIBCOM_HOST_BIN))/e_flex$(HOSTEXE) \
-        -S$(EPICS_LIBCOM)/include/flex.skel.static
+YACC = $(abspath $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH))/antelope$(HOSTEXE)
+LEX = $(abspath $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH))/e_flex$(HOSTEXE) \
+        -S$(EPICS_BASE)/include/flex.skel.static
 
 # Default stack size for osiThread
 OSITHREAD_USE_DEFAULT_STACK = NO

configure/CONFIG_LIBCOM_VERSION

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

configure/CONFIG_SITE

@@ -22,6 +22,7 @@
 #	darwin-x86             (Intel based Apple running OSX)
 #	freebsd-x86            (GNU compiler used for host builds)
 #	freebsd-x86_64         (GNU compiler used for host builds)
+#	linux-aarch64          (GNU compiler used for host builds)
 #	linux-arm              (GNU compiler used for host builds)
 #	linux-ppc              (GNU compiler used for host builds)
 #	linux-ppc64            (GNU compiler used for host builds)
@@ -51,7 +52,6 @@
 #	windows-x64-debug      (MS Visual C++ compiler with debug option for host builds)
 
 
-#  EPICS_HOST_ARCH is a required environment variable
 #  Do not set EPICS_HOST_ARCH in this file. 
 #  Use base/startup files to set EPICS_HOST_ARCH or 
 #  provide EPICS_HOST_ARCH on the GNU make command line.
@@ -67,8 +67,7 @@
 #       linux-586               (linux-x86 host)
 #       linux-686               (linux-x86 host)
 #       linux-arm               (linux-x86 or -x86_64 host)
-#       linux-arm_eb            (linux-x86 host)
-#       linux-arm_el            (linux-x86 host)
+#       linux-aarch64           (linux-x86_64 host)
 #       linux-athlon            (linux-x86 host)
 #       linux-cris              (Axis GNU crosscompiler on linux-x86 host)
 #       linux-cris_v10          (Axis GNU crosscompiler on linux-x86 host)
@@ -76,9 +75,6 @@
 #       linux-microblaze
 #       linux-xscale_be
 #       vxWorks-486
-#       vxWorks-68040
-#       vxWorks-68040lc
-#       vxWorks-68060
 #       vxWorks-pentium
 #       vxWorks-ppc32           (32-bit PowerPC CPUs with full FPU)
 #       vxWorks-ppc32sf         (32-bit PowerPC CPUs without FPU)
@@ -169,10 +165,18 @@ EPICS_SITE_VERSION =
 GCC_PIPE = NO
 
 # Set RPATH when linking executables and libraries.
-#  Must be either YES or NO.  If you set this to NO you must also provide a
+#  Must be either YES, NO, or ORIGIN.  If you set this to NO you must also provide a
 #  way for Base executables to find their shared libraries when they are
 #  run at build-time, e.g. set the LD_LIBRARY_PATH environment variable.
+#  ORIGIN is a feature of the ELF executable format used by Linux, freebsd, and solaris.
 LINKER_USE_RPATH = YES
 
+# Only used when LINKER_USE_RPATH=ORIGIN
+# The build time root(s) of the relocatable tree (separate multiple w/ ':').
+# Linking to libraries under any root directory will be relative.
+# Linking to libraries outside of this root will be absolute.
+# All root directories are considered to be the same.
+LINKER_ORIGIN_ROOT = $(INSTALL_LOCATION)
+
 # Overrides for the settings above may appear in a CONFIG_SITE.local file
 -include $(CONFIG)/CONFIG_SITE.local

configure/CONFIG_SITE_ENV

@@ -24,40 +24,40 @@
 
 #  Site-specific environment settings
 
-# Time service:
-# EPICS_TIMEZONE
-#	Local timezone info for vxWorks and RTEMS.  The format is
-#	    <name>::<minutesWest>:<startDST>:<endDST>
-#	where <name> is only used by strftime() for %Z conversions,
-#	and <startDST> and <endDST> are mmddhh - that is month,day,hour
-#	e.g. for ANL in 2018: EPICS_TIMEZONE=CUS::360:031102:110402
-#	The future dates below assume the rules don't get changed;
-#	see http://www.timeanddate.com/time/dst/2018.html to check.
-#
-#	DST for 2019  US: Mar 10 - Nov 03
-#	              EU: Mar 31 - Oct 27
-EPICS_TIMEZONE = CUS::360:031002:110302
-#EPICS_TIMEZONE = MET::-60:033102:102703
-#
-#	DST for 2020  US: Mar 08 - Nov 01
-#	              EU: Mar 29 - Oct 25
-#EPICS_TIMEZONE = CUS::360:030802:110102
-#EPICS_TIMEZONE = MET::-60:032902:102503
-#
-#	DST for 2021  US: Mar 14 - Nov 07
-#	              EU: Mar 28 - Oct 31
-#EPICS_TIMEZONE = CUS::360:031402:110702
-#EPICS_TIMEZONE = MET::-60:032802:103103
-#
-#	DST for 2022  US: Mar 13 - Nov 06
-#	              EU: Mar 27 - Oct 30
-#EPICS_TIMEZONE = CUS::360:031302:110602
-#EPICS_TIMEZONE = MET::-60:032702:103003
-#
-#	DST for 2023  US: Mar 13 - Nov 06
-#	              EU: Mar 27 - Oct 30
-#EPICS_TIMEZONE = CUS::360:031202:110502
-#EPICS_TIMEZONE = MET::-60:032602:102903
+## Time service:
+# EPICS_TZ
+#       Local timezone rules for vxWorks and RTEMS. The value follows the Posix
+#       TZ environment variable's Mm.n.d/h format (see the IBM link below for
+#       details). If TZ hasn't already been set when the osdTime timeRegister()
+#       C++ static constructor runs, this parameter will be copied into the TZ
+#       environment variable. Once the OS clock has been synchronized to NTP the
+#       routine tz2timezone() will be run to convert TZ into the TIMEZONE
+#       variable format that VxWorks needs.
+#               https://developer.ibm.com/articles/au-aix-posix/
+
+# Japan Standard Time, no DST:
+#EPICS_TZ = "JST-9"
+
+# Central European (Summer) Time:
+#EPICS_TZ = "CET-1CEST,M3.5.0/2,M10.5.0/3"
+
+# Greenwich Mean/British Summer Time:
+#EPICS_TZ = "GMT0BST,M3.5.0/1,M10.5.0/2"
+
+# US Eastern Standard/Daylight Time:
+#EPICS_TZ = "EST5EDT,M3.2.0/2,M11.1.0/2"
+
+# US Central Standard/Daylight Time:
+EPICS_TZ = "CST6CDT,M3.2.0/2,M11.1.0/2"
+
+# US Mountain Standard/Daylight Time:
+#EPICS_TZ = "MST7MDT,M3.2.0/2,M11.1.0/2"
+
+# US Pacific Standard/Daylight Time:
+#EPICS_TZ = "PST8PDT,M3.2.0/2,M11.1.0/2"
+
+# US Hawaiian Standard Time, no DST:
+#EPICS_TZ = "HST10"
 
 # EPICS_TS_NTP_INET
 #	NTP time server ip address for VxWorks and RTEMS.

configure/Makefile

@@ -20,5 +20,14 @@ CONFIGS += $(subst ../,,$(wildcard ../os/CONFIG*))
 CONFIGS += $(subst ../,,$(wildcard ../RELEASE*))
 CONFIGS += $(subst ../,,$(wildcard ../RULES*))
 
+CFG += CONFIG_LIBCOM_MODULE
+CFG += CONFIG_LIBCOM_VERSION
+
+CFG += CONFIG_CA_MODULE
+CFG += CONFIG_CA_VERSION
+
+CFG += CONFIG_DATABASE_MODULE
+CFG += CONFIG_DATABASE_VERSION
+
 include $(TOP)/configure/RULES
 

configure/RULES.Db

@@ -161,13 +161,13 @@ actionArchTargets = $(foreach action, $(ACTIONS), \
     $(foreach arch, $(BUILD_ARCHS), $(action)$(DIVIDER)$(arch)))
 cleanArchTargets = $(foreach arch, $(BUILD_ARCHS), clean$(DIVIDER)$(arch))
 
--include $(TOP)/configure/CONFIG_APP_INCLUDE
+include $(CONFIG)/CONFIG_APP_INCLUDE
 
 all: install
 
 install: buildInstall
 
-buildInstall : build
+buildInstall: build
 
 rebuild: clean install
 
@@ -196,21 +196,21 @@ endif
 #---------------------------------------------------------------
 # build dependancies, clean rule
 
-inc : $(COMMON_INC) $(INSTALL_INC)
+inc: $(COMMON_INC) $(INSTALL_INC)
 
-build : $(COMMON_DBDS) $(COMMON_DBS) $(COMMON_DBDCATS) \
+build: $(COMMON_DBDS) $(COMMON_DBS) $(COMMON_DBDCATS) \
 	$(INSTALL_DBDS) $(INSTALL_DBS) \
 	$(DBDDEPENDS_FILES) $(TARGETS) \
 	$(INSTALL_DB_INSTALLS) $(INSTALL_DBD_INSTALLS)
 
 clean: db_clean
 
-db_clean : 
+db_clean:
 	@$(RM) $(COMMONS) $(DBDDEPENDS_FILES)
 	@$(RM) *_registerRecordDeviceDriver.cpp
 	@$(RM) $(TARGETS)
 
-.PHONY : db_clean
+.PHONY: db_clean
 
 realclean: clean
 
@@ -389,7 +389,7 @@ $(COMMON_DIR)/%.dbd: ../%Include.dbd
 
 # Make DBDCAT file x depend on x_DBD source files
 define  DBDCAT_template
-$$(COMMON_DIR)/$(1).dbd : ../Makefile $$(foreach file, $$($(1)_DBD),$$(DBDCAT_SOURCE) )
+$$(COMMON_DIR)/$(1).dbd: ../Makefile $$(foreach file, $$($(1)_DBD),$$(DBDCAT_SOURCE) )
 endef
 $(foreach name,$(subst .dbd,,$(DBDCAT)), $(eval $(call DBDCAT_template,$(name))))
 
@@ -418,7 +418,7 @@ $(INSTALL_DBD)/%: ../%
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 define  DBD_INSTALLS_template
-$$(INSTALL_DBD)/$$(notdir $(1)) : $(1)
+$$(INSTALL_DBD)/$$(notdir $(1)): $(1)
 	$(ECHO) "Installing $$@"
 	@$$(INSTALL) -d -m $$(INSTALL_PERMISSIONS) $$^ $$(INSTALL_DBD)
 endef
@@ -436,7 +436,7 @@ $(COMMON_DIR)/%.html: %.dbd.pod
 
 $(COMMON_DIR)/%.html: %.pod
 	@$(RM) $(notdir $@)
-	$(PODTOHTML) -o $(notdir $@) $<
+	$(PODTOHTML) -s -s -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
 $(COMMON_DIR)/%.html: %.pm
@@ -460,7 +460,7 @@ $(COMMON_DIR)/%.html: ../%.pl
 #---------------------------------------------------------------
 # DB files
 
-$(COMMON_DIR)/%.db: $(COMMON_DIR)/%.edf 
+$(COMMON_DIR)/%.db: $(COMMON_DIR)/%.edf
 	$(E2DB) $(E2DB_SYSFLAGS) $(E2DB_FLAGS) -n $*.VAR $<
 	@$(REPLACEVAR) < $*.VAR > $@
 	@$(RM) $*.VAR
@@ -514,7 +514,7 @@ $(INSTALL_DB)/%.db: $(COMMON_DIR)/%.db
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 define  DB_INSTALLS_template
-$$(INSTALL_DB)/$$(notdir $(1)) : $(1)
+$$(INSTALL_DB)/$$(notdir $(1)): $(1)
 	$(ECHO) "Installing $$@"
 	@$$(INSTALL) -d -m $$(INSTALL_PERMISSIONS) $$^ $$(INSTALL_DB)
 endef
@@ -539,4 +539,3 @@ $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))
 	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ $< $(basename $@) $(IOCS_APPL_TOP)
 
 .PRECIOUS: %_registerRecordDeviceDriver.cpp
-

configure/RULES_BUILD

@@ -75,7 +75,7 @@ HTMLS_DIR ?= .
 #	First target
 
 all: install
-ifeq ($(EPICS_HOST_ARCH),$T_A)
+ifeq ($(EPICS_HOST_ARCH),$(T_A))
 host: install
 else
 # Do nothing
@@ -108,17 +108,17 @@ PRODTARGETS += $(PRODNAME) $(MUNCHNAME) $(CTDT_SRCS) $(CTDT_OBJS) $(NMS)
 TESTPRODTARGETS += $(TESTPRODNAME) $(TESTMUNCHNAME)
 
 #---------------------------------------------------------------
-#   Test specifications and test result files
+#   Test result files
 #
-ifneq (,$(strip $(TESTS)))
-TARGETS += testspec
-endif
 
-# Enable testing if this host can run tests on the current target
-ifneq (,$(findstring $(T_A),$(EPICS_HOST_ARCH) $(CROSS_COMPILER_RUNTEST_ARCHS)))
+# Enable testing if this host can run tests for the current target
+ifneq (,$(filter $(T_A), $(EPICS_HOST_ARCH) $(CROSS_COMPILER_RUNTEST_ARCHS)))
 RUNTESTS_ENABLED = YES
-TAPFILES += $(TESTSCRIPTS:.t=.tap)
-JUNITFILES += $(TAPFILES:.tap=.xml)
+TESTSCRIPTS.t = $(filter %.t, $(TESTSCRIPTS))
+TAPFILES.t += $(TESTSCRIPTS.t:.t=.tap)
+JUNITFILES.t += $(TESTSCRIPTS.t:.t=-results.xml)
+TAPFILES += $(TAPFILES.t)
+JUNITFILES += $(JUNITFILES.t)
 endif
 
 #---------------------------------------------------------------
@@ -147,14 +147,13 @@ build: inc
 build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODTARGETS) \
 	$(TARGETS) $(TESTSCRIPTS) $(INSTALL_LIB_INSTALLS)
 
-inc : $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS)
+inc: $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS)
 
-buildInstall : \
+buildInstall: \
 	$(INSTALL_SCRIPTS) $(INSTALL_PROD) $(INSTALL_MUNCHS) \
 	$(INSTALL_TCLLIBS) $(INSTALL_TCLINDEX) \
+	$(INSTALL_HTMLS) $(INSTALL_DOCS) \
 	$(INSTALL_OBJS) \
-	$(INSTALL_DOCS) \
-	$(INSTALL_HTMLS) \
 	$(INSTALL_TEMPLATE) \
 	$(INSTALL_BIN_INSTALLS)
 
@@ -174,9 +173,9 @@ ifdef RES
 	@$(RM) *$(RES)
 endif
 
-# Sort mkdir targets to remove duplicates & make parents first
-$(DIRECTORY_TARGETS):
-	$(MKDIR) $(sort $@)
+# Sort directories to remove duplicates & make parents first
+$(sort $(DIRECTORY_TARGETS)):
+	$(MKDIR) $@
 
 # Install LIB_INSTALLS libraries before linking executables
 $(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIB_INSTALLS)
@@ -190,12 +189,19 @@ endif
 checkRelease:
 	+$(CONVERTRELEASE) checkRelease
 warnRelease:
-	-$(CONVERTRELEASE) checkRelease
+	$(CONVERTRELEASE) checkRelease
 noCheckRelease:
 ifeq ($(EPICS_HOST_ARCH),$(T_A))
 	$(info Warning: RELEASE file consistency checks have been disabled)
 endif
 
+# $(FINAL_DIR) signals eventual install locations to makeRPath script
+$(TESTPRODNAME): FINAL_DIR=.
+$(PRODNAME): FINAL_DIR=$(INSTALL_BIN)
+$(TESTSHRLIBNAME): FINAL_DIR=.
+$(SHRLIBNAME): FINAL_DIR=$(INSTALL_SHRLIB)
+$(LOADABLE_SHRLIBNAME): FINAL_DIR=$(INSTALL_SHRLIB)
+
 #---------------------------------------------------------------
 #  The order of the following rules is
 #  VERY IMPORTANT !!!!
@@ -207,7 +213,7 @@ $(TESTPRODNAME) $(PRODNAME): %$(EXE): | $(INSTALL_LIB)
 	$(LINK.cpp)
 	$(MT_EXE_COMMAND)
 
-%_ctdt$(OBJ) : %_ctdt.c
+%_ctdt$(OBJ): %_ctdt.c
 	@$(RM) $@
 	$(COMPILE.ctdt) $<
 
@@ -225,9 +231,9 @@ $(TESTPRODNAME) $(PRODNAME): %$(EXE): | $(INSTALL_LIB)
 
 # Cancel GNUMake's built-in rules, which don't have our _INC
 # dependencies so could get used in some circumstances (gdd)
-%.o : %.c
-%.o : %.cc
-%.o : %.cpp
+%.o: %.c
+%.o: %.cc
+%.o: %.cpp
 
 # Include files are order-only prerequisites for compilation:
 %$(OBJ): %.c | $(COMMON_INC) $(INSTALL_INC)
@@ -261,7 +267,7 @@ YACCOPT ?= $($*_YACCOPT)
 
 # must be a separate rule since when not using '-d' the
 # prefix for .h will be different then .c
-%.h : %.c %.y
+%.h: %.c %.y
 
 %.c: %.l
 	@$(RM) $@
@@ -348,23 +354,22 @@ $(MODNAME): %$(MODEXT): %$(EXE)
 #---------------------------------------------------------------
 # Automated testing
 
-runtests: $(TESTSCRIPTS)
+runtests: run-tap-tests
+run-tap-tests: $(TESTSCRIPTS.t)
+ifneq ($(TESTSCRIPTS.t),)
 ifdef RUNTESTS_ENABLED
-	-$(PERL) -MTest::Harness -e 'runtests @ARGV if @ARGV;' $^
+	$(PROVE) --failures --color $^ || $(PROVE_FAILURE)
+endif
 endif
 
-testspec: $(TESTSCRIPTS)
-	@$(RM) $@
-	@echo OS-class: $(OS_CLASS) > $@
-	@echo Target-arch: $(T_A) >> $@
-	$(if $^, @echo Tests: $^ >> $@)
-	$(if $(TESTFILES), @echo Files: $(TESTFILES) >> $@)
-	$(if $(TESTSPEC_$(OS_CLASS)), @echo "Harness: $(TESTSPEC_$(OS_CLASS))" >> $@)
+tapfiles: $(TAPFILES)
+junitfiles: $(JUNITFILES)
 
-test-results: tapfiles
-ifneq ($(TAPFILES),)
+test-results: tap-results
+tap-results: $(TAPFILES)
+ifneq ($(strip $(TAPFILES)),)
 ifdef RUNTESTS_ENABLED
-	prove --failures --ext .tap --exec "$(CAT)" --color $(TAPFILES)
+	$(PROVE.tap) --failures --color $^ || $(PROVE_FAILURE)
 endif
 
 CURRENT_TAPFILES := $(wildcard $(TAPFILES))
@@ -379,16 +384,13 @@ ifneq ($(CURRENT_JUNITFILES),)
 	$(RM) $(CURRENT_JUNITFILES)
 endif
 
-tapfiles: $(TESTSCRIPTS) $(TAPFILES)
-junitfiles: $(JUNITFILES)
-
 # A .tap file is the output from running the associated test script
-%.tap: %.t
+$(TAPFILES.t): %.tap: %.t
 ifdef RUNTESTS_ENABLED
-	-$(PERL) $< -tap > $@
+	$(PERL) $< -tap > $@
 endif
 
-%.xml: %.tap
+$(JUNITFILES.t): %-results.xml: %.tap
 	$(TAPTOJUNIT) --puretap --output $@ --input $< $*
 
 # If there's a perl test script (.plt) available, use it
@@ -403,6 +405,23 @@ endif
 	$(PERL) $(TOOLS)/makeTestfile.pl $(T_A) $(EPICS_HOST_ARCH) $@ $<
 
 #---------------------------------------------------------------
+# Generate $(API_HEADER) files on request (%API.h)
+
+ifdef API_HEADER
+# Install them
+INC += $(API_HEADER)
+
+# Ensure we generate them early enough
+INSTALL_API_HEADERS = $(addprefix $(INSTALL_INCLUDE)/,$(API_HEADER))
+$(filter-out $(INSTALL_API_HEADERS), $(INSTALL_INC)) $(HDEPENDS_FILES): \
+    | $(INSTALL_API_HEADERS)
+
+# How to make one
+$(COMMON_DIR)/%API.h: $(TOOLS)/makeAPIheader.pl
+	@$(RM) $@
+	$(PERL) $(TOOLS)/makeAPIheader.pl -o $@ $(@:$(COMMON_DIR)/%API.h=%)
+endif
+
 # Generate header with version number from VCS
 
 ifneq ($(GENVERSION),)
@@ -414,14 +433,14 @@ endif
 # Install rules for BIN_INSTALLS and LIB_INSTALLS
 
 define  BIN_INSTALLS_template
-$$(INSTALL_BIN)/$$(notdir $(1)) : $(1)
+$$(INSTALL_BIN)/$$(notdir $(1)): $(1)
 	$(ECHO) "Installing $$(<F)"
 	@$$(INSTALL) -d -m $$(BIN_PERMISSIONS) $$^ $$(INSTALL_BIN)
 endef
 $(foreach file, $(BIN_INSTALLS), $(eval $(call BIN_INSTALLS_template, $(file))))
 
 define  LIB_INSTALLS_template
-$$(INSTALL_LIB)/$$(notdir $(1)) : $(1)
+$$(INSTALL_LIB)/$$(notdir $(1)): $(1)
 	$(ECHO) "Installing $$(<F)"
 	@$$(INSTALL) -d -m $$(LIB_PERMISSIONS) $$^ $$(INSTALL_LIB)
 endef
@@ -497,19 +516,19 @@ $(INSTALL_CONFIG)/%: ../%
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 endif
 
-$(INSTALL_INCLUDE)/% : $(COMMON_DIR)/%
+$(INSTALL_INCLUDE)/%: $(COMMON_DIR)/%
 	$(ECHO) "Installing generated generic include file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
-$(INSTALL_INCLUDE)/% : %
+$(INSTALL_INCLUDE)/%: %
 	$(ECHO) "Installing generic include file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
-$(INSTALL_INCLUDE)/os/$(OS_CLASS)/% : %
+$(INSTALL_INCLUDE)/os/$(OS_CLASS)/%: %
 	$(ECHO) "Installing OS dependent include file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
-$(INSTALL_INCLUDE)/compiler/$(CMPLR_CLASS)/% : %
+$(INSTALL_INCLUDE)/compiler/$(CMPLR_CLASS)/%: %
 	$(ECHO) "Installing compiler dependent include file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
@@ -547,8 +566,8 @@ include $(CONFIG)/RULES_EXPAND
 .PRECIOUS: $(COMMON_INC)
 
 .PHONY: all host inc build install clean rebuild buildInstall build_clean
-.PHONY: runtests tapfiles clean-tests test-results junitfiles
-.PHONY: checkRelease warnRelease noCheckRelease FORCE
+.PHONY: runtests run-tap-tests tapfiles junitfiles test-results tap-results
+.PHONY: clean-tests checkRelease warnRelease noCheckRelease FORCE
 
 include $(CONFIG)/RULES_COMMON
 

configure/RULES_DIRS

@@ -4,7 +4,7 @@
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
-# in the file LICENSE that is included with this distribution. 
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
 
 ARCHS += $(BUILD_ARCHS)
@@ -54,7 +54,7 @@ $(foreach dir, $(DIRS), \
 
 define DEP_template2
 $(1)$$(DIVIDER)$(2) : $$(foreach ddir, $$($(1)_DEPEND_DIRS), \
-    $$(addsuffix $$(DIVIDER)$(2),$$(ddir)))
+    $$(addsuffix $$(DIVIDER)$(2),$$(ddir))) | before-$(2)
 endef
 $(foreach action, $(ACTIONS), \
     $(foreach dir, $(DIRS), \
@@ -79,18 +79,24 @@ $(foreach arch, $(ARCHS), \
 
 dirPart = $(join $(dir $@), $(word 1, $(subst $(DIVIDER), ,$(notdir $@))))
 actionArchPart = $(join $(word 2, $(subst $(DIVIDER), ,$(notdir $@))), \
-   $(addprefix $(DIVIDER),$(word 3, $(subst $(DIVIDER), ,$(notdir $@))))) 
-$(DIRS) $(dirActionTargets) $(dirArchTargets) $(dirActionArchTargets) :
+   $(addprefix $(DIVIDER),$(word 3, $(subst $(DIVIDER), ,$(notdir $@)))))
+
+$(DIRS) $(dirActionTargets) $(dirArchTargets) $(dirActionArchTargets):
 	$(MAKE) -C $(dirPart) $(actionArchPart)
 
+# before-action rules are run once prior to recursing through the
+# list of subdirectories and running the action rule in each one.
+# See DEP_template2 above for how that rule ordering is achieved.
+beforeActions = $(addprefix before-,$(ACTIONS))
+$(beforeActions):
+
 $(ARCHS) $(ACTIONS) $(actionArchTargets) :%: \
     $(foreach dir, $(DIRS), $(dir)$(DIVIDER)%)
 
-
-.PHONY: $(DIRS) all host rebuild
-.PHONY: $(ARCHS) $(ACTIONS)
-.PHONY: $(dirActionTargets) $(dirArchTargets)
-.PHONY: $(dirActionArchTargets)
-.PHONY: $(actionArchTargets)
+.PHONY : $(DIRS) all host rebuild
+.PHONY : $(ARCHS) $(ACTIONS) $(beforeActions)
+.PHONY : $(dirActionTargets) $(dirArchTargets)
+.PHONY : $(dirActionArchTargets)
+.PHONY : $(actionArchTargets)
 
 include $(CONFIG)/RULES_COMMON

configure/RULES_EXPAND

@@ -12,28 +12,72 @@
 vpath %@ $(USR_VPATH) $(ALL_SRC_DIRS)
 
 #---------------------------------------------------------------
-# Variable expansion
+# Template variable expansion
+
+# This feature allows you to instantiate simple template files at
+# build-time, replacing macros spelled @NAME@ with values provided
+# by the Makefile. The template filename must end with an @ sign,
+# which is removed to create the expanded filename.
+
+# Makefiles can use this variable expansion as follows:
+#
+# 1. Add the template filename (with the trailing @ sign) to either
+#    the EXPAND or EXPAND_COMMON variable, for example:
+#        EXPAND_COMMON += myVersion.h@
+#    Use EXPAND_COMMON for templates that don't depend on the
+#    target architecture (these will be generated in O.Common).
+# 2. There are 2 ways of defining template macros. The simplest
+#    is to add a NAME=VALUE string to the EXPAND_VARS variable for
+#    the desired macros, e.g.:
+#        EXPAND_VARS += MY_MAJOR_VERSION=$(MY_MAJOR_VERSION)
+#        EXPAND_VARS += MY_MINOR_VERSION=$(MY_MINOR_VERSION)
+#    These values may not contain spaces, even if inside quotes.
+# 3. A better way in the above case is to add the names of any
+#    Makefile variables that should be provided as macros to the
+#    variable EXPAND_ME, like this:
+#        EXPAND_ME += MY_MAJOR_VERSION
+#        EXPAND_ME += MY_MINOR_VERSION
+#    The values of these variables may contain spaces.
+# 4. The macros TOP and ARCH will be set by the build system.
+#    TOP is the value of $(INSTALL_LOCATION) for this module.
+#    ARCH is the target architecture $(T_A), but is only set
+#    while expanding files in EXPAND
+# 5. Add the expanded filename to some other variable that will
+#    cause it to be created and used, such as INC here:
+#        INC += myVersion.h
 
 # Default settings
 EXPAND_TOOL ?= $(PERL) $(TOOLS)/expandVars.pl
 
-EXPANDFLAGS += -t $(INSTALL_LOCATION) -a $(T_A)
-EXPANDFLAGS += $(addprefix -D ,$(EXPAND_VARS))
+EXPANDARCH = -a $(T_A)
+EXPANDFLAGS += -t $(INSTALL_LOCATION)
+EXPANDFLAGS += $(addprefix -D ,$(EXPAND_VARS) $($@_EXPAND_VARS))
+EXPANDFLAGS += $(foreach var, $(EXPAND_ME) $($@_EXPAND_ME), \
+    -D$(var)="$(strip $($(var)))")
 
 # The names of files to be expanded must end with '@'
 EXPANDED = $(EXPAND:%@=%)
+EXPANDED_COM = $(EXPAND_COMMON:%@=%)
+EXPANDED_COMMON = $(EXPANDED_COM:%=$(COMMON_DIR)/%)
 
 $(EXPANDED): %: %@
 	$(ECHO) "Expanding $< to $@"
 	@$(RM) $@
-	@$(EXPAND_TOOL) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@
+	$(EXPAND_TOOL) $(EXPANDARCH) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@
+
+$(EXPANDED_COM): %: %@
+	$(ECHO) "Expanding $< to $(COMMON_DIR)/$@"
+	@$(RM) $@
+	$(EXPAND_TOOL) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@
+$(EXPANDED_COMMON): $(COMMON_DIR)/%: %
+	@$(MV) $< $@
 
 clean: expand_clean
 
 expand_clean:
-	@$(RM) $(EXPANDED)
+	@$(RM) $(EXPANDED) $(EXPANDED_COMMON)
 
-.PRECIOUS: $(EXPANDED)
+.PRECIOUS: $(EXPANDED) $(EXPANDED_COMMON)
 .PHONY: expand_clean
 
 #---------------------------------------------------------------
@@ -70,4 +114,3 @@ $1$(DEP):
 endef
 $(foreach asy, $(sort $(COMMON_ASSEMBLIES) $(ASSEMBLIES)), \
     $(eval $(call ASSEMBLY_DEP_template,$(strip $(asy)))))
-

configure/RULES_MODULES

@@ -23,7 +23,8 @@
 #           -include $(TOP)/../CONFIG_SITE.local
 
 # Add checked-out submodules to DIRS
-DIRS += $(subst /Makefile,,$(wildcard $(addsuffix /Makefile, $(SUBMODULES))))
+LIVE_SUBMODULES = $(subst /Makefile,,$(wildcard $(addsuffix /Makefile, $(SUBMODULES))))
+DIRS += $(LIVE_SUBMODULES)
 
 include $(CONFIG)/RULES_DIRS
 
@@ -45,3 +46,15 @@ realclean:
 	$(RM) $(wildcard RELEASE.*.local)
 
 .PHONY: RELEASE.host realclean
+
+# Append all our live submodule failure files
+FAILURE_FILES = $(addsuffix /$(TEST_FAILURE_FILENAME), $(LIVE_SUBMODULES))
+
+define combine_failure_files
+	@$(TOUCH) $(FAILURE_FILES)
+	@$(CAT) $(FAILURE_FILES) >> $(TEST_FAILURE_FILE)
+endef
+runtests: | $(addsuffix $(DIVIDER)runtests, $(LIVE_SUBMODULES))
+	$(if $(FAILURE_FILES), $(combine_failure_files))
+test-results: | $(addsuffix $(DIVIDER)test-results, $(LIVE_SUBMODULES))
+	$(if $(FAILURE_FILES), $(combine_failure_files))

configure/RULES_TARGET

@@ -95,12 +95,20 @@ $(1)_DLL_DEPLIBS=$$(foreach lib, $$($(1)_DLL_LIBS), \
 $$(LIB_PREFIX)$(1)$$(LIB_SUFFIX):$$($(1)_OBJSNAME) $$($(1)_RESS)
 $$(LIB_PREFIX)$(1)$$(LIB_SUFFIX):$$($(1)_DEPLIBS)
 
+ifneq ($$($(1)_API),)
+$$(LIB_PREFIX)$(1)$$(LIB_SUFFIX): API_CPPFLAGS += -DBUILDING_$$($(1)_API)_API
+endif
+
 ifeq ($$(SHARED_LIBRARIES),YES)
 
 ifdef SHRLIB_SUFFIX
 $$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_OBJSNAME) $$($(1)_RESS)
 $$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_DEPLIBS)
 $$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_DLL_DEPLIBS)
+
+ifneq ($$($(1)_API),)
+$$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX): API_CPPFLAGS += -DBUILDING_$$($(1)_API)_API
+endif
 endif
 
 endif
@@ -141,6 +149,11 @@ $(1)_DLL_DEPLIBS=$$(foreach lib, $$($(1)_DLL_LIBS),\
 $$(LOADABLE_SHRLIB_PREFIX)$(1)$$(LOADABLE_SHRLIB_SUFFIX):$$($(1)_OBJSNAME) $$($(1)_RESS)
 $$(LOADABLE_SHRLIB_PREFIX)$(1)$$(LOADABLE_SHRLIB_SUFFIX):$$($(1)_DEPLIBS)
 $$(LOADABLE_SHRLIB_PREFIX)$(1)$$(LOADABLE_SHRLIB_SUFFIX):$$($(1)_DLL_DEPLIBS)
+
+ifneq ($$($(1)_API),)
+$$(LOADABLE_SHRLIB_PREFIX)$(1)$$(LOADABLE_SHRLIB_SUFFIX): \
+    API_CPPFLAGS += -DBUILDING_$$($(1)_API)_API
+endif
 endef
 
 $(foreach target, $(LOADABLE_LIBRARY), \

configure/RULES_TOP

@@ -26,47 +26,47 @@ ifndef DISABLE_TOP_RULES
 distclean: realclean cvsclean realuninstall
 
 realuninstall: uninstallDirs
-	$(RMDIR) $(INSTALL_LOCATION_BIN)
-	$(RMDIR) $(INSTALL_LOCATION_LIB)
+	$(RMDIR) $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB)
 
 UNINSTALL_DIRS += $(INSTALL_DB) $(INSTALL_DBD) $(INSTALL_DOC) $(INSTALL_HTML)
 UNINSTALL_DIRS += $(INSTALL_INCLUDE) $(INSTALL_TEMPLATES) $(DIRECTORY_TARGETS)
 ifneq ($(INSTALL_LOCATION),$(TOP))
   UNINSTALL_DIRS += $(INSTALL_CONFIG)
 endif
-uninstallDirs:
+uninstallDirs: | clean
 	$(RMDIR) $(UNINSTALL_DIRS)
 
-uninstall: archuninstall uninstallDirs
+  # Remove the bin and lib directories if they have no sub-directories
+  #
+EMPTY_INSTALL_DIRS = \
+    $(if $(wildcard $(INSTALL_LOCATION_BIN)/*),,$(INSTALL_LOCATION_BIN)) \
+    $(if $(wildcard $(INSTALL_LOCATION_LIB)/*),,$(INSTALL_LOCATION_LIB))
+uninstall: archuninstall uninstallDirs | clean
+	$(RMDIR) $(EMPTY_INSTALL_DIRS)
 
-archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS)) | cleandirs
+archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS))
 
-archPart = $(word 2, $(subst $(DIVIDER), ,$@))
-uninstall$(DIVIDER)%:
-	$(RMDIR) $(INSTALL_LOCATION_BIN)/$(archPart)
-	$(RMDIR) $(INSTALL_LOCATION_LIB)/$(archPart)
+uninstall$(DIVIDER)%: | clean
+	$(RMDIR) $(addsuffix /$(subst uninstall$(DIVIDER),,$@), \
+	    $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB))
 
-# Remove the bin and lib directories if they have no sub-directories
-#
-cleandirs:
-	@$(NOP)
-ifeq ($(wildcard $(INSTALL_LOCATION_BIN)/*),)
-	$(RMDIR) $(INSTALL_LOCATION_BIN)
-endif
-ifeq ($(wildcard $(INSTALL_LOCATION_LIB)/*),)
-	$(RMDIR) $(INSTALL_LOCATION_LIB)
-endif
+runtests test-results:
+	@$(PERL) $(TOOLS)/testFailures.pl $(TEST_FAILURE_FILE)
 
 else
   #
   # Using a disabled rule aborts
   #
 
-  cleandirs distclean uninstall realuninstall archuninstall:
+  distclean uninstall realuninstall archuninstall:
 	$(error Target '$@' not available in a submodule)
 
 endif # DISABLE_TOP_RULES
 
+before-runtests before-test-results: rm-failure-file
+rm-failure-file:
+	@$(RM) $(TEST_FAILURE_FILE)
+	@$(TOUCH) $(TEST_FAILURE_FILE)
 
 help:
 	@echo "Usage: gnumake [options] [target] ..."
@@ -106,7 +106,7 @@ endif
 	@echo "Object targets are supported by the O.<arch> level Makefile .e.g"
 	@echo "     xxxRecord.o"
 
-.PHONY: cleandirs distclean uninstall help
+.PHONY: distclean uninstall rm-failure-file help
 .PHONY: realuninstall archuninstall uninstallDirs
 
 ifndef DISABLE_TOP_RULES

configure/Sample.Makefile

@@ -3,8 +3,8 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
+# SPDX-License-Identifier: EPICS
+# EPICS Base is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #	Makefile  for  base/src/sample

configure/os/CONFIG.Common.linux-aarch64

@@ -0,0 +1,11 @@
+# CONFIG.Common.linux-aarch64
+#
+# Definitions for linux-arm target builds
+# Override these settings in CONFIG_SITE.Common.linux-aarch64
+#-------------------------------------------------------
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = aarch64
+

configure/os/CONFIG.Common.linux-arm_eb

@@ -1,9 +0,0 @@
-# CONFIG.Common.linux-arm_eb
-#
-# Definitions for linux-arm_eb (big endian) target builds
-# Sites may override these definitions in CONFIG_SITE.Common.linux-arm_eb
-#-------------------------------------------------------
-
-# Include definitions common to all Linux-arm targets
-include $(CONFIG)/os/CONFIG.Common.linux-arm
-

configure/os/CONFIG.Common.linux-arm_el

@@ -1,9 +0,0 @@
-# CONFIG.Common.linux-arm_el
-#
-# Definitions for linux-arm_el (little endian) target builds
-# Sites may override these definitions in CONFIG_SITE.Common.linux-arm_el
-#-------------------------------------------------------
-
-# Include definitions common to all linux-arm targets
-include $(CONFIG)/os/CONFIG.Common.linux-arm
-

configure/os/CONFIG.Common.linuxCommon

@@ -23,15 +23,17 @@ STATIC_LDFLAGS_YES= -Wl,-Bstatic
 STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic
 
-# Set runtime path for shared libraries if USE_RPATH=YES and STATIC_BUILD=NO
-SHRLIBDIR_RPATH_LDFLAGS_YES_NO = $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
+# Set runtime path for shared libraries if LINKER_USE_RPATH=YES
+SHRLIBDIR_RPATH_LDFLAGS_YES = $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
+SHRLIBDIR_RPATH_LDFLAGS_ORIGIN = $(shell $(MAKERPATH) -O '\$$ORIGIN' -F $(FINAL_DIR) -R $(LINKER_ORIGIN_ROOT) $(SHRLIB_DEPLIB_DIRS))
 SHRLIBDIR_LDFLAGS += \
-    $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
+    $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
 
-# Set runtime path for products if USE_RPATH=YES and STATIC_BUILD=NO
-PRODDIR_RPATH_LDFLAGS_YES_NO = $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
+# Set runtime path for products if LINKER_USE_RPATH=YES
+PRODDIR_RPATH_LDFLAGS_YES = $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
+PRODDIR_RPATH_LDFLAGS_ORIGIN = $(shell $(MAKERPATH) -O '\$$ORIGIN' -F $(FINAL_DIR) -R $(LINKER_ORIGIN_ROOT) $(PROD_DEPLIB_DIRS))
 PRODDIR_LDFLAGS += \
-    $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
+    $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
 
 # Link libraries controlled by COMMANDLINE_LIBRARY
 # The newest Linux versions only need readline, older ones need both

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

@@ -30,7 +30,7 @@ ARCH_DEP_LDFLAGS += -m32
 # Compiler does not define  __unix __unix__ unix
 
 # Override for -DUNIX from CONFIG.Common.UnixCommon
-OP_SYS_CPPFLAGS = -D_MINGW
+OP_SYS_CPPFLAGS = -D_MINGW -D__USE_MINGW_ANSI_STDIO
 
 EXE = .exe
 RES = .coff

configure/os/CONFIG.UnixCommon.Common

@@ -11,6 +11,7 @@ RM = rm -f
 MKDIR = mkdir -p
 RMDIR = rm -rf
 CAT = cat
+TOUCH = touch
 
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.UnixCommon.Common

configure/os/CONFIG.linux-aarch64.Common

@@ -0,0 +1,8 @@
+# CONFIG.linux-aarch64.Common
+#
+# Definitions for linux-aarch64 host builds
+# Sites may override these definitions in CONFIG_SITE.linux-aarch64.Common
+#-------------------------------------------------------
+
+#Include definitions common to unix hosts
+include $(CONFIG)/os/CONFIG.UnixCommon.Common

configure/os/CONFIG.linux-aarch64.linux-aarch64

@@ -0,0 +1,8 @@
+# CONFIG.linux-aarch64.linux-aarch64
+#
+# Definitions for native linux-aarch64 builds
+# Override these definitions in CONFIG_SITE.linux-aarch64.linux-aarch64
+#-------------------------------------------------------
+
+# Include common gnu compiler definitions
+include $(CONFIG)/CONFIG.gnuCommon

configure/os/CONFIG.linux-x86.linux-arm_eb

@@ -1,9 +0,0 @@
-# CONFIG.linux-x86.linux-arm_eb
-#
-# Definitions for linux-x86 host - linux-arm_eb (big endian) target builds
-# Sites may override these definitions in CONFIG_SITE.linux-x86.linux-arm_eb
-#-------------------------------------------------------
-
-# Include definitions for linux-arm targets
-include $(CONFIG)/os/CONFIG.linux-x86.linux-arm
-

configure/os/CONFIG.linux-x86.linux-arm_el

@@ -1,9 +0,0 @@
-# CONFIG.linux-x86.linux-arm_el
-#
-# Definitions for linux-x86 host - linux-arm_el (little endian) target builds
-# Sites may override these definitions in CONFIG_SITE.linux-x86.linux-arm_el
-#-------------------------------------------------------
-
-# Include definitions for linux-arm targets
-include $(CONFIG)/os/CONFIG.linux-x86.linux-arm
-

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

@@ -21,4 +21,4 @@ LOADABLE_SHRLIB_LDFLAGS = -shared \
 GNU_LDLIBS_YES =
 
 # Link with system libraries
-OP_SYS_LDLIBS = -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm
+OP_SYS_LDLIBS = -lpsapi -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm -ldbghelp

configure/os/CONFIG.linux-x86.windows-x64-mingw

@@ -4,21 +4,5 @@
 # Override these definitions in CONFIG_SITE.linux-x86.windows-x64-mingw
 #-------------------------------------------------------
 
-# Include common gnu compiler definitions
-include $(CONFIG)/CONFIG.gnuCommon
-
-# Add resource compiler
-RCCMD = $(GNU_BIN)/$(CMPLR_PREFIX)windres$(CMPLR_SUFFIX) $(INCLUDES) $< $@
-
-# Remove -fPIC flags, add out-implib
-SHRLIB_CFLAGS =
-SHRLIB_LDFLAGS = -shared \
-    -Wl,--out-implib,$(DLLSTUB_PREFIX)$*$(DLLSTUB_SUFFIX)
-LOADABLE_SHRLIB_LDFLAGS = -shared \
-    -Wl,--out-implib,$(DLLSTUB_PREFIX)$*$(DLLSTUB_SUFFIX)
-
-# No need to explicitly link with gcc library
-GNU_LDLIBS_YES =
-
-# Link with winsock2
-OP_SYS_LDLIBS = -lws2_32
+# Use the definitions from the win32-x86-mingw target
+include $(CONFIG)/os/CONFIG.linux-x86.win32-x86-mingw

configure/os/CONFIG.linux-x86_64.linux-aarch64

@@ -0,0 +1,28 @@
+# CONFIG.linux-x86_64.linux-aarch64
+#
+# Definitions for linux-x86_64 host - linux-aarch64 target builds
+# Sites may override these in CONFIG_SITE.linux-x86_64.linux-aarch64
+#-------------------------------------------------------
+
+VALID_BUILDS = Ioc
+GNU_TARGET = aarch64-linux
+
+# prefix of compiler tools
+CMPLR_SUFFIX =
+CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
+
+# Provide a link-time path for readline if needed
+OP_SYS_INCLUDES += $(READLINE_DIR:%=-I%/include)
+READLINE_LDFLAGS = $(READLINE_DIR:%=-L%/lib)
+RUNTIME_LDFLAGS_READLINE_YES_NO = $(READLINE_DIR:%=-Wl,-rpath,%/lib)
+RUNTIME_LDFLAGS += \
+    $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
+SHRLIBDIR_LDFLAGS += $(READLINE_LDFLAGS)
+PRODDIR_LDFLAGS += $(READLINE_LDFLAGS)
+
+# Library flags
+STATIC_LDFLAGS_YES= -Wl,-Bstatic
+STATIC_LDFLAGS_NO=
+STATIC_LDLIBS_YES= -Wl,-Bdynamic
+STATIC_LDLIBS_NO=
+

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

@@ -32,4 +32,4 @@ LOADABLE_SHRLIB_LDFLAGS = -shared \
 GNU_LDLIBS_YES =
 
 # Link with system libraries
-OP_SYS_LDLIBS = -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm
+OP_SYS_LDLIBS = -lpsapi -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm -ldbghelp

configure/os/CONFIG.win32-x86.Common

@@ -11,6 +11,7 @@ MKDIR = $(PERL) -MExtUtils::Command -e mkpath
 RMDIR = $(PERL) -MExtUtils::Command -e rm_rf
 NOP = $(PERL) -e ''
 CAT = $(PERL) -MExtUtils::Command -e cat
+TOUCH = $(PERL) -MExtUtils::Command -e touch
 
 WIND_HOST_TYPE = x86-win32
 OSITHREAD_USE_DEFAULT_STACK = NO

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

@@ -135,19 +135,22 @@ OBJ_CXXFLAG = -Fo
 STATIC_CXXFLAGS_YES= -MT$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS)
 STATIC_CXXFLAGS_NO= -MD$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS) -DEPICS_CALL_DLL
 
-STATIC_LDLIBS_YES=ws2_32.lib advapi32.lib user32.lib kernel32.lib winmm.lib
+STATIC_LDLIBS_YES=ws2_32.lib advapi32.lib user32.lib kernel32.lib winmm.lib dbghelp.lib
 STATIC_LDLIBS_NO=
 STATIC_LDFLAGS=
 RANLIB=
 
 #
-# option needed for parallel builds with Visual Studio 2015 onward
-#
+# option needed for parallel builds with Visual Studio 2013 onward
+# VS2012 and above have VisualStudioVersion, so just need to exclude 2012 (11.0)
 # -FS Force Synchronous PDB Writes
+#
 ifneq ($(VisualStudioVersion),)
+ifneq ($(VisualStudioVersion),11.0)
   OPT_CXXFLAGS_NO += -FS
   OPT_CFLAGS_NO += -FS
 endif
+endif
 
 
 #

configure/os/CONFIG_SITE.Common.cygwin-x86

@@ -16,3 +16,9 @@ COMMANDLINE_LIBRARY = READLINE_NCURSESW
 
 # No other libraries needed
 #COMMANDLINE_LIBRARY = READLINE
+
+
+# WARNING: Variables that are set in $(CONFIG)/CONFIG.gnuCommon cannot be
+# overridden in this file for native builds, e.g. variables such as
+#    OPT_CFLAGS_YES, WARN_CFLAGS, SHRLIB_LDFLAGS
+# They must be set in CONFIG_SITE.cygwin-x86.cygwin-x86 instead.

configure/os/CONFIG_SITE.Common.cygwin-x86_64

@@ -11,10 +11,8 @@
 #LDLIBS_READLINE = -lreadline -lcurses
 
 
-# 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
+# WARNING: Variables that are set in $(CONFIG)/CONFIG.gnuCommon cannot be
+# overridden in this file for native builds, e.g. variables such as
+#    OPT_CFLAGS_YES, WARN_CFLAGS, SHRLIB_LDFLAGS
+# They must be set in CONFIG_SITE.cygwin-x86_64.cygwin-x86_64 instead.
 

configure/os/CONFIG_SITE.Common.linux-aarch64

@@ -0,0 +1,38 @@
+# CONFIG_SITE.Common.linux-aarch64
+#
+# Site Specific definitions for all linux-aarch64 targets
+#-------------------------------------------------------
+
+# NOTE for SHARED_LIBRARIES: In most cases if this is set to YES the
+# shared libraries will be found automatically.  However if the .so
+# files are installed at a different path to their compile-time path
+# then in order to be found at runtime do one of these:
+# a) LD_LIBRARY_PATH must include the full absolute pathname to
+#    $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) when invoking base
+#    executables.
+# b) Add the runtime path to SHRLIB_DEPLIB_DIRS and PROD_DEPLIB_DIRS, which 
+#    will add the named directory to the list contained in the executables.
+# c) Add the runtime path to /etc/ld.so.conf and run ldconfig
+#    to inform the system of the shared library location.
+
+# Depending on your version of Linux you'll want one of the following
+# lines to enable command-line editing and history in iocsh.  If you're
+# not sure which, start with the top one and work downwards until the
+# build doesn't fail to link the readline library.  If none of them work,
+# comment them all out to build without readline support.
+
+# No other libraries needed (recent Fedora, Ubuntu etc.):
+#COMMANDLINE_LIBRARY = READLINE
+
+# Needs -lncurses (RHEL 5 etc.):
+#COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+# Needs -lcurses (older versions)
+#COMMANDLINE_LIBRARY = READLINE_CURSES
+
+
+# WARNING: Variables that are set in $(CONFIG)/CONFIG.gnuCommon cannot be
+# overridden in this file for native builds, e.g. variables such as
+#    OPT_CFLAGS_YES, WARN_CFLAGS, SHRLIB_LDFLAGS
+# They must be set in CONFIG_SITE.linux-aarch64.linux-aarch64 instead.
+

configure/os/CONFIG_SITE.Common.linux-arm

@@ -1,39 +1,44 @@
 # CONFIG_SITE.Common.linux-arm
 #
-# Site Specific definitions for all linux-arm targets
-#-------------------------------------------------------
+# Site-specific settings for the linux-arm target
 
-# NOTE for SHARED_LIBRARIES: In most cases if this is set to YES the
+# NOTE: In most cases if SHARED_LIBRARIES is set to YES the
 # shared libraries will be found automatically.  However if the .so
 # files are installed at a different path to their compile-time path
 # then in order to be found at runtime do one of these:
 # a) LD_LIBRARY_PATH must include the full absolute pathname to
 #    $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) when invoking base
 #    executables.
-# b) Add the runtime path to SHRLIB_DEPLIB_DIRS and PROD_DEPLIB_DIRS, which 
+# b) Add the runtime path to SHRLIB_DEPLIB_DIRS and PROD_DEPLIB_DIRS, which
 #    will add the named directory to the list contained in the executables.
 # c) Add the runtime path to /etc/ld.so.conf and run ldconfig
 #    to inform the system of the shared library location.
 
-# Depending on your version of Linux you'll want one of the following
-# lines to enable command-line editing and history in iocsh.  If you're
-# not sure which, start with the top one and work downwards until the
-# build doesn't fail to link the readline library.  If none of them work,
-# comment them all out to build without readline support.
 
-# No other libraries needed (recent Fedora, Ubuntu etc.):
-#COMMANDLINE_LIBRARY = READLINE
+# Use GNU Readline if the header file is installed
+COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
+    $(firstword $(READLINE_DIR) $(GNU_DIR))/include/readline/readline.h), \
+  READLINE, EPICS))
 
-# Needs -lncurses (RHEL 5 etc.):
+# If libreadline needs additional libraries to be linked with it, try
+# uncommenting each of the lines below in turn, starting with the top
+# one and working downwards, until the build succeeds. Do a 'make rebuild'
+# from the top of the Base tree after changing this setting.
+
+# Needs -lncurses:
 #COMMANDLINE_LIBRARY = READLINE_NCURSES
 
-# Needs -lcurses (older versions)
+# Needs -lcurses:
 #COMMANDLINE_LIBRARY = READLINE_CURSES
 
+# Readline is broken or you don't want use it:
+#COMMANDLINE_LIBRARY = EPICS
 
-# 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
+
+# WARNING: Variables that are set in $(CONFIG)/CONFIG.gnuCommon cannot be
+# overridden in this file for native builds, e.g. variables such as
+#    OPT_CFLAGS_YES, WARN_CFLAGS, SHRLIB_LDFLAGS
+# They must be set in CONFIG_SITE.linux-arm.linux-arm instead.
+
+# Permit access to 64-bit file-systems
+OP_SYS_CFLAGS += -D_FILE_OFFSET_BITS=64

configure/os/CONFIG_SITE.Common.linux-cris

@@ -1,9 +1,8 @@
 # CONFIG_SITE.Common.linux-cris
 #
-# Site Specific definitions for linux-cris target
-# Only the local epics system manager should modify this file
+# Site-specific settings for the linux-cris target
 
-# NOTE for SHARED_LIBRARIES: In most cases if this is set to YES the
+# NOTE: In most cases if SHARED_LIBRARIES is set to YES the
 # shared libraries will be found automatically.  However if the .so
 # files are installed at a different path to their compile-time path
 # then in order to be found at runtime do one of these:
@@ -15,21 +14,21 @@
 # c) Add the runtime path to /etc/ld.so.conf and run ldconfig
 #    to inform the system of the shared library location.
 
-# Depending on your version of Linux you may want one of the following
-# lines to enable command-line editing and history in iocsh.  If you're
-# not sure which, start with the top one and work downwards until the
-# build doesn't fail to link the readline library.  If none of them work,
-# comment them all out to build without readline support.
 
-# No other libraries needed (recent Fedora, Ubuntu etc.):
-#COMMANDLINE_LIBRARY = READLINE
+# Use GNU Readline if the header file is installed
+COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
+    $(GNU_DIR)/include/readline/readline.h), READLINE, EPICS))
 
-# Needs -lncurses (RHEL 5 etc.):
+# If libreadline needs additional libraries to be linked with it, try
+# uncommenting each of the lines below in turn, starting with the top
+# one and working downwards, until the build succeeds. Do a 'make rebuild'
+# from the top of the Base tree after changing this setting.
+
+# Needs -lncurses:
 #COMMANDLINE_LIBRARY = READLINE_NCURSES
 
-# Needs -lcurses (older versions)
+# Needs -lcurses:
 #COMMANDLINE_LIBRARY = READLINE_CURSES
 
-
-OP_SYS_CFLAGS += -g
-
+# Readline is broken or you don't want use it:
+#COMMANDLINE_LIBRARY = EPICS

configure/os/CONFIG_SITE.Common.linux-microblaze

@@ -1,7 +1,6 @@
 # CONFIG_SITE.Common.linux-microblaze
 #
-# Site specific definitions for linux-microblaze target builds.
-#-------------------------------------------------------
+# Site-specific settings for the linux-microblaze target
 
 # The gnu tools for cross compiling for MicroBlaze (little endian)
 # on Linux can be downloaded from the Xilinx git server:
@@ -12,3 +11,21 @@
 
 GNU_DIR = /usr/local/vw/microblaze-2.0/microblazeel-unknown-linux-gnu
 
+
+# Use GNU Readline if the header file is installed
+COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
+    $(GNU_DIR)/include/readline/readline.h), READLINE, EPICS))
+
+# If libreadline needs additional libraries to be linked with it, try
+# uncommenting each of the lines below in turn, starting with the top
+# one and working downwards, until the build succeeds. Do a 'make rebuild'
+# from the top of the Base tree after changing this setting.
+
+# Needs -lncurses:
+#COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+# Needs -lcurses:
+#COMMANDLINE_LIBRARY = READLINE_CURSES
+
+# Readline is broken or you don't want use it:
+#COMMANDLINE_LIBRARY = EPICS

configure/os/CONFIG_SITE.Common.linux-x86

@@ -1,9 +1,8 @@
 # CONFIG_SITE.Common.linux-x86
 #
-# Site Specific definitions for linux-x86 target
-# Only the local epics system manager should modify this file
+# Site-specific settings for the linux-x86 target
 
-# NOTE for SHARED_LIBRARIES: In most cases if this is set to YES the
+# NOTE: In most cases if SHARED_LIBRARIES is set to YES the
 # shared libraries will be found automatically.  However if the .so
 # files are installed at a different path to their compile-time path
 # then in order to be found at runtime do one of these:
@@ -15,14 +14,15 @@
 # c) Add the runtime path to /etc/ld.so.conf and run ldconfig
 #    to inform the system of the shared library location.
 
-# Depending on your version of Linux you'll want one of the following
-# lines to enable command-line editing and history in iocsh.  If you're
-# not sure which, start with the top one and work downwards until the
-# build doesn't fail to link the readline library.  If none of them work,
-# comment them all out to build without readline support.
 
-# No other libraries needed (recent Fedora, Ubuntu etc.):
-COMMANDLINE_LIBRARY = READLINE
+# Use GNU Readline if the header file is installed
+COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
+    $(GNU_DIR)/include/readline/readline.h), READLINE, EPICS))
+
+# If libreadline needs additional libraries to be linked with it, try
+# uncommenting each of the lines below in turn, starting with the top
+# one and working downwards, until the build succeeds. Do a 'make rebuild'
+# from the top of the Base tree after changing this setting.
 
 # Needs -lncurses (RHEL 5 etc.):
 #COMMANDLINE_LIBRARY = READLINE_NCURSES
@@ -30,31 +30,21 @@ COMMANDLINE_LIBRARY = READLINE
 # Needs -lcurses (older versions)
 #COMMANDLINE_LIBRARY = READLINE_CURSES
 
+# Readline is broken or you don't want use it:
+#COMMANDLINE_LIBRARY = EPICS
+
+
+# WARNING: Variables that are set in $(CONFIG)/CONFIG.gnuCommon cannot be
+# overridden in this file for native builds, e.g. variables such as
+#    OPT_CFLAGS_YES, WARN_CFLAGS, SHRLIB_LDFLAGS
+# They must be set in CONFIG_SITE.linux-x86.linux-x86 instead.
 
 # Permit access to 64-bit file-systems
 OP_SYS_CFLAGS += -D_FILE_OFFSET_BITS=64
 
-
-# Uncomment the followings lines to build with CLANG instead of GCC.
-#
-#GNU         = NO
-#CMPLR_CLASS = clang
-#CC          = clang
-#CCC         = clang++
-
-
-# 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
-
-
 # Tune GNU compiler output for a specific 32-bit cpu-type
 # (e.g. generic, native, i386, i686, pentium2/3/4, prescott, k6, athlon etc.)
 GNU_TUNE_CFLAGS = -mtune=generic
 
-
 # Developers using a suitable compiler may enable its address sanitizer:
 #ENABLE_ASAN = YES

configure/os/CONFIG_SITE.Common.linux-x86_64

@@ -1,9 +1,8 @@
 # CONFIG_SITE.Common.linux-x86_64
 #
-# Site Specific definitions for linux-x86_64 target
-# Only the local epics system manager should modify this file
+# Site-specific settings for the linux-x86_64 target
 
-# NOTE for SHARED_LIBRARIES: In most cases if this is set to YES the
+# NOTE: In most cases if SHARED_LIBRARIES is set to YES the
 # shared libraries will be found automatically.  However if the .so
 # files are installed at a different path to their compile-time path
 # then in order to be found at runtime do one of these:
@@ -15,14 +14,15 @@
 # c) Add the runtime path to /etc/ld.so.conf and run ldconfig
 #    to inform the system of the shared library location.
 
-# Depending on your version of Linux you'll want one of the following
-# lines to enable command-line editing and history in iocsh.  If you're
-# not sure which, start with the top one and work downwards until the
-# build doesn't fail to link the readline library.  If none of them work,
-# comment them all out to build without readline support.
 
-# No other libraries needed (recent Fedora, Ubuntu etc.):
-COMMANDLINE_LIBRARY = READLINE
+# Use GNU Readline if the header file is installed
+COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
+    $(GNU_DIR)/include/readline/readline.h), READLINE, EPICS))
+
+# If libreadline needs additional libraries to be linked with it, try
+# uncommenting each of the lines below in turn, starting with the top
+# one and working downwards, until the build succeeds. Do a 'make rebuild'
+# from the top of the Base tree after changing this setting.
 
 # Needs -lncurses (RHEL 5 etc.):
 #COMMANDLINE_LIBRARY = READLINE_NCURSES
@@ -30,27 +30,18 @@ COMMANDLINE_LIBRARY = READLINE
 # Needs -lcurses (older versions)
 #COMMANDLINE_LIBRARY = READLINE_CURSES
 
-
-# Uncomment the followings lines to build with CLANG instead of GCC.
-#
-#GNU         = NO
-#CMPLR_CLASS = clang
-#CC          = clang
-#CCC         = clang++
+# Readline is broken or you don't want use it:
+#COMMANDLINE_LIBRARY = EPICS
 
 
-# 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
-
+# WARNING: Variables that are set in $(CONFIG)/CONFIG.gnuCommon cannot be
+# overridden in this file for native builds, e.g. variables such as
+#    OPT_CFLAGS_YES, WARN_CFLAGS, SHRLIB_LDFLAGS
+# They must be set in CONFIG_SITE.linux-x86_64.linux-x86_64 instead.
 
 # Tune GNU compiler output for a specific 64-bit cpu-type
 # (e.g. generic, native, core2, nocona, k8, opteron, athlon64, barcelona etc.)
 GNU_TUNE_CFLAGS = -mtune=generic
 
-
 # Developers using a suitable compiler may enable its address sanitizer:
 #ENABLE_ASAN = YES

configure/os/CONFIG_SITE.Common.linux-xscale_be

@@ -1,4 +1,23 @@
 # CONFIG_SITE.Common.linux-xscale_be
 #
-# Site specific definitions for all linux-xscale_be target builds.
-#-------------------------------------------------------
+# Site-specific settings for the linux-xscale_be target
+
+
+# Use GNU Readline if the header file is installed
+COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
+    $(firstword $(READLINE_DIR) $(GNU_DIR))/include/readline/readline.h), \
+  READLINE, EPICS))
+
+# If libreadline needs additional libraries to be linked with it, try
+# uncommenting each of the lines below in turn, starting with the top
+# one and working downwards, until the build succeeds. Do a 'make rebuild'
+# from the top of the Base tree after changing this setting.
+
+# Needs -lncurses:
+#COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+# Needs -lcurses:
+#COMMANDLINE_LIBRARY = READLINE_CURSES
+
+# Readline is broken or you don't want use it:
+#COMMANDLINE_LIBRARY = EPICS

configure/os/CONFIG_SITE.Common.linuxCommon

@@ -0,0 +1,10 @@
+# CONFIG_SITE.Common.linuxCommon
+#
+# Site-specific settings for all linux targets
+
+# WARNING: Variables that are set in $(CONFIG)/CONFIG.gnuCommon cannot be
+# overridden in this file for native builds, e.g. variables such as
+#   OPT_CFLAGS_YES, WARN_CFLAGS, SHRLIB_LDFLAGS
+# They must be set in the host+target specific file instead:
+#   CONFIG_SITE.<linux-arch>.<linux-arch>
+

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

@@ -0,0 +1,12 @@
+# CONFIG_SITE.linux-aarch64.linux-aarch64
+#
+# 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.linux-arm_eb

@@ -1,13 +0,0 @@
-#  CONFIG_SITE.linux-x86.linux-arm_eb
-#
-# Site specific definitions for linux-x86 host - linux-arm_eb target builds
-#-------------------------------------------------------
-
-# Include definitions for linux-arm targets
-include $(CONFIG)/os/CONFIG_SITE.linux-x86.linux-arm
-
-# Path to the GNU toolset for linux-arm_eb (big endian) target
-#GNU_DIR = /local/anj/cross-arm/gcc-3.4.5-glibc-2.3.6/armeb-linux
-
-# GNU crosscompiler target name
-#GNU_TARGET = armeb-linux

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

@@ -1,13 +0,0 @@
-#  CONFIG_SITE.linux-x86.linux-arm_el
-#
-# Site specific definitions for linux-x86 host - linux-arm_el target builds
-#-------------------------------------------------------
-
-# Include definitions for linux-arm targets
-include $(CONFIG)/os/CONFIG_SITE.linux-x86.linux-arm
-
-# Path to the GNU toolset for linux-arm_el (little endian) target
-#GNU_DIR = /local/anj/cross-arm/gcc-3.4.5-glibc-2.3.6/armel-linux
-
-# GNU crosscompiler target name
-#GNU_TARGET = armel-linux

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

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

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

@@ -0,0 +1,30 @@
+# CONFIG_SITE.linux-x86.linux-aarch64
+#
+# Site specific definitions for linux-x86 host - linux-aarch64 target builds
+#-------------------------------------------------------
+
+# Set GNU crosscompiler target name
+GNU_TARGET = aarch64-linux-gnu
+
+# Set GNU tools install path
+# Examples is the installation at the APS:
+GNU_DIR = /usr/local/Xilinx/SDK/2018.3/gnu/aarch64/lin/aarch64-linux
+
+# If cross-building shared libraries and the paths on the target machine are
+# different than on the build host, you should uncomment the lines below to
+# disable embedding compile-time library paths into the generated files.
+# You will need to provide another way for programs to find their shared
+# libraries at runtime, such as by setting LD_LIBRARY_PATH or (better) using
+# mechanisms related to /etc/ld.so.conf
+#SHRLIBDIR_RPATH_LDFLAGS_YES_NO =
+#PRODDIR_RPATH_LDFLAGS_YES_NO =
+# However it is usually simpler to set STATIC_BUILD=YES here and not
+# try to use shared libraries at all when cross-building, like this:
+STATIC_BUILD=YES
+SHARED_LIBRARIES=NO
+
+# To use libreadline, point this to its install prefix
+#READLINE_DIR = $(GNU_DIR)
+#READLINE_DIR = /tools/cross/linux-x86.linux-arm/readline
+# See CONFIG_SITE.Common.linux-arm for other COMMANDLINE_LIBRARY values
+#COMMANDLINE_LIBRARY = READLINE

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

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

documentation/.gitignore

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

documentation/KnownProblems.html

@@ -4,17 +4,17 @@
 <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.2</title>
+  <title>Known Problems in EPICS 7.0.3.1</title>
 </head>
 
 <body>
-<h1 style="text-align: center">EPICS 7.0.2: Known Problems</h1>
+<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.2 tree. Download them, then use the GNU Patch program as
+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.2</b>
+<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
@@ -28,10 +28,6 @@ release:</p>
     ...</li>
 -->
 
-  <li>IOCs running on some versions of Cygwin may display warnings at iocInit
-    about duplicate EPICS CA Address list entries. These warnings might be due
-    to a bug in Cygwin; they are benign and can be ignored.</li>
-
 </ul>
 
 </body>

documentation/Makefile

@@ -0,0 +1,33 @@
+TOP = ..
+include $(TOP)/configure/CONFIG
+
+ifdef T_A
+
+DOXYGEN=doxygen
+
+EXPAND = Doxyfile
+
+EXPAND_ME += EPICS_VERSION
+EXPAND_ME += EPICS_REVISION
+EXPAND_ME += EPICS_MODIFICATION
+EXPAND_ME += EPICS_PATCH_LEVEL
+
+ME = documentation/O.$(T_A)/html
+
+install: doxygen
+
+doxygen: Doxyfile
+	$(DOXYGEN)
+	rsync -av $(TOP)/html/ html/
+
+.PHONY: doxygen
+
+commit: doxygen
+	$(TOUCH) html/.nojekyll
+	(cd $(TOP) && $(CURDIR)/../commit-gh.sh $(ME)/ $(ME)/.nojekyll $(ME)/*.* $(ME)/*/*.*)
+
+.PHONY: commit
+
+endif # T_A
+
+include $(TOP)/configure/RULES

documentation/README.1st

@@ -1,344 +0,0 @@
-                           Installation Instructions
-
-                            EPICS Base Release 7.0.2
-
-   --------------------------------------------------------------------------
-
-  Table of Contents
-
-     * What is EPICS base?
-     * What is new in this release?
-     * Copyright
-     * Supported platforms
-     * Supported compilers
-     * Software requirements
-     * Host system storage requirements
-     * Documentation
-     * Directory Structure
-     * Build related components
-     * Building EPICS base (Unix and Win32)
-     * Example application and extension
-     * Multiple host platforms
-
-   --------------------------------------------------------------------------
-
-  What is EPICS base?
-
-     The Experimental Physics and Industrial Control Systems (EPICS) is an
-     extensible set of software components and tools with which application
-     developers can create a control system. This control system can be used
-     to control accelerators, detectors, telescopes, or other scientific
-     experimental equipment. EPICS base is the set of core software, i.e. the
-     components of EPICS without which EPICS would not function. EPICS base
-     allows an arbitrary number of target systems, IOCs (input/output
-     controllers), and host systems, OPIs (operator interfaces) of various
-     types.
-
-  What is new in this release?
-
-     Please check the RELEASE_NOTES file in the distribution for description
-     of changes and release migration details.
-
-  Copyright
-
-     Please review the LICENSE file included in the distribution for legal
-     terms of usage.
-
-  Supported platforms
-
-     The list of platforms supported by this version of EPICS base is given
-     in the configure/CONFIG_SITE file. If you are trying to build EPICS Base
-     on an unlisted host or for a different target machine you must have the
-     proper host/target cross compiler and header files, and you will have to
-     create and add the appropriate new configure files to the
-     base/configure/os/directory. You can start by copying existing
-     configuration files in the configure/os directory and then make changes
-     for your new platforms.
-
-  Supported compilers
-
-     This version of EPICS base has been built and tested using the host
-     vendor's C and C++ compilers, as well as the GNU gcc and g++ compilers.
-     The GNU cross-compilers work for all cross-compiled targets. You may
-     need the C and C++ compilers to be in your search path to do EPICS
-     builds; check the definitions of CC and CCC in
-     base/configure/os/CONFIG.<host>.<host> if you have problems.
-
-  Software requirements
-
-     GNU make
-     You must use the GNU version of make for EPICS builds, and we now
-     recommend version 4.1 or later (version 3.82 may work on Linux, but
-     doesn't on Windows).
-
-     Perl
-     You must have Perl version 5.8.1 or later installed. The EPICS
-     configuration files do not specify the perl full pathname, so the perl
-     executable must be found through your normal search path.
-
-     Unzip and tar (Winzip on WIN32 systems)
-     You must have tools available to unzip and untar the EPICS base
-     distribution file.
-
-     Target systems
-     EPICS supports IOCs running on embedded platforms such as VxWorks and
-     RTEMS built using a cross-compiler, and also supports soft IOCs running
-     as processes on the host platform.
-
-     vxWorks
-     You must have vxWorks 6 installed if any of your target systems are
-     vxWorks systems; the C++ compilers for vxWorks 5.x are now too old to
-     support. The vxWorks installation provides the cross-compiler and header
-     files needed to build for these targets. The absolute path to and the
-     version number of the vxWorks installation must be set in the
-     base/configure/os/CONFIG_SITE.Common.vxWorksCommon file or in one of its
-     target-specific overrides.
-
-     Consult the vxWorks 6.x EPICS web pages and the vxWorks documentation
-     for information about configuring your vxWorks operating system for use
-     with EPICS.
-
-     RTEMS
-     For RTEMS targets, you need RTEMS core and toolset version 4.9.2 or
-     4.10. The newer 4.11 or 5.x releases are not supported yet.
-
-     Command-line editing libraries
-     GNU readline or other OS-specific libraries can be used by the IOC shell
-     to provide command line editing and history recall. The default setting
-     is different for each OS. On Linux the default is to use READLINE since
-     most distributions include it. On MacOS the default is also READLINE
-     since Apple provides a compatible library, although it isn't GNU. On
-     RTEMS we support GNU readline and Tecla, although the default is to use
-     neither since these have to be added to the RTEMS installation
-     separately. On vxWorks we support the built-in ledLib library.
-
-  Host system storage requirements
-
-     The compressed tar file is approximately 1.6 MB in size. The
-     distribution source tree takes up approximately 12 MB. Each host target
-     will need around 40 MB for build files, and each cross-compiled target
-     around 20 MB.
-
-  Documentation
-
-     EPICS documentation is available through the EPICS website at Argonne.
-
-     Release specific documentation can also be found in the
-     base/documentation directory of the distribution.
-
-  Directory Structure
-
-    Distribution directory structure:
-
-         base                    Root directory of the base distribution
-         base/configure          Operating system independent build config files
-         base/configure/os       Operating system dependent build config files
-         base/documentation      Distribution documentation
-         base/src                Source code in various subdirectories
-         base/startup            Scripts for setting up path and environment
-
-    Install directories created by the build:
-
-         bin                     Installed scripts and executables in subdirs
-         cfg                     Installed build configuration files
-         db                      Installed data bases
-         dbd                     Installed data base definitions
-         doc                     Installed documentation files
-         html                    Installed html documentation
-         include                 Installed header files
-         include/os              Installed os specific header files in subdirs
-         include/compiler        Installed compiler-specific header files
-         lib                     Installed libraries in arch subdirectories
-         lib/perl                Installed perl modules
-         templates               Installed templates
-
-  Build related components
-
-    base/documentation directory - contains setup, build, and install documents
-
-         README.1st           Instructions for setup and building epics base
-         README.html          html version of README.1st
-         README.darwin.html   Installation notes for Mac OS X (Darwin)
-         RELEASE_NOTES.html   Notes on release changes
-         KnownProblems.html   List of known problems and workarounds
-
-    base/startup directory - contains scripts to set environment and path
-
-         EpicsHostArch       Shell script to set EPICS_HOST_ARCH env variable
-         unix.csh            C shell script to set path and env variables
-         unix.sh             Bourne shell script to set path and env variables
-         win32.bat           Bat file example to configure win32-x86 target
-         windows.bat         Bat file example to configure windows-x64 target
-
-    base/configure directory - contains build definitions and rules
-
-         CONFIG                Includes configure files and allows variable overrides
-         CONFIG.CrossCommon    Cross build definitions
-         CONFIG.gnuCommon      Gnu compiler build definitions for all archs
-         CONFIG_ADDONS         Definitions for <osclass> and DEFAULT options
-         CONFIG_APP_INCLUDE
-         CONFIG_BASE           EPICS base tool and location definitions
-         CONFIG_BASE_VERSION   Definitions for EPICS base version number
-         CONFIG_COMMON         Definitions common to all builds
-         CONFIG_ENV            Definitions of EPICS environment variables
-         CONFIG_FILE_TYPE
-         CONFIG_SITE           Site specific make definitions
-         CONFIG_SITE_ENV       Site defaults for EPICS environment variables
-         MAKEFILE              Installs CONFIG* RULES* creates
-         RELEASE               Location of external products
-         RULES                 Includes appropriate rules file
-         RULES.Db              Rules for database and database definition files
-         RULES.ioc             Rules for application iocBoot/ioc* directory
-         RULES_ARCHS           Definitions and rules for building architectures
-         RULES_BUILD           Build and install rules and definitions
-         RULES_DIRS            Definitions and rules for building subdirectories
-         RULES_EXPAND
-         RULES_FILE_TYPE
-         RULES_TARGET
-         RULES_TOP             Rules specific to a <top> dir (uninstall and tar)
-         Sample.Makefile       Sample makefile with comments
-
-    base/configure/os directory - contains os-arch specific definitions
-
-         CONFIG.<host>.<target>      Specific host-target build definitions
-         CONFIG.Common.<target>      Specific target definitions for all hosts
-         CONFIG.<host>.Common        Specific host definitions for all targets
-         CONFIG.UnixCommon.Common    Definitions for Unix hosts and all targets
-         CONFIG.Common.UnixCommon    Definitions for Unix targets and all hosts
-         CONFIG.Common.vxWorksCommon Specific host definitions for all vx targets
-         CONFIG_SITE.<host>.<target> Site specific host-target definitions
-         CONFIG_SITE.Common.<target> Site specific target defs for all hosts
-         CONFIG_SITE.<host>.Common   Site specific host defs for all targets
-
-  Building EPICS base (Unix and Win32)
-
-    Unpack file
-
-       Unzip and untar the distribution file. Use WinZip on Windows systems.
-
-    Set environment variables
-
-       Files in the base/startup directory have been provided to help set
-       required path and other environment variables.
-
-       EPICS_HOST_ARCH
-       Before you can build or use EPICS Base, the environment variable
-       EPICS_HOST_ARCH should be defined. A perl script EpicsHostArch.pl in
-       the base/startup directory has been provided to help set
-       EPICS_HOST_ARCH. You should have EPICS_HOST_ARCH set to your host
-       operating system followed by a dash and then your CPU architecture,
-       e.g. linux-x86_64. If you are not using the OS vendor's c/c++ compiler
-       for host builds, you will need another dash followed by the alternate
-       compiler name (e.g. "-gnu" for GNU c/c++ compilers on a solaris host
-       or "-mingw" for MinGW c/c++ compilers on a WIN32 host). See
-       configure/CONFIG_SITE for a list of supported EPICS_HOST_ARCH values.
-
-       PERLLIB
-       On WIN32, some versions of Perl require that the environment variable
-       PERLLIB be set to <perl directory location>.
-
-       PATH
-       As already mentioned, you must have the perl executable and you may
-       need C and C++ compilers in your search path. For building base you
-       also must have echo in your search path. For Unix host builds you also
-       need ln, cpp, cp, rm, mv, and mkdir in your search path and /bin/chmod
-       must exist. On some Unix systems you may also need ar and ranlib in
-       your path, and the C compiler may 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
-       to any libraries they require. However, if you move the EPICS files or
-       directories from their build-time location then in order for the
-       shared libraries to be found at runtime LD_LIBRARY_PATH must include
-       the full pathname to $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) when
-       invoking executables, or some equivalent OS-specific mechanism (such
-       as /etc/ld.so.conf on Linux) must be used. Shared libraries are now
-       built by default on all Unix type hosts.
-
-    Do site-specific build configuration
-
-       Site configuration
-       To configure EPICS, you may want to modify the default definitions in
-       the following files:
-
-         configure/CONFIG_SITE      Build choices. Specify target archs.
-         configure/CONFIG_SITE_ENV  Environment variable defaults
-         configure/RELEASE          TORNADO2 full path location
-
-       Host configuration
-       To configure each host system, you may override the default
-       definitions by adding a new file in the configure/os directory with
-       override definitions. The new file should have the same name as the
-       distribution file to be overridden except with CONFIG in the name
-       changed to CONFIG_SITE.
-
-         configure/os/CONFIG.<host>.<host>      Host build settings
-         configure/os/CONFIG.<host>.Common      Host common build settings
-
-       Target configuration
-       To configure each target system, you may override the default
-       definitions by adding a new file in the configure/os directory with
-       override definitions. The new file should have the same name as the
-       distribution file to be overridden except with CONFIG in the name
-       replaced by CONFIG_SITE. This step is necessary even if the host
-       system is the only target system.
-
-         configure/os/CONFIG.Common.<target>     Target common settings
-         configure/os/CONFIG.<host>.<target>     Host-target settings
-
-    Build EPICS base
-
-       After configuring the build you should be able to build EPICS base by
-       issuing the following commands in the distribution's root directory
-       (base):
-
-         gnumake clean uninstall
-         gnumake
-
-       The command "gnumake clean uninstall" will remove all files and
-       directories generated by a previous build. The command "gnumake" will
-       build and install everything for the configured host and targets.
-
-       It is recommended that you do a "gnumake clean uninstall" at the root
-       directory of an EPICS directory structure before each complete rebuild
-       to ensure that all components will be rebuilt.
-
-  Example application and extension
-
-     A perl tool, makeBaseApp.pl is included in the distribution file. This
-     script will create a sample application that can be built and then
-     executed to try out this release of base.
-
-     Instructions for building and executing the example IOC application can
-     be found in the section "Example Application" of Chapter 2, "Getting
-     Started", in the "IOC Application Developer's Guide" for this release.
-     The "Example IOC Application" section briefly explains how to create and
-     build an example application in a user created <top> directory. It also
-     explains how to run the example application on a vxWorks ioc or as a
-     process on the host system. By running the example application as a
-     host-based IOC, you will be able to quickly implement a complete EPICS
-     system and be able to run channel access clients on the host system.
-
-     A perl script, makeBaseExt.pl, is included in the distribution file.
-     This script will create a sample extension that can be built and
-     executed. The makeBaseApp.pl and makeBaseExt.pl scripts are installed
-     into the install location bin/<hostarch> directory during the base
-     build.
-
-  Multiple host platforms
-
-     You can build using a single EPICS directory structure on multiple host
-     systems and for multiple cross target systems. The intermediate and
-     binary files generated by the build will be created in separate
-     subdirectories and installed into the appropriate separate host/target
-     install directories. EPICS executables and perl scripts are installed
-     into the $(INSTALL_LOCATION)/bin/<arch> directories. Libraries are
-     installed into $(INSTALL_LOCATION)/lib/<arch>. The default definition
-     for $(INSTALL_LOCATION) is $(TOP) which is the root directory in the
-     distribution directory structure, base. Created object files are stored
-     in O.<arch> source subdirectories, This allows objects for multiple
-     cross target architectures to be maintained at the same time. To build
-     EPICS base for a specific host/target combination you must have the
-     proper host/target C/C++ cross compiler and target header files and the
-     base/configure/os directory must have the appropriate configure files.

documentation/README.html

@@ -1,382 +0,0 @@
-<!DOCTYPE HTML>
-<!-- Generate the README.1st file from this file using:
-    elinks -dump -no-numbering -no-references -dump-width 80 README.html
-  -->
-<HTML>
-<HEAD>
-<TITLE>README - EPICS Base Installation Instructions</TITLE>
-</HEAD>
-<BODY>
-<CENTER>
-<H1>Installation Instructions</H1>
-<H2>EPICS Base Release 7.0.2</H2><BR>
-</CENTER>
-<HR>
-<H3> Table of Contents</H3>
-<UL>
-<LI><A HREF="#0_0_1"> What is EPICS base?</A></LI>
-<LI><A HREF="#0_0_2"> What is new in this release?</A></LI>
-<LI><A HREF="#0_0_3"> Copyright</A></LI>
-<LI><A HREF="#0_0_4"> Supported platforms</A></LI>
-<LI><A HREF="#0_0_5"> Supported compilers</A></LI>
-<LI><A HREF="#0_0_6"> Software requirements</A></LI>
-<LI><A HREF="#0_0_7"> Host system storage requirements</A></LI>
-<LI><A HREF="#0_0_8"> Documentation</A></LI>
-<LI><A HREF="#0_0_10"> Directory Structure</A></LI>
-<LI><A HREF="#0_0_11"> Build related components</A></LI>
-<LI><A HREF="#0_0_12"> Building EPICS base (Unix and Win32)</A></LI>
-<LI><A HREF="#0_0_13"> Example application and extension</A></LI>
-<LI><A HREF="#0_0_14"> Multiple host platforms</A></LI>
-</UL>
-<HR>
-
-<H3><A NAME="0_0_1"> What is EPICS base?</A></H3>
-<BLOCKQUOTE>The Experimental Physics and Industrial Control Systems
- (EPICS) is an extensible set of software components and tools with
- which application developers can create a control system. This control
- system can be used to control accelerators, detectors, telescopes, or
- other scientific experimental equipment. EPICS base is the set of core
- software, i.e. the components of EPICS without which EPICS would not
- function. EPICS base allows an arbitrary number of target systems, IOCs
- (input/output controllers), and host systems, OPIs (operator
- interfaces) of various types.</BLOCKQUOTE>
-
-<H3><A NAME="0_0_2"> What is new in this release?</A></H3>
-<BLOCKQUOTE> Please check the RELEASE_NOTES file in the distribution for
- description of changes and release migration details.</BLOCKQUOTE>
-
-<H3><A NAME="0_0_3"> Copyright</A></H3>
-<BLOCKQUOTE>Please review the LICENSE file included in the
- distribution for legal terms of usage.</BLOCKQUOTE>
-
-<H3><A NAME="0_0_4"> Supported platforms</A></H3>
-
-<BLOCKQUOTE>The list of platforms supported by this version of EPICS base
- is given in the configure/CONFIG_SITE file. If you are trying to build
- EPICS Base on an unlisted host or for a different target machine you
- must have the proper host/target cross compiler and header files, and
- you will have to create and add the appropriate new configure files to
- the base/configure/os/directory. You can start by copying existing
- configuration files in the configure/os directory and then make changes
- for your new platforms.</BLOCKQUOTE>
-
-<H3><A NAME="0_0_5"> Supported compilers</A></H3>
-
-<BLOCKQUOTE>This version of EPICS base has been built and tested using the host
- vendor's C and C++ compilers, as well as the GNU gcc and g++ compilers. The GNU
- cross-compilers work for all cross-compiled targets. You may need the C and C++
- compilers to be in your search path to do EPICS builds; check the definitions
- of CC and CCC in base/configure/os/CONFIG.&lt;host&gt;.&lt;host&gt; if you have
- problems.</BLOCKQUOTE>
-
-<H3><A NAME="0_0_6"> Software requirements</A></H3>
-
-<BLOCKQUOTE><B>GNU make</B><BR>
- You must use the GNU version of make for EPICS builds, and we now recommend
- version 4.1 or later (version 3.82 may work on Linux, but doesn't on Windows).
-
-<P><B>Perl</B><BR>
- You must have Perl version 5.8.1 or later installed. The EPICS configuration
- files do not specify the perl full pathname, so the perl executable must
- be found through your normal search path.</P>
-
-<P><B>Unzip and tar (Winzip on WIN32 systems)</B><BR>
- You must have tools available to unzip and untar the EPICS base
- distribution file.</P>
-
-<P><B>Target systems</B><BR>
- EPICS supports IOCs running on embedded platforms such as VxWorks
- and RTEMS built using a cross-compiler, and also supports soft IOCs running
- as processes on the host platform.</P>
-
-<P><B>vxWorks</B><BR>
- You must have vxWorks 6 installed if any of your target systems are vxWorks
- systems; the C++ compilers for vxWorks 5.x are now too old to support. The
- vxWorks installation provides the cross-compiler and header files needed to
- build for these targets. The absolute path to and the version number of the
- vxWorks installation must be set in the
- base/configure/os/CONFIG_SITE.Common.vxWorksCommon file or in one of its
- target-specific overrides.</P>
-
-<P>Consult the <a href="https://epics.anl.gov/base/vxWorks6.php">vxWorks
- 6.x</a> EPICS web pages and the vxWorks documentation for information
- about configuring your vxWorks operating system for use with EPICS.</P>
-
-<P><B>RTEMS</B><BR>
- For RTEMS targets, you need RTEMS core and toolset version 4.9.2 or 4.10. The
- newer 4.11 or 5.x releases are not supported yet.</P>
-
-<P><B>Command-line editing libraries</B><BR>
-
- GNU readline or other OS-specific libraries can be used by the IOC shell to
- provide command line editing and history recall. The default setting is
- different for each OS. On Linux the default is to use READLINE since most
- distributions include it. On MacOS the default is also READLINE since Apple
- provides a compatible library, although it isn't GNU. On RTEMS we support GNU
- readline and Tecla, although the default is to use neither since these have to
- be added to the RTEMS installation separately. On vxWorks we support the
- built-in ledLib library.</P>
-
-</BLOCKQUOTE>
-
-<H3><A NAME="0_0_7"> Host system storage requirements</A></H3>
-
-<BLOCKQUOTE>The compressed tar file is approximately 1.6 MB in size. The
- distribution source tree takes up approximately 12 MB. Each host target will
- need around 40 MB for build files, and each cross-compiled target around 20
- MB.</BLOCKQUOTE>
-
-<H3><A NAME="0_0_8"> Documentation</A></H3>
-<BLOCKQUOTE>EPICS documentation is available through the
- <a href="https://epics.anl.gov/">EPICS website</a> at Argonne.
- <P>Release specific documentation can also be found in the base/documentation
- directory of the distribution.</BLOCKQUOTE>
-
-<H3><A NAME="0_0_10"> Directory Structure</A></H3>
-<BLOCKQUOTE><H4>Distribution directory structure:</H4>
-
-<PRE>
-        base                    Root directory of the base distribution
-        base/configure          Operating system independent build config files
-        base/configure/os       Operating system dependent build config files
-        base/documentation      Distribution documentation
-        base/src                Source code in various subdirectories
-        base/startup            Scripts for setting up path and environment
-</PRE>
-
-<H4>Install directories created by the build:</H4>
-<PRE>
-        bin                     Installed scripts and executables in subdirs
-        cfg                     Installed build configuration files
-        db                      Installed data bases
-        dbd                     Installed data base definitions
-        doc                     Installed documentation files
-        html                    Installed html documentation
-        include                 Installed header files
-        include/os              Installed os specific header files in subdirs
-        include/compiler        Installed compiler-specific header files
-        lib                     Installed libraries in arch subdirectories
-        lib/perl                Installed perl modules
-        templates               Installed templates
-</PRE>
-</BLOCKQUOTE>
-
-<H3><A NAME="0_0_11"> Build related components</A></H3>
-<BLOCKQUOTE>
-
-<H4>base/documentation directory - contains setup, build, and install
- documents</H4>
- <PRE>
-        README.1st           Instructions for setup and building epics base
-        README.html          html version of README.1st
-        README.darwin.html   Installation notes for Mac OS X (Darwin)
-        RELEASE_NOTES.html   Notes on release changes
-        KnownProblems.html   List of known problems and workarounds
-</PRE>
-
-<H4>base/startup directory - contains scripts to set environment and path</H4>
-<PRE>
-        EpicsHostArch       Shell script to set EPICS_HOST_ARCH env variable
-        unix.csh            C shell script to set path and env variables
-        unix.sh             Bourne shell script to set path and env variables
-        win32.bat           Bat file example to configure win32-x86 target
-        windows.bat         Bat file example to configure windows-x64 target
-</PRE>
-
-<H4>base/configure directory - contains build definitions and rules</H4>
-<PRE>
-        CONFIG                Includes configure files and allows variable overrides
-        CONFIG.CrossCommon    Cross build definitions
-        CONFIG.gnuCommon      Gnu compiler build definitions for all archs
-        CONFIG_ADDONS         Definitions for &lt;osclass&gt; and DEFAULT options
-        CONFIG_APP_INCLUDE
-        CONFIG_BASE           EPICS base tool and location definitions
-        CONFIG_BASE_VERSION   Definitions for EPICS base version number
-        CONFIG_COMMON         Definitions common to all builds
-        CONFIG_ENV            Definitions of EPICS environment variables
-        CONFIG_FILE_TYPE
-        CONFIG_SITE           Site specific make definitions
-        CONFIG_SITE_ENV       Site defaults for EPICS environment variables
-        MAKEFILE              Installs CONFIG* RULES* creates
-        RELEASE               Location of external products
-        RULES                 Includes appropriate rules file
-        RULES.Db              Rules for database and database definition files
-        RULES.ioc             Rules for application iocBoot/ioc* directory
-        RULES_ARCHS           Definitions and rules for building architectures
-        RULES_BUILD           Build and install rules and definitions
-        RULES_DIRS            Definitions and rules for building subdirectories
-        RULES_EXPAND
-        RULES_FILE_TYPE
-        RULES_TARGET
-        RULES_TOP             Rules specific to a &lt;top&gt; dir (uninstall and tar)
-        Sample.Makefile       Sample makefile with comments
-</PRE>
-
-<H4>base/configure/os directory - contains os-arch specific definitions</H4>
-<PRE>
-        CONFIG.&lt;host&gt;.&lt;target&gt;      Specific host-target build definitions
-        CONFIG.Common.&lt;target&gt;      Specific target definitions for all hosts
-        CONFIG.&lt;host&gt;.Common        Specific host definitions for all targets
-        CONFIG.UnixCommon.Common    Definitions for Unix hosts and all targets
-        CONFIG.Common.UnixCommon    Definitions for Unix targets and all hosts
-        CONFIG.Common.vxWorksCommon Specific host definitions for all vx targets
-        CONFIG_SITE.&lt;host&gt;.&lt;target&gt; Site specific host-target definitions
-        CONFIG_SITE.Common.&lt;target&gt; Site specific target defs for all hosts
-        CONFIG_SITE.&lt;host&gt;.Common   Site specific host defs for all targets
-</PRE>
-
-</BLOCKQUOTE>
-
-<H3><A NAME="0_0_12"> Building EPICS base (Unix and Win32)</A></H3>
-<BLOCKQUOTE>
-
-<H4> Unpack file</H4>
-<BLOCKQUOTE>
-Unzip and untar the distribution file. Use WinZip on Windows
- systems.
-</BLOCKQUOTE>
-
-<H4>Set environment variables</H4>
-<BLOCKQUOTE>
-Files in the base/startup directory have been provided to
- help set required path and other environment variables.
-
-<P><B>EPICS_HOST_ARCH</B><BR>
- Before you can build or use EPICS Base, the environment variable
- EPICS_HOST_ARCH should be defined. A perl script EpicsHostArch.pl in the
- base/startup directory has been provided to help set EPICS_HOST_ARCH.
- You should have EPICS_HOST_ARCH set to your host operating system
- followed by a dash and then your CPU architecture, e.g. linux-x86_64.
- If you are not using the OS vendor's c/c++ compiler for host builds,
- you will need another dash followed by the alternate compiler name
- (e.g. &quot;-gnu&quot; for GNU c/c++ compilers on a solaris host or &quot;-mingw&quot;
- for MinGW c/c++ compilers on a WIN32 host). See configure/CONFIG_SITE
- for a list of supported EPICS_HOST_ARCH values.</P>
-
-<P><B>PERLLIB</B><BR>
- On WIN32, some versions of Perl require that the environment
- variable PERLLIB be set to &lt;perl directory location&gt;.</P>
-
-<P><B>PATH</B><BR>
- As already mentioned, you must have the perl executable and you may
- need C and C++ compilers in your search path. For building base you
- also must have echo in your search path. For Unix host builds you also
- need ln, cpp, cp, rm, mv, and mkdir in your search path and /bin/chmod
- must exist. On some Unix systems you may also need ar and ranlib in
- your path, and the C compiler may require as and ld in your path. On
- solaris systems you need uname in your path.</P>
-
-<P><B>LD_LIBRARY_PATH</B><BR>
-
- EPICS shared libraries and executables normally contain the full path
- to any libraries they require.
- However, if you move the EPICS files or directories from their build-time
- location then in order for the shared libraries to be found at runtime
- LD_LIBRARY_PATH must include the full pathname to
- $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) when invoking executables, or
- some equivalent OS-specific mechanism (such as /etc/ld.so.conf on Linux)
- must be used.
- Shared libraries are now built by default on all Unix type hosts.</P>
-</BLOCKQUOTE>
-
-<H4>Do site-specific build configuration</H4>
-<BLOCKQUOTE>
-
-<B>Site configuration</B><BR>
- To configure EPICS, you may want to modify the default definitions
- in the following files:
-<PRE>
-        configure/CONFIG_SITE      Build choices. Specify target archs.
-        configure/CONFIG_SITE_ENV  Environment variable defaults
-        configure/RELEASE          TORNADO2 full path location
-</PRE>
-
-<B> Host configuration</B><BR>
- To configure each host system, you may override the default
- definitions by adding a new file in the configure/os directory with
- override definitions. The new file should have the same name as the
- distribution file to be overridden except with CONFIG in the name
- changed to CONFIG_SITE.
-
-<PRE>
-        configure/os/CONFIG.&lt;host&gt;.&lt;host&gt;      Host build settings
-        configure/os/CONFIG.&lt;host&gt;.Common      Host common build settings
-</PRE>
-
-<B>Target configuration</B><BR>
- To configure each target system, you may override the default
- definitions by adding a new file in the configure/os directory with
- override definitions. The new file should have the same name as the
- distribution file to be overridden except with CONFIG in the name
- replaced by CONFIG_SITE. This step is necessary even if the host system
- is the only target system.
- <PRE>
-        configure/os/CONFIG.Common.&lt;target&gt;     Target common settings
-        configure/os/CONFIG.&lt;host&gt;.&lt;target&gt;     Host-target settings
-</PRE>
-</BLOCKQUOTE>
-
-<H4>Build EPICS base</H4>
-<BLOCKQUOTE>After configuring the build you should be able to build
- EPICS base by issuing the following commands in the distribution's root
- directory (base):
- <PRE>
-        gnumake clean uninstall
-        gnumake
-</PRE>
-
- The command &quot;gnumake clean uninstall&quot;
- will remove all files and directories generated by a previous build.
- The command &quot;gnumake&quot; will build and install everything for the
- configured host and targets.
-
-<P> It is recommended that you do a &quot;gnumake clean uninstall&quot; at the
- root directory of an EPICS directory structure before each complete
- rebuild to ensure that all components will be rebuilt.
-</BLOCKQUOTE>
-</BLOCKQUOTE>
-
-<H3><A NAME="0_0_13"> Example application and extension</A></H3>
-<BLOCKQUOTE>A perl tool, makeBaseApp.pl is included in the distribution
- file. This script will create a sample application that can be built
- and then executed to try out this release of base.
-
-<P>
- Instructions for building and executing the example IOC application
- can be found in the section &quot;Example Application&quot; of Chapter 2,
- &quot;Getting Started&quot;, in the &quot;IOC Application Developer's Guide&quot; for this
- release. The &quot;Example IOC Application&quot; section briefly explains how to
- create and build an example application in a user created &lt;top&gt;
- directory. It also explains how to run the example application on a
- vxWorks ioc or as a process on the host system.
- By running the example application as a host-based IOC, you will be
- able to quickly implement a complete EPICS system and be able to run channel
- access clients on the host system.
-
-<P>
- A perl script,
- makeBaseExt.pl, is included in the distribution file. This script will
- create a sample extension that can be built and executed. The
- makeBaseApp.pl and makeBaseExt.pl scripts are installed into the
- install location bin/&lt;hostarch&gt; directory during the base build.
-</BLOCKQUOTE>
-
-<H3><A NAME="0_0_14"> Multiple host platforms</A></H3>
-<BLOCKQUOTE>You can build using a single EPICS directory structure on
- multiple host systems and for multiple cross target systems. The
- intermediate and binary files generated by the build will be created in
- separate subdirectories and installed into the appropriate separate
- host/target install directories. EPICS executables and perl scripts are
- installed into the <TT>$(INSTALL_LOCATION)/bin/&lt;arch&gt;</TT> directories.
- Libraries are installed into $<TT>(INSTALL_LOCATION)/lib/&lt;arch&gt;</TT>.
- The default definition for <TT>$(INSTALL_LOCATION)</TT> is <TT>$(TOP)</TT>
- which is the root directory in the distribution directory structure,
- base. Created object files are stored in O.&lt;arch&gt; source
- subdirectories, This allows objects for multiple cross target
- architectures to be maintained at the same time. To build EPICS base
- for a specific host/target combination you must have the proper
- host/target C/C++ cross compiler and target header files and the
- base/configure/os directory must have the appropriate configure files.
-</BLOCKQUOTE>
-</BODY>
-</HTML>

documentation/README.md

@@ -0,0 +1,372 @@
+# Installation Instructions {#install}
+
+## EPICS Base Release 7.0.4.1
+
+-----
+
+### Table of Contents
+
+  - [What is EPICS base?](#0_0_1)
+  - [What is new in this release?](#0_0_2)
+  - [Copyright](#0_0_3)
+  - [Supported platforms](#0_0_4)
+  - [Supported compilers](#0_0_5)
+  - [Software requirements](#0_0_6)
+  - [Host system storage requirements](#0_0_7)
+  - [Documentation](#0_0_8)
+  - [Directory Structure](#0_0_10)
+  - [Build related components](#0_0_11)
+  - [Building EPICS base (Unix and Win32)](#0_0_12)
+  - [Example application and extension](#0_0_13)
+  - [Multiple host platforms](#0_0_14)
+
+-----
+
+### <span id="0_0_1">What is EPICS base?</span>
+
+The Experimental Physics and Industrial Control Systems (EPICS) is an
+extensible set of software components and tools with which application
+developers can create a control system. This control system can be
+used to control accelerators, detectors, telescopes, or other
+scientific experimental equipment. EPICS base is the set of core
+software, i.e. the components of EPICS without which EPICS would not
+function. EPICS base allows an arbitrary number of target systems,
+IOCs (input/output controllers), and host systems, OPIs (operator
+interfaces) of various types.
+
+### <span id="0_0_2">What is new in this release?</span>
+
+Please check the `RELEASE_NOTES` file in the distribution for
+description of changes and release migration details.
+
+### <span id="0_0_3">Copyright</span>
+
+Please review the LICENSE file included in the distribution for legal
+terms of usage.
+
+### <span id="0_0_4">Supported platforms</span>
+
+The list of platforms supported by this version of EPICS base is given
+in the `configure/CONFIG_SITE` file. If you are trying to build EPICS
+Base on an unlisted host or for a different target machine you must
+have the proper host/target cross compiler and header files, and you
+will have to create and add the appropriate new configure files to the
+base/configure/os/directory. You can start by copying existing
+configuration files in the configure/os directory and then make
+changes for your new platforms.
+
+### <span id="0_0_5">Supported compilers</span>
+
+This version of EPICS base has been built and tested using the host
+vendor's C and C++ compilers, as well as the GNU gcc and g++
+compilers. The GNU cross-compilers work for all cross-compiled
+targets. You may need the C and C++ compilers to be in your search
+path to do EPICS builds; check the definitions of CC and CCC in
+`base/configure/os/CONFIG.<host>.<host>` if you have problems.
+
+### <span id="0_0_6">Software requirements</span>
+
+**GNU make**
+You must use GNU make, gnumake, for any EPICS builds. Set your path so
+that a gnumake version 3.81 or later is available.
+
+**Perl**
+You must have Perl version 5.8.1 or later installed. The EPICS
+configuration files do not specify the perl full pathname, so the perl
+executable must be found through your normal search path.
+
+**Unzip and tar (Winzip on WIN32 systems)**
+You must have tools available to unzip and untar the EPICS base
+distribution file.
+
+**Target systems**
+EPICS supports IOCs running on embedded platforms such as VxWorks and
+RTEMS built using a cross-compiler, and also supports soft IOCs
+running as processes on the host platform.
+
+**vxWorks**
+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
+absolute path to and the version number of the vxWorks installation
+must be set in the `base/configure/os/CONFIG_SITE.Common.vxWorksCommon`
+file or in one of its target-specific overrides.
+
+Consult the [vxWorks 6.x](https://epics.anl.gov/base/vxWorks6.php) EPICS
+web pages about and the vxWorks documentation for information about
+configuring your vxWorks operating system for use with EPICS.
+
+**RTEMS**
+For RTEMS targets, you need RTEMS core and toolset version 4.9.x or
+4.10.x (4.11 or 5.x are not yet supported).
+
+**GNU readline or Tecla library**
+GNU readline and Tecla libraries can be used by the IOC shell to
+provide command line editing and command line history recall and edit.
+GNU readline (or Tecla library) must be installed on your target
+system when `COMMANDLINE_LIBRARY` is set to READLINE (or TECLA) for
+that target. EPICS (EPICS shell) is the default specified in
+`CONFIG_COMMON`. A READLINE override is defined for linux-x86 in the
+EPICS distribution. Comment out `COMMANDLINE_LIBRARY=READLINE` in
+`configure/os/CONFIG_SITE.Common.linux-x86` if readline is not
+installed on linux-x86. Command-line editing and history will then be
+those supplied by the os. On vxWorks the ledLib command-line input
+library is used instead.
+
+### <span id="0_0_7">Host system storage requirements</span>
+
+The compressed tar file is approximately 1.6 MB in size. The
+distribution source tree takes up approximately 12 MB. Each host
+target will need around 40 MB for build files, and each cross-compiled
+target around 20 MB.
+
+### <span id="0_0_8">Documentation</span>
+
+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.
+
+### <span id="0_0_10">Directory Structure</span>
+
+#### Distribution directory structure:
+
+```
+        base                    Root directory of the base distribution
+        base/configure          Operating system independent build config files
+        base/configure/os       Operating system dependent build config files
+        base/documentation      Distribution documentation
+        base/src                Source code in various subdirectories
+        base/startup            Scripts for setting up path and environment
+```
+
+#### Install directories created by the build:
+
+```
+        bin                     Installed scripts and executables in subdirs
+        cfg                     Installed build configuration files
+        db                      Installed data bases
+        dbd                     Installed data base definitions
+        doc                     Installed documentation files
+        html                    Installed html documentation
+        include                 Installed header files
+        include/os              Installed os specific header files in subdirs
+        include/compiler        Installed compiler-specific header files
+        lib                     Installed libraries in arch subdirectories
+        lib/perl                Installed perl modules
+        templates               Installed templates
+```
+
+### <span id="0_0_11">Build related components</span>
+
+#### base/documentation directory - contains setup, build, and install documents
+
+```
+        README.md            Instructions for setup and building epics base
+        README.darwin.html   Installation notes for Mac OS X (Darwin)
+        RELEASE_NOTES.html   Notes on release changes
+        KnownProblems.html   List of known problems and workarounds
+```
+
+#### base/startup directory - contains scripts to set environment and path
+
+```
+        EpicsHostArch       Shell script to set EPICS_HOST_ARCH env variable
+        unix.csh            C shell script to set path and env variables
+        unix.sh             Bourne shell script to set path and env variables
+        win32.bat           Bat file example to configure win32-x86 target
+        windows.bat         Bat file example to configure windows-x64 target
+```
+
+#### base/configure directory - contains build definitions and rules
+
+```
+        CONFIG                Includes configure files and allows variable overrides
+        CONFIG.CrossCommon    Cross build definitions
+        CONFIG.gnuCommon      Gnu compiler build definitions for all archs
+        CONFIG_ADDONS         Definitions for <osclass> and DEFAULT options
+        CONFIG_APP_INCLUDE
+        CONFIG_BASE           EPICS base tool and location definitions
+        CONFIG_BASE_VERSION   Definitions for EPICS base version number
+        CONFIG_COMMON         Definitions common to all builds
+        CONFIG_ENV            Definitions of EPICS environment variables
+        CONFIG_FILE_TYPE
+        CONFIG_SITE           Site specific make definitions
+        CONFIG_SITE_ENV       Site defaults for EPICS environment variables
+        MAKEFILE              Installs CONFIG* RULES* creates
+        RELEASE               Location of external products
+        RULES                 Includes appropriate rules file
+        RULES.Db              Rules for database and database definition files
+        RULES.ioc             Rules for application iocBoot/ioc* directory
+        RULES_ARCHS           Definitions and rules for building architectures
+        RULES_BUILD           Build and install rules and definitions
+        RULES_DIRS            Definitions and rules for building subdirectories
+        RULES_EXPAND
+        RULES_FILE_TYPE
+        RULES_TARGET
+        RULES_TOP             Rules specific to a <top> dir (uninstall and tar)
+        Sample.Makefile       Sample makefile with comments
+```
+
+#### base/configure/os directory - contains os-arch specific definitions
+
+```
+        CONFIG.<host>.<target>      Specific host-target build definitions
+        CONFIG.Common.<target>      Specific target definitions for all hosts
+        CONFIG.<host>.Common        Specific host definitions for all targets
+        CONFIG.UnixCommon.Common    Definitions for Unix hosts and all targets
+        CONFIG.Common.UnixCommon    Definitions for Unix targets and all hosts
+        CONFIG.Common.vxWorksCommon Specific host definitions for all vx targets
+        CONFIG_SITE.<host>.<target> Site specific host-target definitions
+        CONFIG_SITE.Common.<target> Site specific target defs for all hosts
+        CONFIG_SITE.<host>.Common   Site specific host defs for all targets
+```
+
+### <span id="0_0_12">Building EPICS base (Unix and Win32)</span>
+
+#### Unpack file
+
+Unzip and untar the distribution file. Use WinZip on Windows
+systems.
+
+#### Set environment variables
+
+Files in the base/startup directory have been provided to help set
+required path and other environment variables.
+
+* `EPICS_HOST_ARCH`
+Before you can build or use this EPICS base, the environment variable
+`EPICS_HOST_ARCH` must be defined. A perl script EpicsHostArch.pl in
+the base/startup directory has been provided to help set
+`EPICS_HOST_ARCH.` You should have `EPICS_HOST_ARCH` set to your
+host operating system followed by a dash and then your host
+architecture, e.g. solaris-sparc. If you are not using the OS
+vendor's c/c++ compiler for host builds, you will need another dash
+followed by the alternate compiler name (e.g. "-gnu" for GNU c/c++
+compilers on a solaris host or "-mingw" for MinGW c/c++ compilers on
+a WIN32 host). See `configure/CONFIG_SITE` for a list of supported
+`EPICS_HOST_ARCH` values.
+
+* `PERLLIB`
+On WIN32, some versions of Perl require that the environment
+variable PERLLIB be set to &lt;perl directory location>.
+
+* `PATH`
+As already mentioned, you must have the perl executable and you may
+need C and C++ compilers in your search path. For building base you
+also must have echo in your search path. For Unix host builds you
+also need ln, cpp, cp, rm, mv, and mkdir in your search path and
+/bin/chmod must exist. On some Unix systems you may also need ar and
+ranlib in your path, and the C compiler may 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 to any libraries they require. However, if you move the EPICS
+files or directories from their build-time location then in order
+for the shared libraries to be found at runtime `LD_LIBRARY_PATH`
+must include the full pathname to
+`$(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH)` when invoking
+executables, or some equivalent OS-specific mechanism (such as
+/etc/ld.so.conf on Linux) must be used. Shared libraries are now
+built by default on all Unix type hosts.
+
+#### Do site-specific build configuration
+
+**Site configuration**
+To configure EPICS, you may want to modify the default definitions
+in the following files:
+
+```
+        configure/CONFIG_SITE      Build choices. Specify target archs.
+        configure/CONFIG_SITE_ENV  Environment variable defaults
+        configure/RELEASE          TORNADO2 full path location
+```
+
+**Host configuration**
+To configure each host system, you may override the default
+definitions by adding a new file in the configure/os directory with
+override definitions. The new file should have the same name as the
+distribution file to be overridden except with CONFIG in the name
+changed to `CONFIG_SITE`.
+
+```
+        configure/os/CONFIG.<host>.<host>      Host build settings
+        configure/os/CONFIG.<host>.Common      Host common build settings
+```
+
+**Target configuration**
+To configure each target system, you may override the default
+definitions by adding a new file in the configure/os directory with
+override definitions. The new file should have the same name as the
+distribution file to be overridden except with CONFIG in the name
+replaced by `CONFIG_SITE`. This step is necessary even if the host
+system is the only target system.
+
+```
+        configure/os/CONFIG.Common.<target>     Target common settings
+        configure/os/CONFIG.<host>.<target>     Host-target settings
+```
+
+#### Build EPICS base
+
+After configuring the build you should be able to build EPICS base
+by issuing the following commands in the distribution's root
+directory (base):
+
+```
+        gnumake clean uninstall
+        gnumake
+```
+
+The command "gnumake clean uninstall" will remove all files and
+directories generated by a previous build. The command "gnumake"
+will build and install everything for the configured host and
+targets.
+
+It is recommended that you do a "gnumake clean uninstall" at the
+root directory of an EPICS directory structure before each complete
+rebuild to ensure that all components will be rebuilt.
+
+### <span id="0_0_13">Example application and extension</span>
+
+A perl tool, makeBaseApp.pl is included in the distribution file. This
+script will create a sample application that can be built and then
+executed to try out this release of base.
+
+Instructions for building and executing the EPICS example application
+can be found in the section "Example Application" of Chapter 2,
+"Getting Started", in the "EPICS Application Developer's Guide". 
+The "Example IOC Application" section briefly explains how to
+create and build an example application in a user created &lt;top>
+directory. It also explains how to run the example application on a
+vxWorks ioc or as a process on the host system. By running the example
+application as a host-based IOC, you will be able to quickly implement
+a complete EPICS system and be able to run channel access clients on
+the host system.
+
+A perl script, makeBaseExt.pl, is included in the distribution file.
+This script will create a sample extension that can be built and
+executed. The makeBaseApp.pl and makeBaseExt.pl scripts are installed
+into the install location `bin/<hostarch>` directory during the base
+build.
+
+### <span id="0_0_14">Multiple host platforms</span>
+
+You can build using a single EPICS directory structure on multiple
+host systems and for multiple cross target systems. The intermediate
+and binary files generated by the build will be created in separate
+subdirectories and installed into the appropriate separate host/target
+install directories. EPICS executables and perl scripts are installed
+into the `$(INSTALL_LOCATION)/bin/<arch>` directories. Libraries are
+installed into $`(INSTALL_LOCATION)/lib/<arch>`. The default
+definition for `$(INSTALL_LOCATION)` is `$(TOP)` which is the root
+directory in the distribution directory structure, base. Created
+object files are stored in `O.<arch>` source subdirectories, This
+allows objects for multiple cross target architectures to be
+maintained at the same time. To build EPICS base for a specific
+host/target combination you must have the proper host/target C/C++
+cross compiler and target header files and the base/configure/os
+directory must have the appropriate configure files.

documentation/RecordReference.md

@@ -0,0 +1,71 @@
+# Record Reference Documentation  {#recordrefmanual}
+
+The documentation below for the record types and menus included with Base was
+converted from the old EPICS Wiki pages and updated. This list only includes the
+record types supplied with Base. The first two links below are to an external
+website where these original reference chapters are now being published.
+
+* [Introduction to EPICS](https://docs.epics-controls.org/en/latest/guides/EPICS_Intro.html)
+* [Process Database Concepts](https://docs.epics-controls.org/en/latest/guides/EPICS_Process_Database_Concepts.html)
+* [Fields Common to All Record Types](dbCommonRecord.html)
+* [Fields Common to Input Record Types](dbCommonInput.html)
+* [Fields Common to Output Record Types](dbCommonOutput.html)
+
+## Record Types
+
+* [Analog Array Input Record (aai)](aaiRecord.html)
+* [Analog Array Output Record (aao)](aaoRecord.html)
+* [Analog Input Record (ai)](aiRecord.html)
+* [Analog Output Record (ao)](aoRecord.html)
+* [Array Subroutine Record (aSub)](aSubRecord.html)
+* [Binary Input Record (bi)](biRecord.html)
+* [Binary Output Record (bo)](boRecord.html)
+* [Calculation Output Record (calcout)](calcoutRecord.html)
+* [Calculation Record (calc)](calcRecord.html)
+* [Compression Record (compress)](compressRecord.html)
+* [Data Fanout Record (dfanout)](dfanoutRecord.html)
+* [Event Record (event)](eventRecord.html)
+* [Fanout Record (fanout)](fanoutRecord.html)
+* [Histogram Record (histogram)](histogramRecord.html)
+* [64bit Integer Input Record (int64in)](int64inRecord.html)
+* [64bit Integer Output Record (int64out)](int64outRecord.html)
+* [Long Input Record (longin)](longinRecord.html)
+* [Long Output Record (longout)](longoutRecord.html)
+* [Long String Input Record (lsi)](lsiRecord.html)
+* [Long String Output Record (lso)](lsoRecord.html)
+* [Multi-Bit Binary Input Direct Record (mbbiDirect)](mbbiDirectRecord.html)
+* [Multi-Bit Binary Input Record (mbbi)](mbbiRecord.html)
+* [Multi-Bit Binary Output Direct Record (mbboDirect)](mbboDirectRecord.html)
+* [Multi-Bit Binary Output Record (mbbo)](mbboRecord.html)
+* [Permissive Record (permissive)](permissiveRecord.html)
+* [Printf Record (printf)](printfRecord.html)
+* [Select Record (sel)](selRecord.html)
+* [Sequence Record (seq)](seqRecord.html)
+* [State Record (state)](stateRecord.html)
+* [String Input Record (stringin)](stringinRecord.html)
+* [String Output Record (stringout)](stringoutRecord.html)
+* [Sub-Array Record (subArray)](subArrayRecord.html)
+* [Subroutine Record (sub)](subRecord.html)
+* [Waveform Record (waveform)](waveformRecord.html)
+
+## Menu Definitions
+
+* [Alarm Severity Menu](menuAlarmSevr.html)
+* [Alarm Status Menu](menuAlarmStat.html)
+* [Analog Conversions Menu](menuConvert.html)
+* [Field Type Menu](menuFtype.html)
+* [Invalid Value Output Action Menu](menuIvoa.html)
+* [Output Mode Select Menu](menuOmsl.html)
+* [Scan Menu](menuScan.html)
+* [Simulation Mode Menu](menuSimm.html)
+* [Yes/No Menu](menuYesNo.html)
+
+## Corrections and Updates
+
+Corrections to these documents can be submitted as patch files to the EPICS core
+developers, or as merge requests or pull requests to the 7.0 branch of Base.
+The document sources can be found in the `modules/database/src/std/rec` and
+`modules/database/src/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 `perldoc
+pod` for details of POD.

documentation/ReleaseChecklist.html

@@ -126,9 +126,10 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Website Manager</td>
-      <td>Create a release milestone on Launchpad if necessary and set the
-        expected release date. Note that pre-release and release-candidate
-        versions do not appear on Launchpad, only the final release.</td>
+      <td>Create a release milestone on Launchpad. If a target release date is
+        known set "Date Targeted" to the expected release date. Note that
+        pre-release and release-candidate versions should not get Launchpad
+        milestones, only the final release.</td>
       </tr>
     <tr>
       <th colspan="3">Creating pre-release and release-candidate versions</th>
@@ -146,17 +147,17 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
       <td>Tag the module in Git, using these tag conventions:
         <ul>
           <li>
-            <tt>R7.0.2-pre<i>n</i></tt>
+            <tt>R7.0.4.1-pre<i>n</i></tt>
             &mdash; pre-release tag
             </li>
           <li>
-            <tt>R7.0.2-rc<i>n</i></tt>
+            <tt>R7.0.4.1-rc<i>n</i></tt>
             &mdash; release candidate tag
             </li>
           </ul>
         <blockquote><tt>
           cd base-7.0<br />
-          git tag -m 'ANJ: Tagged for 7.0.2-rc1' R7.0.2-rc1
+          git tag -m 'ANJ: Tagged for 7.0.4.1-rc1' R7.0.4.1-rc1
           </tt></blockquote>
         Note that submodules must <em>not</em> be tagged with the version used
         for the top-level, they each have their own separate version numbers
@@ -170,11 +171,11 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
         files and directories that are only used for continuous integration:
         <blockquote><tt>
           cd base-7.0<br />
-          ./.tools/make-tar.sh R7.0.2-rc1 base-7.0.2-rc1.tar.gz base-7.0.2-rc1/
+          ./.tools/make-tar.sh R7.0.4.1-rc1 base-7.0.4.1-rc1.tar.gz base-7.0.4.1-rc1/
           </tt></blockquote>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
-          gpg --armor --sign --detach-sig base-7.0.2-rc1.tar.gz
+          gpg --armor --sign --detach-sig base-7.0.4.1-rc1.tar.gz
           </tt></blockquote>
         </td>
       </tr>
@@ -276,25 +277,77 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
       <td><input type="checkbox"></td>
       <td>Release Manager</td>
       <td>
-        <p>For each external submodule, check if the module's release version
-          number (and SHRLIB_VERSION setting) has been updated if appropriate,
-          and that its Release Notes have been updated to cover any changes.
-          Commit any fixes and tag the module if that hasn't already been
-          done.</p>
-        <p>Update all external submodules on the Base-7.0 branch and
-          commit.</p></td>
+        <p>For each external submodule in turn (assuming it has not been tagged
+          yet):</p>
+        <ol>
+          <li>Check that the module's Release Notes have been updated to cover
+            all changes; add items as necessary, and set the module version
+            number and release date if appropriate. Convert to HTML and view in
+            a browser to check the formatting:
+            <blockquote><tt>
+              cd base-7.0/modules/&lt;module&gt;/documentation<br />
+              pandoc -f gfm -t html -o RELEASE_NOTES.html RELEASE_NOTES.md
+              </tt></blockquote>
+            Commit changes (don't push yet).</li>
+
+          <li>Edit the module's release version file
+            <tt>configure/CONFIG_<i>module</i>_VERSION</tt> and its top-level
+            <tt>Doxyfile</tt>; set the <tt>DEVELOPMENT_FLAG</tt> value to 0 and
+            remove <tt>-dev</tt> from the <tt>PROJECT_NUMBER</tt> string.
+            Commit changes (don't push).</li>
+
+          <li>Tag the module:
+            <blockquote><tt>
+              git tag -m 'ANJ: Tag for EPICS 7.0.4.1' &lt;module-version&gt;
+              </tt></blockquote>
+            </li>
+
+          <li>Update the git submodule on the Base-7.0 branch to the
+            newly-tagged version, but don't commit yet:
+            <blockquote><tt>
+              cd base-7.0/modules<br />
+              git add &lt;module&gt;<br />
+              git submodule status --cached
+              </tt></blockquote>
+            </li>
+
+          <li>Edit the module's release version file
+            <tt>configure/CONFIG_<i>module</i>_VERSION</tt> and its top-level
+            <tt>Doxyfile</tt>; increment the <tt>MAINTENANCE_VERSION</tt>, set
+            the <tt>DEVELOPMENT_FLAG</tt> value to 1, and update the
+            <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:
+            <blockquote><tt>
+              cd base-7.0/modules/&lt;module&gt;<br />
+              git push --follow-tags upstream master
+              </tt></blockquote>
+            </li>
+
+          </ol>
+        <p>Commit all the submodule updates to the 7.0 branch.</p>
+        </td>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
       <td>Release Manager</td>
-      <td>Edit and commit changes to the EPICS Base version number file and
-        the embedded module version files:
+
+      <td>Edit the main EPICS Base version file and the built-in module version
+        files:
         <ul>
-          <li>configure/CONFIG_BASE_VERSION </li>
-          <li>modules/libcom/configure/CONFIG_LIBCOM_VERSION</li>
-          <li>modules/ca/configure/CONFIG_CA_VERSION</li>
-          <li>modules/database/configure/CONFIG_DATABASE_VERSION</li>
-          </ul></td>
+          <li><tt>configure/CONFIG_BASE_VERSION</tt></li>
+          <li><tt>configure/CONFIG_LIBCOM_VERSION</tt></li>
+          <li><tt>configure/CONFIG_CA_VERSION</tt></li>
+          <li><tt>configure/CONFIG_DATABASE_VERSION</tt></li>
+          </ul>
+        <p>Version numbers should be set according to the level of changes made
+          since the last release. Note that the <tt>MAINTENANCE_VERSION</tt> or
+          <tt>PATCH_LEVEL</tt> value should have been incremented after the
+          previous release tag was applied. Set all <tt>DEVELOPMENT_FLAG</tt>
+          values to 0 and <tt>EPICS_DEV_SNAPSHOT</tt> to the empty string.</p>
+        <p>Commit these changes (don't push).</p>
+        </td>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
@@ -302,9 +355,29 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
       <td>Tag the epics-base module in Git:
         <blockquote><tt>
           cd base-7.0<br />
-          git tag -m 'ANJ: Tagged for 7.0.2.2' R7.0.2.2</i>
+          git tag -m 'ANJ: Tagged for release' R7.0.4.1
           </tt></blockquote>
-        Don't push the new tag to the Launchpad repository yet.</td>
+        <p>Don't push these commits or the new tag to the Launchpad repository
+          yet.</p>
+        </td>
+      </tr>
+    <tr>
+      <td><input type="checkbox"></td>
+      <td>Release Manager</td>
+      <td>Edit the main EPICS Base version file and the built-in module version
+        files:
+        <ul>
+          <li><tt>configure/CONFIG_BASE_VERSION</tt></li>
+          <li><tt>configure/CONFIG_LIBCOM_VERSION</tt></li>
+          <li><tt>configure/CONFIG_CA_VERSION</tt></li>
+          <li><tt>configure/CONFIG_DATABASE_VERSION</tt></li>
+          </ul>
+        <p>Version numbers should be set for the next expected patch/maintenance
+          release by incrementing the MAINTENANCE_VERSION or PATCH_LEVEL value
+          in each file. Set all <tt>DEVELOPMENT_FLAG</tt> values to 1 and
+          <tt>EPICS_DEV_SNAPSHOT</tt> to "-DEV".</p>
+        <p>Commit these changes (don't push).</p>
+        </td>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
@@ -314,11 +387,12 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
         files and directories that are only used for continuous integration:
         <blockquote><tt>
           cd base-7.0<br />
-          ./.tools/make-tar.sh R7.0.2.2 base-7.0.2.2.tar.gz base-7.0.2.2/
+          ./.tools/make-tar.sh R7.0.4.1 ../base-7.0.4.1.tar.gz base-7.0.4.1/
           </tt></blockquote>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
-          gpg --armor --sign --detach-sig base-7.0.2.2.tar.gz
+          cd ..<br />
+          gpg --armor --sign --detach-sig base-7.0.4.1.tar.gz
           </tt></blockquote>
         </td>
       </tr>
@@ -326,49 +400,22 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
       <td><input type="checkbox"></td>
       <td>Release Manager</td>
       <td>Test the tar file by extracting its contents and building it on at
-        least one supported platform. When this succeeds the new git tag can be
-        pushed to the Launchpad repository:
+        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>
         </td>
       </tr>
     <tr>
-      <td><input type="checkbox"></td>
-      <td>Release Manager</td>
-      <td>Edit and commit changes to the EPICS Base version number file and
-        the embedded module version files:
-        <ul>
-          <li>configure/CONFIG_BASE_VERSION </li>
-          <li>modules/libcom/configure/CONFIG_LIBCOM_VERSION</li>
-          <li>modules/ca/configure/CONFIG_CA_VERSION</li>
-          <li>modules/database/configure/CONFIG_DATABASE_VERSION</li>
-        </ul>
-        Version numbers should be set to the next expected patch release,
-        with a "-DEV" tag added (where applicable).
-      </td>
-    </tr>
+      <th colspan="3">Publish to epics.anl.gov</th>
+      </tr>
     <tr>
       <td><input type="checkbox"></td>
       <td>Release Manager</td>
       <td>Copy the tarfile and its signature to the Base download area of the
         website.</td>
       </tr>
-    <tr>
-      <td><input type="checkbox"></td>
-      <td>Release Manager</td>
-      <td>Find all Launchpad bug reports with the status Fix Committed which
-        have been fixed in this release and mark them Fix Released.</td>
-      </tr>
-    <tr>
-      <th colspan="3">Publish and Announce it</th>
-      </tr>
-    <tr>
-      <td><input type="checkbox"></td>
-      <td>Website Manager</td>
-      <td>Upload the tar file and its <tt>.asc</tt> signature file to the
-        Launchpad milestone for this release version.</td>
-      </tr>
     <tr>
       <td><input type="checkbox"></td>
       <td>Website Manager</td>
@@ -400,6 +447,54 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
       <td>Add an entry to the website News page, linking to the new version
         webpage.</td>
       </tr>
+
+    <tr>
+      <th colspan="3">Publish to epics-controls</th>
+      </tr>
+    <tr>
+      <td><input type="checkbox"></td>
+      <td>Website Manager</td>
+      <td>Upload the tar file and its <tt>.asc</tt> signature file to the
+        epics-controls web-server.
+        <blockquote><tt>
+          scp base-7.0.4.1.tar.gz base-7.0.4.1.tar.gz.asc epics-controls:download/base<br />
+          </tt></blockquote>
+        </td>
+      </tr>
+    <tr>
+      <td><input type="checkbox"></td>
+      <td>Website Manager</td>
+      <td>Follow instructions on
+        <a href="https://epics-controls.org/resources-and-support/documents/epics-website-documentation/adding-a-page-for-a-new-release/">
+        Add a page for a new release</a> to create a new release webpage (not
+        required for a patch release, just edit the existing page). Update the
+        TablePress "Point Releases" table and add the new download, and adjust
+        the XYZ Html Snippet for the series download.
+        </td>
+      </tr>
+
+    <tr>
+      <th colspan="3">Publish to Launchpad</th>
+      </tr>
+    <tr>
+      <td><input type="checkbox"></td>
+      <td>Website Manager</td>
+      <td>Go to the Launchpad milestone for this release. Click the Create
+        release button and add the release date. Put a URL for the release page
+        in the Release notes box, and click the Create release button. Upload
+        the tar file and its <tt>.asc</tt> signature file to the new Launchpad
+        release page.</td>
+      </tr>
+    <tr>
+      <td><input type="checkbox"></td>
+      <td>Release Manager</td>
+      <td>Find all Launchpad bug reports with the status Fix Committed which
+        have been fixed in this release and mark them Fix Released.</td>
+      </tr>
+
+    <tr>
+      <th colspan="3">Make Announcement</th>
+      </tr>
     <tr>
       <td><input type="checkbox"></td>
       <td>Release Manager</td>

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"

documentation/mainpage.dox

@@ -0,0 +1,16 @@
+/**
+@mainpage EPICS Base
+
+Documentation index
+
+@ul
+@li @ref releasenotes
+@li @ref install
+@li @ref recordrefmanual
+@li <a href="CAref.html">Channel Access Reference Manual</a>
+@li <a href="filters.html">Server Side Filters Reference</a>
+@li <a href="msi.html">msi: Macro Substitution and Include Tool</a>
+@li <a href="links.html">JSON Link Types</a>
+@li <a href="CA.html">Perl 5 Interface to Channel Access</a>
+
+*/

modules/Makefile

@@ -7,15 +7,15 @@ TOP = ..
 include $(TOP)/configure/CONFIG
 include CONFIG_SITE.local
 
-# Submodules for bundle build
-SUBMODULES += libcom
+DIRS += libcom
 
-SUBMODULES += ca
+DIRS += ca
 ca_DEPEND_DIRS = libcom
 
-SUBMODULES += database
+DIRS += database
 database_DEPEND_DIRS = ca
 
+# Submodules for bundle build
 SUBMODULES += pvData
 pvData_DEPEND_DIRS = libcom
 

modules/ca/.ci/travis-build.sh

@@ -1,21 +0,0 @@
-#!/bin/sh
-set -e -x
-
-# set RTEMS to eg. "4.9" or "4.10"
-# requires qemu, bison, flex, texinfo, install-info
-if [ -n "$RTEMS" ]
-then
-  # find local qemu-system-i386
-  export PATH="$HOME/.cache/qemu/usr/bin:$PATH"
-  echo -n "Using QEMU: "
-  type qemu-system-i386 || echo "Missing qemu"
-  EXTRA=RTEMS_QEMU_FIXUPS=YES
-fi
-
-make -j2 $EXTRA
-
-if [ "$TEST" != "NO" ]
-then
-  make -j2 tapfiles
-  make -s test-results
-fi

modules/ca/.ci/travis-prepare.sh

@@ -1,132 +0,0 @@
-#!/bin/sh
-set -e -x
-
-CURDIR="$PWD"
-
-QDIR="$HOME/.cache/qemu"
-
-if [ -n "$RTEMS" -a "$TEST" = "YES" ]
-then
-  git clone --quiet --branch vme --depth 10 https://github.com/mdavidsaver/qemu.git "$HOME/.build/qemu"
-  cd "$HOME/.build/qemu"
-
-  HEAD=`git log -n1 --pretty=format:%H`
-  echo "HEAD revision $HEAD"
-
-  [ -e "$HOME/.cache/qemu/built" ] && BUILT=`cat "$HOME/.cache/qemu/built"`
-  echo "Cached revision $BUILT"
-
-  if [ "$HEAD" != "$BUILT" ]
-  then
-    echo "Building QEMU"
-    git submodule --quiet update --init
-
-    install -d "$HOME/.build/qemu/build"
-    cd         "$HOME/.build/qemu/build"
-
-    "$HOME/.build/qemu/configure" --prefix="$HOME/.cache/qemu/usr" --target-list=i386-softmmu --disable-werror
-    make -j2
-    make install
-
-    echo "$HEAD" > "$HOME/.cache/qemu/built"
-  fi
-fi
-
-cd "$CURDIR"
-
-cat << EOF > configure/RELEASE.local
-EPICS_BASE=$HOME/.source/epics-base
-EOF
-
-install -d "$HOME/.source"
-cd "$HOME/.source"
-
-add_base_module() {
-  MODULE=$1
-  BRANCH=$2
-  ( cd epics-base/modules && \
-  git clone --quiet --depth 5 --branch "$MODULE"/"$BRANCH" https://github.com/${REPOBASE:-epics-base}/epics-base.git "$MODULE" && \
-  cd "$MODULE" && git log -n1 )
-}
-
-git clone --quiet --depth 5 --branch core/"${BRCORE:-master}" https://github.com/${REPOBASE:-epics-base}/epics-base.git epics-base
-( cd epics-base && git log -n1 )
-add_base_module libcom "${BRLIBCOM:-master}"
-
-EPICS_HOST_ARCH=`sh epics-base/startup/EpicsHostArch`
-
-# requires wine and g++-mingw-w64-i686
-if [ "$WINE" = "32" ]
-then
-  echo "Cross mingw32"
-  sed -i -e '/CMPLR_PREFIX/d' epics-base/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
-  cat << EOF >> epics-base/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
-CMPLR_PREFIX=i686-w64-mingw32-
-EOF
-  cat << EOF >> epics-base/configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS+=win32-x86-mingw
-EOF
-fi
-
-if [ "$STATIC" = "YES" ]
-then
-  echo "Build static libraries/executables"
-  cat << EOF >> epics-base/configure/CONFIG_SITE
-SHARED_LIBRARIES=NO
-STATIC_BUILD=YES
-EOF
-fi
-
-case "$CMPLR" in
-clang)
-  echo "Host compiler is clang"
-  cat << EOF >> epics-base/configure/os/CONFIG_SITE.Common.$EPICS_HOST_ARCH
-GNU         = NO
-CMPLR_CLASS = clang
-CC          = clang
-CCC         = clang++
-EOF
-
-  # hack
-  sed -i -e 's/CMPLR_CLASS = gcc/CMPLR_CLASS = clang/' epics-base/configure/CONFIG.gnuCommon
-
-  clang --version
-  ;;
-*)
-  echo "Host compiler is default"
-  gcc --version
-  ;;
-esac
-
-cat <<EOF >> epics-base/configure/CONFIG_SITE
-USR_CPPFLAGS += $USR_CPPFLAGS
-USR_CFLAGS += $USR_CFLAGS
-USR_CXXFLAGS += $USR_CXXFLAGS
-EOF
-
-# set RTEMS to eg. "4.9" or "4.10"
-# requires qemu, bison, flex, texinfo, install-info
-if [ -n "$RTEMS" ]
-then
-  echo "Cross RTEMS${RTEMS} for pc386"
-  install -d /home/travis/.cache
-  curl -L "https://github.com/mdavidsaver/rsb/releases/download/travis-20160306-2/rtems${RTEMS}-i386-trusty-20190306-2.tar.gz" \
-  | tar -C /home/travis/.cache -xj
-
-  sed -i -e '/^RTEMS_VERSION/d' -e '/^RTEMS_BASE/d' epics-base/configure/os/CONFIG_SITE.Common.RTEMS
-  cat << EOF >> epics-base/configure/os/CONFIG_SITE.Common.RTEMS
-RTEMS_VERSION=$RTEMS
-RTEMS_BASE=/home/travis/.cache/rtems${RTEMS}-i386
-EOF
-  cat << EOF >> epics-base/configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS+=RTEMS-pc386
-EOF
-
-  # find local qemu-system-i386
-  export PATH="$HOME/.cache/qemu/usr/bin:$PATH"
-  echo -n "Using QEMU: "
-  type qemu-system-i386 || echo "Missing qemu"
-  EXTRA=RTEMS_QEMU_FIXUPS=YES
-fi
-
-make -j2 -C epics-base $EXTRA

modules/ca/.travis.yml

@@ -1,26 +0,0 @@
-sudo: false
-dist: trusty
-language: c
-compiler:
-  - gcc
-addons:
-  apt:
-    packages:
-    - libreadline6-dev
-    - libncurses5-dev
-    - perl
-    - clang
-    - g++-mingw-w64-i686
-install:
- - ./.ci/travis-prepare.sh
-script:
- - ./.ci/travis-build.sh
-env:
- - BRCORE=master BRLIBCOM=master TEST=NO
- - CMPLR=clang TEST=NO
- - USR_CXXFLAGS=-std=c++11 TEST=NO
- - CMPLR=clang USR_CXXFLAGS=-std=c++11 TEST=NO
- - WINE=32 TEST=NO STATIC=YES
- - WINE=32 TEST=NO STATIC=NO
- - RTEMS=4.10 TEST=NO
- - RTEMS=4.9 TEST=NO

modules/ca/Makefile

@@ -7,11 +7,9 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-TOP = .
+TOP = ../..
 include $(TOP)/configure/CONFIG
 
-DIRS += configure src
+DIRS += src
 
-src_DEPEND_DIRS = configure
-
-include $(TOP)/configure/RULES_TOP
+include $(TOP)/configure/RULES_DIRS

modules/ca/configure/CONFIG

@@ -1,28 +0,0 @@
-# CONFIG - Load build configuration data
-#
-# Do not make changes to this file!
-
-# Allow user to override where the build rules come from
-RULES = $(EPICS_BASE)
-
-# RELEASE files point to other application tops
-include $(TOP)/configure/RELEASE
--include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).Common
-ifdef T_A
--include $(TOP)/configure/RELEASE.Common.$(T_A)
--include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
-endif
-
-CONFIG = $(RULES)/configure
-include $(CONFIG)/CONFIG
-
-# Override the Base definition:
-INSTALL_LOCATION = $(TOP)
-
-# CONFIG_SITE files contain other build configuration settings
-include $(TOP)/configure/CONFIG_SITE
--include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
-ifdef T_A
- -include $(TOP)/configure/CONFIG_SITE.Common.$(T_A)
- -include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
-endif

modules/ca/configure/CONFIG_CA_VERSION

@@ -1,4 +0,0 @@
-EPICS_CA_MAJOR_VERSION = 4
-EPICS_CA_MINOR_VERSION = 13
-EPICS_CA_MAINTENANCE_VERSION = 3
-EPICS_CA_DEVELOPMENT_FLAG = 0

modules/ca/configure/CONFIG_SITE

@@ -1,42 +0,0 @@
-# CONFIG_SITE
-
-# Make any application-specific changes to the EPICS build
-#   configuration variables in this file.
-#
-# Host/target specific settings can be specified in files named
-#   CONFIG_SITE.$(EPICS_HOST_ARCH).Common
-#   CONFIG_SITE.Common.$(T_A)
-#   CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
-
-# CHECK_RELEASE controls the consistency checking of the support
-#   applications pointed to by the RELEASE* files.
-# Normally CHECK_RELEASE should be set to YES.
-# Set CHECK_RELEASE to NO to disable checking completely.
-# Set CHECK_RELEASE to WARN to perform consistency checking but
-#   continue building even if conflicts are found.
-CHECK_RELEASE = YES
-
-# Set this when you only want to compile this application
-#   for a subset of the cross-compiled target architectures
-#   that Base is built for.
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-ppc32
-
-# To install files into a location other than $(TOP) define
-#   INSTALL_LOCATION here.
-#INSTALL_LOCATION=</absolute/path/to/install/top>
-
-# Set this when the IOC and build host use different paths
-#   to the install location. This may be needed to boot from
-#   a Microsoft FTP server say, or on some NFS configurations.
-#IOCS_APPL_TOP = </IOC's/absolute/path/to/install/top>
-
-# For application debugging purposes, override the HOST_OPT and/
-#   or CROSS_OPT settings from base/configure/CONFIG_SITE
-#HOST_OPT = NO
-#CROSS_OPT = NO
-
-# These allow developers to override the CONFIG_SITE variable
-# settings without having to modify the configure/CONFIG_SITE
-# file itself.
--include $(TOP)/../CONFIG_SITE.local
--include $(TOP)/configure/CONFIG_SITE.local

modules/ca/configure/Makefile

@@ -1,15 +0,0 @@
-#*************************************************************************
-# EPICS BASE is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution.
-#*************************************************************************
-TOP = ..
-
-include $(TOP)/configure/CONFIG
-
-TARGETS = $(CONFIG_TARGETS)
-CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS)))
-
-CFG += CONFIG_CA_MODULE
-CFG += CONFIG_CA_VERSION
-
-include $(TOP)/configure/RULES

modules/ca/configure/RELEASE

@@ -1,39 +0,0 @@
-# RELEASE - Location of external support modules
-#
-# IF YOU CHANGE ANY PATHS in this file or make API changes to
-# any modules it refers to, you should do a "make rebuild" in
-# this application's top level directory.
-#
-# The EPICS build process does not check dependencies against
-# any files from outside the application, so it is safest to
-# rebuild it completely if any modules it depends on change.
-#
-# Host- or target-specific settings can be given in files named
-#  RELEASE.$(EPICS_HOST_ARCH).Common
-#  RELEASE.Common.$(T_A)
-#  RELEASE.$(EPICS_HOST_ARCH).$(T_A)
-#
-# This file is parsed by both GNUmake and an EPICS Perl script,
-# so it may ONLY contain definititions of paths to other support
-# modules, variable definitions that are used in module paths,
-# and include statements that pull in other RELEASE files.
-# Variables may be used before their values have been set.
-# Build variables that are NOT used in paths should be set in
-# the CONFIG_SITE file.
-
-# Variables and paths to dependent modules:
-#MODULES = /path/to/modules
-#MYMODULE = $(MODULES)/my-module
-
-# If building the EPICS modules individually, set these:
-#EPICS_LIBCOM = $(MODULES)/libcom-3.17.0
-#EPICS_BASE = $(MODULES)/core-7.0.1
-
-# Set RULES here if you want to use build rules from elsewhere:
-#RULES = $(MODULES)/build-rules
-
-# These lines allow developers to override these RELEASE settings
-# without having to modify this file directly.
--include $(TOP)/../RELEASE.local
--include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local
--include $(TOP)/configure/RELEASE.local

modules/ca/configure/RULES

@@ -1,6 +0,0 @@
-# RULES
-
-include $(CONFIG)/RULES
-
-# Library should be rebuilt because LIBOBJS may have changed.
-$(LIBNAME): ../Makefile

modules/ca/configure/RULES_DIRS

@@ -1,2 +0,0 @@
-#RULES_DIRS
-include $(CONFIG)/RULES_DIRS

modules/ca/configure/RULES_TOP

@@ -1,2 +0,0 @@
-#RULES_TOP
-include $(CONFIG)/RULES_TOP

modules/ca/src/Makefile

@@ -7,7 +7,7 @@
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
 
-TOP = ..
+TOP = ../../..
 include $(TOP)/configure/CONFIG
 
 # Channel Access Client

modules/ca/src/client/CASG.cpp

@@ -3,6 +3,7 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
+* SPDX-License-Identifier: EPICS
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
@@ -18,7 +19,6 @@
 
 #include "errlog.h"
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "syncGroup.h"
 #include "oldAccess.h"
@@ -209,23 +209,23 @@ bool CASG::ioComplete (
     return this->ioPendingList.count () == 0u;
 }
 
-void CASG::put ( epicsGuard < epicsMutex > & guard, chid pChan, 
+void CASG::put ( epicsGuard < epicsMutex > & guard, chid pChan,
     unsigned type, arrayElementCount count, const void * pValue )
 {
     guard.assertIdenticalMutex ( this->client.mutexRef() );
     sgAutoPtr < syncGroupWriteNotify > pNotify ( guard, *this );
-    pNotify = syncGroupWriteNotify::factory ( 
+    pNotify = syncGroupWriteNotify::factory (
         this->freeListWriteOP, *this, & CASG :: recycleWriteNotifyIO, pChan );
     pNotify->begin ( guard, type, count, pValue );
     pNotify.release ();
 }
 
-void CASG::get ( epicsGuard < epicsMutex > & guard, chid pChan, 
+void CASG::get ( epicsGuard < epicsMutex > & guard, chid pChan,
                 unsigned type, arrayElementCount count, void *pValue )
 {
     guard.assertIdenticalMutex ( this->client.mutexRef() );
     sgAutoPtr < syncGroupReadNotify > pNotify ( guard, *this );
-    pNotify = syncGroupReadNotify::factory ( 
+    pNotify = syncGroupReadNotify::factory (
         this->freeListReadOP, *this, & CASG :: recycleReadNotifyIO, pChan, pValue );
     pNotify->begin ( guard, type, count );
     pNotify.release ();
@@ -242,14 +242,14 @@ void CASG::completionNotify (
     }
 }
 
-void CASG :: recycleReadNotifyIO ( epicsGuard < epicsMutex > & guard, 
+void CASG :: recycleReadNotifyIO ( epicsGuard < epicsMutex > & guard,
                             syncGroupReadNotify & io )
 {
     guard.assertIdenticalMutex ( this->client.mutexRef() );
     this->freeListReadOP.release ( & io );
 }
 
-void CASG :: recycleWriteNotifyIO ( epicsGuard < epicsMutex > & guard, 
+void CASG :: recycleWriteNotifyIO ( epicsGuard < epicsMutex > & guard,
                             syncGroupWriteNotify & io )
 {
     guard.assertIdenticalMutex ( this->client.mutexRef() );

modules/ca/src/client/CAref.html

@@ -3143,7 +3143,8 @@ indicating the current state of the channel.</p>
 <dl>
   <dt><code>COUNT</code></dt>
     <dd>The element count to be read from the specified channel. A count of
-      zero means use the current element count from the server.</dd>
+      zero means use the current element count from the server, effectively
+      resulting in a variable size array subscription.</dd>
 </dl>
 <dl>
   <dt><code>CHID</code></dt>

modules/ca/src/client/Makefile

@@ -6,8 +6,8 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
-
-TOP = ../..
+CURDIR := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
+TOP = ../../../..
 
 include $(TOP)/configure/CONFIG
 
@@ -26,7 +26,13 @@ INC += cacIO.h
 INC += caDiagnostics.h
 INC += net_convert.h
 INC += caVersion.h
-INC += caVersionNum.h
+
+EXPAND_COMMON += caVersion.h@
+
+EXPAND_ME += EPICS_CA_MAJOR_VERSION
+EXPAND_ME += EPICS_CA_MINOR_VERSION
+EXPAND_ME += EPICS_CA_MAINTENANCE_VERSION
+EXPAND_ME += EPICS_CA_DEVELOPMENT_FLAG
 
 LIBSRCS += cac.cpp
 LIBSRCS += cacChannel.cpp
@@ -73,6 +79,9 @@ LIBSRCS += comBuf.cpp
 LIBSRCS += hostNameCache.cpp
 LIBSRCS += msgForMultiplyDefinedPV.cpp
 
+API_HEADER = libCaAPI.h
+ca_API = libCa
+
 LIBRARY=ca
 
 ca_RCS = ca.rc
@@ -109,7 +118,7 @@ EXPAND += S99caRepeater@
 EXPAND += caRepeater.service@
 EXPAND_VARS = INSTALL_BIN=$(abspath $(INSTALL_BIN))
 
-SRC_DIRS += $(TOP)/src/client/test
+SRC_DIRS += $(CURDIR)/test
 PROD_HOST += ca_test
 ca_test_SRCS = ca_test_main.c ca_test.c
 ca_test_LIBS  = ca Com
@@ -117,20 +126,7 @@ ca_test_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
 
 OBJS_vxWorks += ca_test
 
-EXPANDVARS += EPICS_CA_MAJOR_VERSION
-EXPANDVARS += EPICS_CA_MINOR_VERSION
-EXPANDVARS += EPICS_CA_MAINTENANCE_VERSION
-EXPANDVARS += EPICS_CA_DEVELOPMENT_FLAG
-
-EXPANDFLAGS += $(foreach var,$(EXPANDVARS),-D$(var)="$(strip $($(var)))")
-
 # shared library ABI version.
 SHRLIB_VERSION = $(EPICS_CA_MAJOR_VERSION).$(EPICS_CA_MINOR_VERSION).$(EPICS_CA_MAINTENANCE_VERSION)
 
 include $(TOP)/configure/RULES
-
-
-# Can't use EXPAND as generated headers must appear
-# in O.Common, but EXPAND emits rules for O.$(T_A)
-../O.Common/caVersionNum.h: ../caVersionNum.h@
-	$(EXPAND_TOOL) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@

modules/ca/src/client/SearchDest.h

@@ -3,13 +3,13 @@
  *     National Laboratory.
  * Copyright (c) 2002 The Regents of the University of California, as
  *     Operator of Los Alamos National Laboratory.
- * EPICS BASE Versions 3.13.7
- * and higher are distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution. 
+ * SPDX-License-Identifier: EPICS
+ * EPICS Base is distributed subject to a Software License Agreement found
+ * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
-#ifndef SearchDest_h
-#define SearchDest_h
+#ifndef INC_SearchDest_H
+#define INC_SearchDest_H
 
 #include <osiSock.h>
 #include <epicsTime.h>
@@ -28,7 +28,7 @@ struct SearchDest :
         virtual void notify (
             const caHdr & msg, const void * pPayload,
             const osiSockAddr & addr, const epicsTime & ) = 0;
-        virtual void show ( 
+        virtual void show (
             epicsGuard < epicsMutex > &, unsigned level ) const = 0;
     };
     virtual void searchRequest ( epicsGuard < epicsMutex > &,
@@ -36,4 +36,4 @@ struct SearchDest :
     virtual void show ( epicsGuard < epicsMutex > &, unsigned level ) const = 0;
 };
 
-#endif // SearchDest_h
+#endif // ifndef INC_SearchDest_H

modules/ca/src/client/access.cpp

@@ -3,8 +3,8 @@
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
+* SPDX-License-Identifier: EPICS
+* EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
@@ -40,7 +40,6 @@
  */
 #define CAC_VERSION_GLOBAL
 
-#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "oldAccess.h"
 #include "cac.h"
@@ -165,13 +164,13 @@ int fetchClientContext ( ca_client_context **ppcac )
  *  ca_task_initialize ()
  */
 // extern "C"
-int epicsShareAPI ca_task_initialize ( void )
+int epicsStdCall ca_task_initialize ( void )
 {
     return ca_context_create ( ca_disable_preemptive_callback );
 }
 
 // extern "C"
-int epicsShareAPI ca_context_create (
+int epicsStdCall ca_context_create (
             ca_preemptive_callback_select premptiveCallbackSelect )
 {
     ca_client_context *pcac;
@@ -183,19 +182,19 @@ int epicsShareAPI ca_context_create (
         }
 
         pcac = ( ca_client_context * ) epicsThreadPrivateGet ( caClientContextId );
-	    if ( pcac ) {
+        if ( pcac ) {
             if ( premptiveCallbackSelect == ca_enable_preemptive_callback &&
                 ! pcac->preemptiveCallbakIsEnabled() ) {
                 return ECA_NOTTHREADED;
             }
-		    return ECA_NORMAL;
-	    }
+            return ECA_NORMAL;
+        }
 
         pcac = new ca_client_context (
             premptiveCallbackSelect == ca_enable_preemptive_callback );
-	    if ( ! pcac ) {
-		    return ECA_ALLOCMEM;
-	    }
+        if ( ! pcac ) {
+            return ECA_ALLOCMEM;
+        }
 
         epicsThreadPrivateSet ( caClientContextId, (void *) pcac );
     }
@@ -211,7 +210,7 @@ int epicsShareAPI ca_context_create (
 // defunct
 //
 // extern "C"
-int epicsShareAPI ca_modify_host_name ( const char * )
+int epicsStdCall ca_modify_host_name ( const char * )
 {
     return ECA_NORMAL;
 }
@@ -222,7 +221,7 @@ int epicsShareAPI ca_modify_host_name ( const char * )
 // defunct
 //
 // extern "C"
-int epicsShareAPI ca_modify_user_name ( const char * )
+int epicsStdCall ca_modify_user_name ( const char * )
 {
     return ECA_NORMAL;
 }
@@ -231,7 +230,7 @@ int epicsShareAPI ca_modify_user_name ( const char * )
 // ca_context_destroy ()
 //
 // extern "C"
-void epicsShareAPI ca_context_destroy ()
+void epicsStdCall ca_context_destroy ()
 {
     ca_client_context   *pcac;
 
@@ -250,7 +249,7 @@ void epicsShareAPI ca_context_destroy ()
  *  releases all resources alloc to a channel access client
  */
 // extern "C"
-int epicsShareAPI ca_task_exit ()
+int epicsStdCall ca_task_exit ()
 {
     ca_context_destroy ();
     return ECA_NORMAL;
@@ -263,7 +262,7 @@ int epicsShareAPI ca_task_exit ()
  *      backwards compatible entry point to ca_search_and_connect()
  */
 // extern "C"
-int epicsShareAPI ca_build_and_connect ( const char *name_str, chtype get_type,
+int epicsStdCall ca_build_and_connect ( const char *name_str, chtype get_type,
             arrayElementCount get_count, chid * chan, void *pvalue,
             caCh *conn_func, void *puser )
 {
@@ -278,7 +277,7 @@ int epicsShareAPI ca_build_and_connect ( const char *name_str, chtype get_type,
  *  ca_search_and_connect()
  */
 // extern "C"
-int epicsShareAPI ca_search_and_connect (
+int epicsStdCall ca_search_and_connect (
     const char * name_str, chid * chanptr,
     caCh * conn_func, void * puser )
 {
@@ -287,7 +286,7 @@ int epicsShareAPI ca_search_and_connect (
 }
 
 // extern "C"
-int epicsShareAPI ca_create_channel (
+int epicsStdCall ca_create_channel (
      const char * name_str, caCh * conn_func, void * puser,
      capri priority, chid * chanptr )
 {
@@ -362,7 +361,7 @@ int epicsShareAPI ca_create_channel (
  * its context
  */
 // extern "C"
-int epicsShareAPI ca_clear_channel ( chid pChan )
+int epicsStdCall ca_clear_channel ( chid pChan )
 {
     ca_client_context & cac = pChan->getClientCtx ();
     {
@@ -401,7 +400,7 @@ int epicsShareAPI ca_clear_channel ( chid pChan )
  *  Specify an event subroutine to be run for asynch exceptions
  */
 // extern "C"
-int epicsShareAPI ca_add_exception_event ( caExceptionHandler *pfunc, void *arg )
+int epicsStdCall ca_add_exception_event ( caExceptionHandler *pfunc, void *arg )
 {
     ca_client_context *pcac;
     int caStatus = fetchClientContext ( &pcac );
@@ -417,7 +416,7 @@ int epicsShareAPI ca_add_exception_event ( caExceptionHandler *pfunc, void *arg
 /*
  *  ca_add_masked_array_event
  */
-int epicsShareAPI ca_add_masked_array_event (
+int epicsStdCall ca_add_masked_array_event (
         chtype type, arrayElementCount count, chid pChan,
         caEventCallBackFunc *pCallBack, void *pCallBackArg,
         ca_real, ca_real, ca_real,
@@ -430,19 +429,19 @@ int epicsShareAPI ca_add_masked_array_event (
 /*
  *  ca_clear_event ()
  */
-int epicsShareAPI ca_clear_event ( evid pMon )
+int epicsStdCall ca_clear_event ( evid pMon )
 {
     return ca_clear_subscription ( pMon );
 }
 
 // extern "C"
-chid epicsShareAPI ca_evid_to_chid ( evid pMon )
+chid epicsStdCall ca_evid_to_chid ( evid pMon )
 {
     return & pMon->channel ();
 }
 
 // extern "C"
-int epicsShareAPI ca_pend ( ca_real timeout, int early )
+int epicsStdCall ca_pend ( ca_real timeout, int early )
 {
     if ( early ) {
         return ca_pend_io ( timeout );
@@ -456,7 +455,7 @@ int epicsShareAPI ca_pend ( ca_real timeout, int early )
  * ca_pend_event ()
  */
 // extern "C"
-int epicsShareAPI ca_pend_event ( ca_real timeout )
+int epicsStdCall ca_pend_event ( ca_real timeout )
 {
     ca_client_context *pcac;
     int status = fetchClientContext ( &pcac );
@@ -467,7 +466,7 @@ int epicsShareAPI ca_pend_event ( ca_real timeout )
     try {
         // preserve past odd ball behavior of waiting forever when
         // the delay is zero
-    	if ( timeout == 0.0 ) {
+        if ( timeout == 0.0 ) {
             while ( true ) {
                 pcac->pendEvent ( 60.0 );
             }
@@ -483,7 +482,7 @@ int epicsShareAPI ca_pend_event ( ca_real timeout )
  * ca_pend_io ()
  */
 // extern "C"
-int epicsShareAPI ca_pend_io ( ca_real timeout )
+int epicsStdCall ca_pend_io ( ca_real timeout )
 {
     ca_client_context *pcac;
     int status = fetchClientContext ( &pcac );
@@ -508,7 +507,7 @@ int epicsShareAPI ca_pend_io ( ca_real timeout )
 /*
  *  ca_flush_io ()
  */
-int epicsShareAPI ca_flush_io ()
+int epicsStdCall ca_flush_io ()
 {
     ca_client_context * pcac;
     int caStatus = fetchClientContext (&pcac);
@@ -525,7 +524,7 @@ int epicsShareAPI ca_flush_io ()
 /*
  *  CA_TEST_IO ()
  */
-int epicsShareAPI ca_test_io ()
+int epicsStdCall ca_test_io ()
 {
     ca_client_context *pcac;
     int caStatus = fetchClientContext ( &pcac );
@@ -545,7 +544,7 @@ int epicsShareAPI ca_test_io ()
  *  CA_SIGNAL()
  */
 // extern "C"
-void epicsShareAPI ca_signal ( long ca_status, const char *message )
+void epicsStdCall ca_signal ( long ca_status, const char *message )
 {
     ca_signal_with_file_and_lineno ( ca_status, message, NULL, 0 );
 }
@@ -560,7 +559,7 @@ void epicsShareAPI ca_signal ( long ca_status, const char *message )
  * (if they call this routine again).
  */
 // extern "C"
-const char * epicsShareAPI ca_message ( long ca_status )
+const char * epicsStdCall ca_message ( long ca_status )
 {
     unsigned msgNo = CA_EXTRACT_MSG_NO ( ca_status );
 
@@ -576,7 +575,7 @@ const char * epicsShareAPI ca_message ( long ca_status )
  * ca_signal_with_file_and_lineno()
  */
 // extern "C"
-void epicsShareAPI ca_signal_with_file_and_lineno ( long ca_status,
+void epicsStdCall ca_signal_with_file_and_lineno ( long ca_status,
             const char *message, const char *pfilenm, int lineno )
 {
     ca_signal_formated ( ca_status, pfilenm, lineno, message );
@@ -586,7 +585,7 @@ void epicsShareAPI ca_signal_with_file_and_lineno ( long ca_status,
  * ca_signal_formated()
  */
 // extern "C"
-void epicsShareAPI ca_signal_formated ( long ca_status, const char *pfilenm,
+void epicsStdCall ca_signal_formated ( long ca_status, const char *pfilenm,
                                        int lineno, const char *pFormat, ... )
 {
     ca_client_context *pcac;
@@ -605,7 +604,7 @@ void epicsShareAPI ca_signal_formated ( long ca_status, const char *pfilenm,
     }
     else {
         fprintf ( stderr, "CA exception in thread w/o CA ctx: status=%s file=%s line=%d: \n",
-            ca_message ( ca_status ), pfilenm, lineno );
+            ca_message ( ca_status ), pfilenm ? pfilenm : "<null>", lineno );
         if ( pFormat ) {
             vfprintf ( stderr, pFormat, theArgs );
         }
@@ -622,7 +621,7 @@ void epicsShareAPI ca_signal_formated ( long ca_status, const char *pfilenm,
  *
  */
 // extern "C"
-int epicsShareAPI ca_add_fd_registration ( CAFDHANDLER * func, void * arg )
+int epicsStdCall ca_add_fd_registration ( CAFDHANDLER * func, void * arg )
 {
     ca_client_context *pcac;
     int caStatus = fetchClientContext ( &pcac );
@@ -640,7 +639,7 @@ int epicsShareAPI ca_add_fd_registration ( CAFDHANDLER * func, void * arg )
  * function that returns the CA version string
  */
 // extern "C"
-const char * epicsShareAPI ca_version ()
+const char * epicsStdCall ca_version ()
 {
     return CA_VERSION_STRING ( CA_MINOR_PROTOCOL_REVISION );
 }
@@ -649,7 +648,7 @@ const char * epicsShareAPI ca_version ()
  * ca_replace_printf_handler ()
  */
 // extern "C"
-int epicsShareAPI ca_replace_printf_handler ( caPrintfFunc *ca_printf_func )
+int epicsStdCall ca_replace_printf_handler ( caPrintfFunc *ca_printf_func )
 {
     ca_client_context *pcac;
     int caStatus = fetchClientContext (&pcac);
@@ -669,7 +668,7 @@ int epicsShareAPI ca_replace_printf_handler ( caPrintfFunc *ca_printf_func )
  * (for testing purposes only)
  */
 // extern "C"
-unsigned epicsShareAPI ca_get_ioc_connection_count ()
+unsigned epicsStdCall ca_get_ioc_connection_count ()
 {
     ca_client_context * pcac;
     int caStatus = fetchClientContext ( & pcac );
@@ -680,7 +679,7 @@ unsigned epicsShareAPI ca_get_ioc_connection_count ()
     return pcac->circuitCount ();
 }
 
-unsigned epicsShareAPI ca_beacon_anomaly_count ()
+unsigned epicsStdCall ca_beacon_anomaly_count ()
 {
     ca_client_context * pcac;
     int caStatus = fetchClientContext ( & pcac );
@@ -692,15 +691,15 @@ unsigned epicsShareAPI ca_beacon_anomaly_count ()
 }
 
 // extern "C"
-int epicsShareAPI ca_channel_status ( epicsThreadId /* tid */ )
+int epicsStdCall ca_channel_status ( epicsThreadId /* tid */ )
 {
     ::printf ("The R3.14 EPICS OS abstraction API does not allow peeking at thread private storage of another thread.\n");
     ::printf ("Please call \"ca_client_status ( unsigned level )\" from the subsystem specific diagnostic code.\n");
-	return ECA_ANACHRONISM;
+    return ECA_ANACHRONISM;
 }
 
 // extern "C"
-int epicsShareAPI ca_client_status ( unsigned level )
+int epicsStdCall ca_client_status ( unsigned level )
 {
     ca_client_context *pcac;
     int caStatus = fetchClientContext ( &pcac );
@@ -712,7 +711,7 @@ int epicsShareAPI ca_client_status ( unsigned level )
     return ECA_NORMAL;
 }
 
-int epicsShareAPI ca_context_status ( ca_client_context * pcac, unsigned level )
+int epicsStdCall ca_context_status ( ca_client_context * pcac, unsigned level )
 {
     pcac->show ( level );
     return ECA_NORMAL;
@@ -725,7 +724,7 @@ int epicsShareAPI ca_context_status ( ca_client_context * pcac, unsigned level )
  * by another thread
  */
 // extern "C"
-struct ca_client_context * epicsShareAPI ca_current_context ()
+struct ca_client_context * epicsStdCall ca_current_context ()
 {
     struct ca_client_context *pCtx;
     if ( caClientContextId ) {
@@ -745,7 +744,7 @@ struct ca_client_context * epicsShareAPI ca_current_context ()
  * by another thread
  */
 // extern "C"
-int epicsShareAPI ca_attach_context ( struct ca_client_context * pCtx )
+int epicsStdCall ca_attach_context ( struct ca_client_context * pCtx )
 {
     ca_client_context *pcac = (ca_client_context *) epicsThreadPrivateGet ( caClientContextId );
     if ( pcac && pCtx != 0 ) {
@@ -758,14 +757,14 @@ int epicsShareAPI ca_attach_context ( struct ca_client_context * pCtx )
     return ECA_NORMAL;
 }
 
-void epicsShareAPI ca_detach_context ()
+void epicsStdCall ca_detach_context ()
 {
     if ( caClientContextId ) {
         epicsThreadPrivateSet ( caClientContextId, 0 );
     }
 }
 
-int epicsShareAPI ca_preemtive_callback_is_enabled ()
+int epicsStdCall ca_preemtive_callback_is_enabled ()
 {
     ca_client_context *pcac = (ca_client_context *) epicsThreadPrivateGet ( caClientContextId );
     if ( ! pcac ) {
@@ -776,7 +775,7 @@ int epicsShareAPI ca_preemtive_callback_is_enabled ()
 
 
 // extern "C"
-void epicsShareAPI ca_self_test ()
+void epicsStdCall ca_self_test ()
 {
     ca_client_context *pcac = (ca_client_context *) epicsThreadPrivateGet ( caClientContextId );
     if ( ! pcac ) {
@@ -785,8 +784,7 @@ void epicsShareAPI ca_self_test ()
     pcac->selfTest ();
 }
 
-// extern "C"
-epicsShareDef const int epicsTypeToDBR_XXXX [lastEpicsType+1] = {
+const int epicsTypeToDBR_XXXX [lastEpicsType+1] = {
     DBR_SHORT, /* forces conversion fronm uint8 to int16 */
     DBR_CHAR,
     DBR_SHORT,
@@ -800,265 +798,257 @@ epicsShareDef const int epicsTypeToDBR_XXXX [lastEpicsType+1] = {
     DBR_STRING
 };
 
-// extern "C"
-epicsShareDef const epicsType DBR_XXXXToEpicsType [LAST_BUFFER_TYPE+1] = {
-	epicsOldStringT,
-	epicsInt16T,
-	epicsFloat32T,
-	epicsEnum16T,
-	epicsUInt8T,
-	epicsInt32T,
-	epicsFloat64T,
+const epicsType DBR_XXXXToEpicsType [LAST_BUFFER_TYPE+1] = {
+    epicsOldStringT,
+    epicsInt16T,
+    epicsFloat32T,
+    epicsEnum16T,
+    epicsUInt8T,
+    epicsInt32T,
+    epicsFloat64T,
 
-	epicsOldStringT,
-	epicsInt16T,
-	epicsFloat32T,
-	epicsEnum16T,
-	epicsUInt8T,
-	epicsInt32T,
-	epicsFloat64T,
+    epicsOldStringT,
+    epicsInt16T,
+    epicsFloat32T,
+    epicsEnum16T,
+    epicsUInt8T,
+    epicsInt32T,
+    epicsFloat64T,
 
-	epicsOldStringT,
-	epicsInt16T,
-	epicsFloat32T,
-	epicsEnum16T,
-	epicsUInt8T,
-	epicsInt32T,
-	epicsFloat64T,
+    epicsOldStringT,
+    epicsInt16T,
+    epicsFloat32T,
+    epicsEnum16T,
+    epicsUInt8T,
+    epicsInt32T,
+    epicsFloat64T,
 
-	epicsOldStringT,
-	epicsInt16T,
-	epicsFloat32T,
-	epicsEnum16T,
-	epicsUInt8T,
-	epicsInt32T,
-	epicsFloat64T,
+    epicsOldStringT,
+    epicsInt16T,
+    epicsFloat32T,
+    epicsEnum16T,
+    epicsUInt8T,
+    epicsInt32T,
+    epicsFloat64T,
 
-	epicsOldStringT,
-	epicsInt16T,
-	epicsFloat32T,
-	epicsEnum16T,
-	epicsUInt8T,
-	epicsInt32T,
-	epicsFloat64T,
+    epicsOldStringT,
+    epicsInt16T,
+    epicsFloat32T,
+    epicsEnum16T,
+    epicsUInt8T,
+    epicsInt32T,
+    epicsFloat64T,
 
-	epicsUInt16T,
-	epicsUInt16T,
-	epicsOldStringT,
-	epicsOldStringT
+    epicsUInt16T,
+    epicsUInt16T,
+    epicsOldStringT,
+    epicsOldStringT
 };
 
-// extern "C"
-epicsShareDef const unsigned short dbr_size[LAST_BUFFER_TYPE+1] = {
-	sizeof(dbr_string_t),		/* string max size		*/
-	sizeof(dbr_short_t),		/* short			*/
-	sizeof(dbr_float_t),		/* IEEE Float			*/
-	sizeof(dbr_enum_t),		/* item number			*/
-	sizeof(dbr_char_t),		/* character			*/
+const unsigned short dbr_size[LAST_BUFFER_TYPE+1] = {
+    sizeof(dbr_string_t),           /* string max size              */
+    sizeof(dbr_short_t),            /* short                        */
+    sizeof(dbr_float_t),            /* IEEE Float                   */
+    sizeof(dbr_enum_t),             /* item number                  */
+    sizeof(dbr_char_t),             /* character                    */
 
-	sizeof(dbr_long_t),		/* long				*/
-	sizeof(dbr_double_t),		/* double			*/
-	sizeof(struct dbr_sts_string),	/* string field	with status	*/
-	sizeof(struct dbr_sts_short),	/* short field with status	*/
-	sizeof(struct dbr_sts_float),	/* float field with status	*/
+    sizeof(dbr_long_t),             /* long                         */
+    sizeof(dbr_double_t),           /* double                       */
+    sizeof(struct dbr_sts_string),  /* string field with status     */
+    sizeof(struct dbr_sts_short),   /* short field with status      */
+    sizeof(struct dbr_sts_float),   /* float field with status      */
 
-	sizeof(struct dbr_sts_enum),	/* item number with status	*/
-	sizeof(struct dbr_sts_char),	/* char field with status	*/
-	sizeof(struct dbr_sts_long),	/* long field with status	*/
-	sizeof(struct dbr_sts_double),	/* double field with time	*/
-	sizeof(struct dbr_time_string),	/* string field	with time	*/
+    sizeof(struct dbr_sts_enum),    /* item number with status      */
+    sizeof(struct dbr_sts_char),    /* char field with status       */
+    sizeof(struct dbr_sts_long),    /* long field with status       */
+    sizeof(struct dbr_sts_double),  /* double field with time       */
+    sizeof(struct dbr_time_string), /* string field with time       */
 
-	sizeof(struct dbr_time_short),	/* short field with time	*/
-	sizeof(struct dbr_time_float),	/* float field with time	*/
-	sizeof(struct dbr_time_enum),	/* item number with time	*/
-	sizeof(struct dbr_time_char),	/* char field with time		*/
-	sizeof(struct dbr_time_long),	/* long field with time		*/
+    sizeof(struct dbr_time_short),  /* short field with time        */
+    sizeof(struct dbr_time_float),  /* float field with time        */
+    sizeof(struct dbr_time_enum),   /* item number with time        */
+    sizeof(struct dbr_time_char),   /* char field with time         */
+    sizeof(struct dbr_time_long),   /* long field with time         */
 
-	sizeof(struct dbr_time_double),	/* double field with time	*/
-	sizeof(struct dbr_sts_string),	/* graphic string info		*/
-	sizeof(struct dbr_gr_short),	/* graphic short info		*/
-	sizeof(struct dbr_gr_float),	/* graphic float info		*/
-	sizeof(struct dbr_gr_enum),	/* graphic item info		*/
+    sizeof(struct dbr_time_double), /* double field with time       */
+    sizeof(struct dbr_sts_string),  /* graphic string info          */
+    sizeof(struct dbr_gr_short),    /* graphic short info           */
+    sizeof(struct dbr_gr_float),    /* graphic float info           */
+    sizeof(struct dbr_gr_enum),     /* graphic item info            */
 
-	sizeof(struct dbr_gr_char),	/* graphic char info		*/
-	sizeof(struct dbr_gr_long),	/* graphic long info		*/
-	sizeof(struct dbr_gr_double),	/* graphic double info		*/
-	sizeof(struct dbr_sts_string),	/* control string info		*/
-	sizeof(struct dbr_ctrl_short),	/* control short info		*/
+    sizeof(struct dbr_gr_char),     /* graphic char info            */
+    sizeof(struct dbr_gr_long),     /* graphic long info            */
+    sizeof(struct dbr_gr_double),   /* graphic double info          */
+    sizeof(struct dbr_sts_string),  /* control string info          */
+    sizeof(struct dbr_ctrl_short),  /* control short info           */
 
-	sizeof(struct dbr_ctrl_float),	/* control float info		*/
-	sizeof(struct dbr_ctrl_enum),	/* control item info		*/
-	sizeof(struct dbr_ctrl_char),	/* control char info		*/
-	sizeof(struct dbr_ctrl_long),	/* control long info		*/
-	sizeof(struct dbr_ctrl_double),	/* control double info		*/
+    sizeof(struct dbr_ctrl_float),  /* control float info           */
+    sizeof(struct dbr_ctrl_enum),   /* control item info            */
+    sizeof(struct dbr_ctrl_char),   /* control char info            */
+    sizeof(struct dbr_ctrl_long),   /* control long info            */
+    sizeof(struct dbr_ctrl_double), /* control double info          */
 
-	sizeof(dbr_put_ackt_t),		/* put ackt			*/
-	sizeof(dbr_put_acks_t),		/* put acks			*/
-	sizeof(struct dbr_stsack_string),/* string field with status/ack*/
-	sizeof(dbr_string_t),		/* string max size		*/
+    sizeof(dbr_put_ackt_t),         /* put ackt                     */
+    sizeof(dbr_put_acks_t),         /* put acks                     */
+    sizeof(struct dbr_stsack_string),/* string field with status/ack*/
+    sizeof(dbr_string_t),           /* string max size              */
 };
 
-// extern "C"
-epicsShareDef const unsigned short dbr_value_size[LAST_BUFFER_TYPE+1] = {
-	sizeof(dbr_string_t),	/* string max size		*/
-	sizeof(dbr_short_t),	/* short			*/
-	sizeof(dbr_float_t),	/* IEEE Float			*/
-	sizeof(dbr_enum_t),	/* item number			*/
-	sizeof(dbr_char_t),	/* character			*/
+const unsigned short dbr_value_size[LAST_BUFFER_TYPE+1] = {
+    sizeof(dbr_string_t),   /* string max size              */
+    sizeof(dbr_short_t),    /* short                        */
+    sizeof(dbr_float_t),    /* IEEE Float                   */
+    sizeof(dbr_enum_t),     /* item number                  */
+    sizeof(dbr_char_t),     /* character                    */
 
-	sizeof(dbr_long_t),	/* long				*/
-	sizeof(dbr_double_t),	/* double			*/
-	sizeof(dbr_string_t),	/* string max size		*/
-	sizeof(dbr_short_t),	/* short			*/
-	sizeof(dbr_float_t),	/* IEEE Float			*/
+    sizeof(dbr_long_t),     /* long                         */
+    sizeof(dbr_double_t),   /* double                       */
+    sizeof(dbr_string_t),   /* string max size              */
+    sizeof(dbr_short_t),    /* short                        */
+    sizeof(dbr_float_t),    /* IEEE Float                   */
 
-	sizeof(dbr_enum_t),	/* item number			*/
-	sizeof(dbr_char_t),	/* character			*/
-	sizeof(dbr_long_t),	/* long				*/
-	sizeof(dbr_double_t),	/* double			*/
-	sizeof(dbr_string_t),	/* string max size		*/
+    sizeof(dbr_enum_t),     /* item number                  */
+    sizeof(dbr_char_t),     /* character                    */
+    sizeof(dbr_long_t),     /* long                         */
+    sizeof(dbr_double_t),   /* double                       */
+    sizeof(dbr_string_t),   /* string max size              */
 
-	sizeof(dbr_short_t),	/* short			*/
-	sizeof(dbr_float_t),	/* IEEE Float			*/
-	sizeof(dbr_enum_t),	/* item number			*/
-	sizeof(dbr_char_t),	/* character			*/
-	sizeof(dbr_long_t),	/* long				*/
+    sizeof(dbr_short_t),    /* short                        */
+    sizeof(dbr_float_t),    /* IEEE Float                   */
+    sizeof(dbr_enum_t),     /* item number                  */
+    sizeof(dbr_char_t),     /* character                    */
+    sizeof(dbr_long_t),     /* long                         */
 
-	sizeof(dbr_double_t),	/* double			*/
-	sizeof(dbr_string_t),	/* string max size		*/
-	sizeof(dbr_short_t),	/* short			*/
-	sizeof(dbr_float_t),	/* IEEE Float			*/
-	sizeof(dbr_enum_t),	/* item number			*/
+    sizeof(dbr_double_t),   /* double                       */
+    sizeof(dbr_string_t),   /* string max size              */
+    sizeof(dbr_short_t),    /* short                        */
+    sizeof(dbr_float_t),    /* IEEE Float                   */
+    sizeof(dbr_enum_t),     /* item number                  */
 
-	sizeof(dbr_char_t),	/* character			*/
-	sizeof(dbr_long_t),	/* long				*/
-	sizeof(dbr_double_t),	/* double			*/
-	sizeof(dbr_string_t),	/* string max size		*/
-	sizeof(dbr_short_t),	/* short			*/
+    sizeof(dbr_char_t),     /* character                    */
+    sizeof(dbr_long_t),     /* long                         */
+    sizeof(dbr_double_t),   /* double                       */
+    sizeof(dbr_string_t),   /* string max size              */
+    sizeof(dbr_short_t),    /* short                        */
 
-	sizeof(dbr_float_t),	/* IEEE Float			*/
-	sizeof(dbr_enum_t),	/* item number			*/
-	sizeof(dbr_char_t),	/* character			*/
-	sizeof(dbr_long_t),	/* long				*/
-	sizeof(dbr_double_t),	/* double			*/
+    sizeof(dbr_float_t),    /* IEEE Float                   */
+    sizeof(dbr_enum_t),     /* item number                  */
+    sizeof(dbr_char_t),     /* character                    */
+    sizeof(dbr_long_t),     /* long                         */
+    sizeof(dbr_double_t),   /* double                       */
 
-	sizeof(dbr_ushort_t), 	/* put_ackt			*/
-	sizeof(dbr_ushort_t), 	/* put_acks			*/
-	sizeof(dbr_string_t),	/* string max size		*/
-	sizeof(dbr_string_t),	/* string max size		*/
+    sizeof(dbr_ushort_t),   /* put_ackt                     */
+    sizeof(dbr_ushort_t),   /* put_acks                     */
+    sizeof(dbr_string_t),   /* string max size              */
+    sizeof(dbr_string_t),   /* string max size              */
 };
 
 //extern "C"
-epicsShareDef const enum dbr_value_class dbr_value_class[LAST_BUFFER_TYPE+1] = {
-	dbr_class_string,	/* string max size		*/
-	dbr_class_int,		/* short			*/
-	dbr_class_float,	/* IEEE Float			*/
-	dbr_class_int,		/* item number			*/
-	dbr_class_int,		/* character			*/
-	dbr_class_int,		/* long				*/
-	dbr_class_float,	/* double			*/
+const enum dbr_value_class dbr_value_class[LAST_BUFFER_TYPE+1] = {
+    dbr_class_string,       /* string max size              */
+    dbr_class_int,          /* short                        */
+    dbr_class_float,        /* IEEE Float                   */
+    dbr_class_int,          /* item number                  */
+    dbr_class_int,          /* character                    */
+    dbr_class_int,          /* long                         */
+    dbr_class_float,        /* double                       */
 
-	dbr_class_string,	/* string max size		*/
-	dbr_class_int,		/* short			*/
-	dbr_class_float,	/* IEEE Float			*/
-	dbr_class_int,		/* item number			*/
-	dbr_class_int,		/* character			*/
-	dbr_class_int,		/* long				*/
-	dbr_class_float,	/* double			*/
+    dbr_class_string,       /* string max size              */
+    dbr_class_int,          /* short                        */
+    dbr_class_float,        /* IEEE Float                   */
+    dbr_class_int,          /* item number                  */
+    dbr_class_int,          /* character                    */
+    dbr_class_int,          /* long                         */
+    dbr_class_float,        /* double                       */
 
-	dbr_class_string,	/* string max size		*/
-	dbr_class_int,		/* short			*/
-	dbr_class_float,	/* IEEE Float			*/
-	dbr_class_int,		/* item number			*/
-	dbr_class_int,		/* character			*/
-	dbr_class_int,		/* long				*/
-	dbr_class_float,	/* double			*/
+    dbr_class_string,       /* string max size              */
+    dbr_class_int,          /* short                        */
+    dbr_class_float,        /* IEEE Float                   */
+    dbr_class_int,          /* item number                  */
+    dbr_class_int,          /* character                    */
+    dbr_class_int,          /* long                         */
+    dbr_class_float,        /* double                       */
 
-	dbr_class_string,	/* string max size		*/
-	dbr_class_int,		/* short			*/
-	dbr_class_float,	/* IEEE Float			*/
-	dbr_class_int,		/* item number			*/
-	dbr_class_int,		/* character			*/
-	dbr_class_int,		/* long				*/
-	dbr_class_float,	/* double			*/
+    dbr_class_string,       /* string max size              */
+    dbr_class_int,          /* short                        */
+    dbr_class_float,        /* IEEE Float                   */
+    dbr_class_int,          /* item number                  */
+    dbr_class_int,          /* character                    */
+    dbr_class_int,          /* long                         */
+    dbr_class_float,        /* double                       */
 
-	dbr_class_string,	/* string max size		*/
-	dbr_class_int,		/* short			*/
-	dbr_class_float,	/* IEEE Float			*/
-	dbr_class_int,		/* item number			*/
-	dbr_class_int,		/* character			*/
-	dbr_class_int,		/* long				*/
-	dbr_class_float,	/* double			*/
-	dbr_class_int,
-	dbr_class_int,
-	dbr_class_string,
-	dbr_class_string,	/* string max size		*/
+    dbr_class_string,       /* string max size              */
+    dbr_class_int,          /* short                        */
+    dbr_class_float,        /* IEEE Float                   */
+    dbr_class_int,          /* item number                  */
+    dbr_class_int,          /* character                    */
+    dbr_class_int,          /* long                         */
+    dbr_class_float,        /* double                       */
+    dbr_class_int,
+    dbr_class_int,
+    dbr_class_string,
+    dbr_class_string,       /* string max size              */
 };
 
-// extern "C"
-epicsShareDef const unsigned short dbr_value_offset[LAST_BUFFER_TYPE+1] = {
-	0,					/* string			*/
-	0,					/* short			*/
-	0,					/* IEEE Float			*/
-	0,					/* item number			*/
-	0,					/* character			*/
-	0,					/* long				*/
-	0,					/* IEEE double			*/
-	(unsigned short) offsetof(dbr_sts_string,value[0]),/* string field	with status	*/
-	(unsigned short) offsetof(dbr_sts_short,value),	/* short field with status	*/
-	(unsigned short) offsetof(dbr_sts_float,value),	/* float field with status	*/
-	(unsigned short) offsetof(dbr_sts_enum,value),	/* item number with status	*/
-	(unsigned short) offsetof(dbr_sts_char,value),	/* char field with status	*/
-	(unsigned short) offsetof(dbr_sts_long,value),	/* long field with status	*/
-	(unsigned short) offsetof(dbr_sts_double,value),	/* double field with time	*/
-	(unsigned short) offsetof(dbr_time_string,value[0] ),/* string field with time	*/
-	(unsigned short) offsetof(dbr_time_short,value),	/* short field with time	*/
-	(unsigned short) offsetof(dbr_time_float,value),	/* float field with time	*/
-	(unsigned short) offsetof(dbr_time_enum,value),	/* item number with time	*/
-	(unsigned short) offsetof(dbr_time_char,value),	/* char field with time		*/
-	(unsigned short) offsetof(dbr_time_long,value),	/* long field with time		*/
-	(unsigned short) offsetof(dbr_time_double,value),	/* double field with time	*/
-	(unsigned short) offsetof(dbr_sts_string,value[0]),/* graphic string info		*/
-	(unsigned short) offsetof(dbr_gr_short,value),	/* graphic short info		*/
-	(unsigned short) offsetof(dbr_gr_float,value),	/* graphic float info		*/
-	(unsigned short) offsetof(dbr_gr_enum,value),	/* graphic item info		*/
-	(unsigned short) offsetof(dbr_gr_char,value),	/* graphic char info		*/
-	(unsigned short) offsetof(dbr_gr_long,value),	/* graphic long info		*/
-	(unsigned short) offsetof(dbr_gr_double,value),	/* graphic double info		*/
-	(unsigned short) offsetof(dbr_sts_string,value[0]),/* control string info		*/
-	(unsigned short) offsetof(dbr_ctrl_short,value),	/* control short info		*/
-	(unsigned short) offsetof(dbr_ctrl_float,value),	/* control float info		*/
-	(unsigned short) offsetof(dbr_ctrl_enum,value),	/* control item info		*/
-	(unsigned short) offsetof(dbr_ctrl_char,value),	/* control char info		*/
-	(unsigned short) offsetof(dbr_ctrl_long,value),	/* control long info		*/
-	(unsigned short) offsetof(dbr_ctrl_double,value),	/* control double info		*/
-	0,					/* put ackt			*/
-	0,					/* put acks			*/
-	(unsigned short) offsetof(dbr_stsack_string,value[0]),/* string field	with status	*/
-	0,					/* string			*/
+const unsigned short dbr_value_offset[LAST_BUFFER_TYPE+1] = {
+    0,                                                      /* string                   */
+    0,                                                      /* short                    */
+    0,                                                      /* IEEE Float               */
+    0,                                                      /* item number              */
+    0,                                                      /* character                */
+    0,                                                      /* long                     */
+    0,                                                      /* IEEE double              */
+    (unsigned short) offsetof(dbr_sts_string,value[0]),     /* string field with status */
+    (unsigned short) offsetof(dbr_sts_short,value),         /* short field with status  */
+    (unsigned short) offsetof(dbr_sts_float,value),         /* float field with status  */
+    (unsigned short) offsetof(dbr_sts_enum,value),          /* item number with status  */
+    (unsigned short) offsetof(dbr_sts_char,value),          /* char field with status   */
+    (unsigned short) offsetof(dbr_sts_long,value),          /* long field with status   */
+    (unsigned short) offsetof(dbr_sts_double,value),        /* double field with time   */
+    (unsigned short) offsetof(dbr_time_string,value[0] ),   /* string field with time   */
+    (unsigned short) offsetof(dbr_time_short,value),        /* short field with time    */
+    (unsigned short) offsetof(dbr_time_float,value),        /* float field with time    */
+    (unsigned short) offsetof(dbr_time_enum,value),         /* item number with time    */
+    (unsigned short) offsetof(dbr_time_char,value),         /* char field with time     */
+    (unsigned short) offsetof(dbr_time_long,value),         /* long field with time     */
+    (unsigned short) offsetof(dbr_time_double,value),       /* double field with time   */
+    (unsigned short) offsetof(dbr_sts_string,value[0]),     /* graphic string info      */
+    (unsigned short) offsetof(dbr_gr_short,value),          /* graphic short info       */
+    (unsigned short) offsetof(dbr_gr_float,value),          /* graphic float info       */
+    (unsigned short) offsetof(dbr_gr_enum,value),           /* graphic item info        */
+    (unsigned short) offsetof(dbr_gr_char,value),           /* graphic char info        */
+    (unsigned short) offsetof(dbr_gr_long,value),           /* graphic long info        */
+    (unsigned short) offsetof(dbr_gr_double,value),         /* graphic double info      */
+    (unsigned short) offsetof(dbr_sts_string,value[0]),     /* control string info      */
+    (unsigned short) offsetof(dbr_ctrl_short,value),        /* control short info       */
+    (unsigned short) offsetof(dbr_ctrl_float,value),        /* control float info       */
+    (unsigned short) offsetof(dbr_ctrl_enum,value),         /* control item info        */
+    (unsigned short) offsetof(dbr_ctrl_char,value),         /* control char info        */
+    (unsigned short) offsetof(dbr_ctrl_long,value),         /* control long info        */
+    (unsigned short) offsetof(dbr_ctrl_double,value),       /* control double info      */
+    0,                                                      /* put ackt                 */
+    0,                                                      /* put acks                 */
+    (unsigned short) offsetof(dbr_stsack_string,value[0]),  /* string field with status */
+    0,                                                      /* string                   */
 };
 
-// extern "C"
-epicsShareDef const char *dbf_text[LAST_TYPE+3] = {
-	"TYPENOTCONN",
-	"DBF_STRING",
-	"DBF_SHORT",
-	"DBF_FLOAT",
-	"DBF_ENUM",
-	"DBF_CHAR",
-	"DBF_LONG",
-	"DBF_DOUBLE",
-	"DBF_NO_ACCESS"
+const char *dbf_text[LAST_TYPE+3] = {
+    "TYPENOTCONN",
+    "DBF_STRING",
+    "DBF_SHORT",
+    "DBF_FLOAT",
+    "DBF_ENUM",
+    "DBF_CHAR",
+    "DBF_LONG",
+    "DBF_DOUBLE",
+    "DBF_NO_ACCESS"
 };
 
-// extern "C"
-epicsShareDef const char *dbf_text_invalid = "DBF_invalid";
+const char *dbf_text_invalid = "DBF_invalid";
 
-// extern "C"
-epicsShareDef const short dbf_text_dim = (sizeof dbf_text)/(sizeof (char *));
+const short dbf_text_dim = (sizeof dbf_text)/(sizeof (char *));
 
-// extern "C"
-epicsShareDef const char *dbr_text[LAST_BUFFER_TYPE+1] = {
+const char *dbr_text[LAST_BUFFER_TYPE+1] = {
     "DBR_STRING",
     "DBR_SHORT",
     "DBR_FLOAT",
@@ -1100,8 +1090,6 @@ epicsShareDef const char *dbr_text[LAST_BUFFER_TYPE+1] = {
     "DBR_CLASS_NAME"
 };
 
-// extern "C"
-epicsShareDef const char *dbr_text_invalid = "DBR_invalid";
+const char *dbr_text_invalid = "DBR_invalid";
 
-// extern "C"
-epicsShareDef const short dbr_text_dim = (sizeof dbr_text) / (sizeof (char *)) + 1;
+const short dbr_text_dim = (sizeof dbr_text) / (sizeof (char *)) + 1;