Clear SNAPSHOT in Base version for 7.0.1.1

Also recreated README.1st from README.html

.appveyor.yml

@@ -0,0 +1,86 @@
+# AppVeyor configuration for EPICS Base
+
+# Ralph Lange <ralph.lange@gmx.de>
+# Copyright (c) 2016-2017 ITER Organization
+
+# Version format
+version: base-{branch}-{build}
+
+#---------------------------------#
+#       repository cloning        #
+#---------------------------------#
+
+# Called at very beginning, before repo cloning
+init:
+  # Set autocrlf to make batch files work
+  - git config --global core.autocrlf true
+
+# Set clone depth (do not fetch complete history)
+clone_depth: 10
+
+# Skipping commits affecting only specific files
+skip_commits:
+  files:
+    - 'documentation/*'
+    - 'templates/*'
+    - '**/*.html'
+    - '**/*.md'
+
+#---------------------------------#
+#   build matrix configuration    #
+#---------------------------------#
+
+# Build Configurations: dll/static, regular/debug
+configuration:
+  - dynamic
+  - static
+  - dynamic-debug
+  - static-debug
+
+# Environment variables: compiler toolchain
+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
+
+# Platform: architecture
+platform:
+  - x86
+  - x64
+
+# Matrix configuration: allow specific failing jobs
+matrix:
+  exclude:
+  # VS Express installs don't have the 64 bit compiler
+  - platform: x64
+    TOOLCHAIN: 10.0
+
+#---------------------------------#
+#     building & testing          #
+#---------------------------------#
+
+install:
+  - cmd: git submodule update --init --recursive --depth 10
+  - cmd: .ci/appveyor-prepare.bat
+
+build_script:
+  - cmd: .ci/appveyor-make.bat
+
+test_script:
+  - cmd: .ci/appveyor-make.bat runtests
+
+#---------------------------------#
+#         notifications           #
+#---------------------------------#
+
+notifications:
+
+  - provider: Slack
+    incoming_webhook:
+      secure: RYOm3FIUYeZGjWKaeTVKwq+C3fzK54AKwbmAoECED45mex3lN+8HmrC845a6mg9xPUJ/ND51RopWVaKDD9/UzaM0SO195RQLKqUTIUafiuM=

.appveyor/epics-base-3.yml

@@ -1,145 +0,0 @@
-# Appveyor configuration file for EPICS Base 3.15 builds
-# (see also https://github.com/epics-base/ci-scripts)
-
-# branches to build
-branches:
-  # whitelist
-  only:
-    - 3.15
-    - /R3\.15\.\d+.*/
-
-# 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        #
-#---------------------------------#
-
-# Called at very beginning, before repo cloning
-init:
-  # Set autocrlf to make batch files work
-  - git config --global core.autocrlf true
-
-# Set clone depth (do not fetch complete history)
-clone_depth: 5
-
-# Skipping commits affecting only specific files
-skip_commits:
-  files:
-    - 'documentation/*'
-    - 'startup/*'
-    - '.github/*'
-    - '**/*.html'
-    - '**/*.md'
-
-#---------------------------------#
-#   build matrix configuration    #
-#---------------------------------#
-
-image: Visual Studio 2015
-
-# Build Configurations: dll/static, regular/debug
-configuration:
-  - dynamic
-  - static
-  - dynamic-debug
-  - static-debug
-
-# Environment variables: compiler toolchain, base version, setup file, ...
-environment:
-  # common / default variables for all jobs
-  SETUP_PATH: .ci-local:.ci
-  BASE: SELF
-  EPICS_TEST_IMPRECISE_TIMING: YES
-
-  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: exclude sets of jobs
-matrix:
-  exclude:
-  # VS2012 and older installs don't have the 64 bit compiler
-  - platform: x64
-    CMP: vs2012
-  - platform: x64
-    CMP: vs2010
-  # Exclude more jobs to reduce build time
-  # Skip 32-bit for "middle-aged" compilers
-  - platform: x86
-    CMP: vs2017
-  - platform: x86
-    CMP: vs2015
-  # MinGW debug builds use the same libraries, unlike VS
-  - configuration: dynamic-debug
-    CMP: gcc
-  - configuration: static-debug
-    CMP: gcc
-
-#---------------------------------#
-#     building & testing          #
-#---------------------------------#
-
-install:
-  - cmd: git submodule update --init --recursive
-  - cmd: python .ci/cue.py prepare
-
-build_script:
-  - cmd: python .ci/cue.py build
-
-test_script:
-  - 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           #
-#---------------------------------#
-
-notifications:
-
-  - provider: Email
-    to:
-      - core-talk@aps.anl.gov
-    on_build_success: false
-
-  - provider: GitHubPullRequest

.ci/appveyor-make.bat

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

@@ -0,0 +1,70 @@
+:: 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://www.aps.anl.gov/epics/download/tools/make-4.1-win64.zip
+cd \tools
+"C:\Program Files\7-Zip\7z" e make-4.1.zip

.ci/checkout-modules.sh

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

.ci/make-tar.sh

@@ -0,0 +1,108 @@
+#!/bin/sh
+#
+# Make tar for git repo w/ one level of sub modules.
+#
+set -e
+
+die() {
+  echo "$1" >&2
+  exit 1
+}
+
+TOPREV="$1"
+FINALTAR="$2"
+PREFIX="$3"
+
+if ! [ "$TOPREV" ]
+then
+   cat <<EOF >&2
+usage: $0 [rev] [outfile.tar.gz] [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>/".
+EOF
+   exit 1
+fi
+
+[ "$FINALTAR" ] || FINALTAR="base-$TOPREV.tar.gz"
+[ "$PREFIX" ] || PREFIX="base-$TOPREV/"
+
+case "$PREFIX" in
+*/) ;;
+*)  die "Prefix must end with '/'";;
+esac
+
+# Check for both <tag> and R<tag>
+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'"
+  fi
+fi
+
+# temporary directory w/ automatic cleanup
+TDIR=`mktemp -d`
+trap 'rm -rf "$TDIR"' EXIT INT QUIT TERM
+
+mkdir "$TDIR"/tar
+
+echo "Exporting revision $TOPREV as $FINALTAR with prefix $PREFIX"
+
+# Use git-archive to copy files at the given revision into our temp. dir.
+# Respects 'export-exclude' in .gitattributes files.
+
+git archive --prefix=$PREFIX $TOPREV | tar -C "$TDIR"/tar -x
+
+# use ls-tree instead of submodule-foreach to capture submodule revision associated with supermodule rev.
+#
+# sub-modules appear in tree as eg.:
+#  160000 commit c3a6cfcf0dad4a4eeecf59b474710d06ff3eb68a  modules/ca
+git ls-tree -r $TOPREV | awk '/^[0-9]+ commit / {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
+done
+
+# make a list of files copied and filter out undesirables
+
+(cd "$TDIR"/tar && find . -mindepth 1 -not -type d) > "$TDIR"/list.1
+
+# Remove leading ./ from filenames
+sed -i -e 's|^\./||' "$TDIR"/list.1
+
+# Exclude files
+sed \
+  -e '/\/\.\?ci\//d' \
+  -e '/\/jenkins\//d' \
+  -e '/\/\.git/d' \
+  -e '/\/\.project$/d' \
+  -e '/\/\.travis\.yml$/d' \
+  -e '/\/\.appveyor\.yml$/d' \
+  "$TDIR"/list.1 > "$TDIR"/list.2
+
+if ! diff -U 0 "$TDIR"/list.1 "$TDIR"/list.2
+then
+    echo "Excluding the files shown above"
+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"
+
+echo "Wrote $FINALTAR"
+
+tar -taf "$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"
+fi

.ci/travis-build.sh

@@ -0,0 +1,90 @@
+#!/bin/sh
+set -e -x
+
+die() {
+  echo "$1" >&2
+  exit 1
+}
+
+ticker() {
+  while true
+  do
+    sleep 60
+    date -R
+    [ -r "$1" ] && tail -n10 "$1"
+  done
+}
+
+CACHEKEY=1
+
+EPICS_HOST_ARCH=`sh startup/EpicsHostArch`
+
+[ -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"
+# 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' configure/os/CONFIG_SITE.Common.RTEMS
+  cat << EOF >> configure/os/CONFIG_SITE.Common.RTEMS
+RTEMS_VERSION=$RTEMS
+RTEMS_BASE=/home/travis/.cache/rtems${RTEMS}-i386
+EOF
+  cat << EOF >> 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 $EXTRA
+
+if [ "$TEST" != "NO" ]
+then
+   make -j2 tapfiles
+   make -s test-results
+fi

.ci/travis-prepare.sh

@@ -0,0 +1,46 @@
+#!/bin/sh
+set -e -x
+
+die() {
+  echo "$1" >&2
+  exit 1
+}
+
+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/CONFIG_SITE
+USR_CPPFLAGS += $USR_CPPFLAGS
+USR_CFLAGS += $USR_CFLAGS
+USR_CXXFLAGS += $USR_CXXFLAGS
+EOF

.gitattributes

@@ -0,0 +1,4 @@
+.ci/          export-ignore
+.appveyor.yml export-ignore
+.travis.yml   export-ignore
+README        export-subst

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

@@ -1,143 +0,0 @@
-# .github/workflows/ci-scripts-build.yml for use with EPICS Base ci-scripts
-# (see: https://github.com/epics-base/ci-scripts)
-
-# This is YAML - indentation levels are crucial
-
-# Workflow name, shared by all branches
-
-name: Base
-
-# Trigger on pushes and PRs to any branch
-on:
-  push:
-    paths-ignore:
-      - 'documentation/*'
-      - 'startup/*'
-      - '.appveyor/*'
-      - '**/*.html'
-      - '**/*.md'
-  pull_request:
-    paths-ignore:
-      - 'documentation/*'
-      - 'startup/*'
-      - '.appveyor/*'
-      - '**/*.html'
-      - '**/*.md'
-
-env:
-    SETUP_PATH: .ci-local:.ci
-    BASE: SELF
-    EPICS_TEST_IMPRECISE_TIMING: YES
-
-jobs:
-  build-base:
-    name: ${{ matrix.name }}
-    runs-on: ${{ matrix.os }}
-    # Set environment variables from matrix parameters
-    env:
-      CMP: ${{ matrix.cmp }}
-      BCFG: ${{ matrix.configuration }}
-      WINE: ${{ matrix.wine }}
-      RTEMS: ${{ matrix.rtems }}
-      EXTRA: ${{ matrix.extra }}
-    strategy:
-      fail-fast: false
-      matrix:
-        # Job names also name artifacts, character limitations apply
-        include:
-          - os: ubuntu-20.04
-            cmp: gcc
-            configuration: default
-            wine: "64"
-            name: "Ub-20 gcc-9 + MinGW"
-
-          - os: ubuntu-20.04
-            cmp: gcc
-            configuration: static
-            wine: "64"
-            name: "Ub-20 gcc-9 + MinGW, static"
-
-          - os: ubuntu-20.04
-            cmp: gcc
-            configuration: static
-            extra: "CMD_CXXFLAGS=-std=c++11"
-            name: "Ub-20 gcc-9 C++11, static"
-
-          - os: ubuntu-20.04
-            cmp: clang
-            configuration: default
-            extra: "CMD_CXXFLAGS=-std=c++11"
-            name: "Ub-20 clang-10 C++11"
-
-          - os: ubuntu-20.04
-            cmp: gcc
-            configuration: default
-            rtems: "4.10"
-            name: "Ub-20 gcc-9 + RT-4.10"
-
-          - os: ubuntu-20.04
-            cmp: gcc
-            configuration: default
-            rtems: "4.9"
-            name: "Ub-20 gcc-9 + RT-4.9"
-
-          - os: ubuntu-20.04
-            cmp: gcc-8
-            utoolchain: true
-            configuration: default
-            name: "Ub-20 gcc-8"
-
-          - os: ubuntu-20.04
-            cmp: clang
-            configuration: default
-            name: "Ub-20 clang-10"
-
-          - os: macos-latest
-            cmp: clang
-            configuration: default
-            name: "MacOS clang-12"
-
-          - os: windows-2019
-            cmp: vs2019
-            configuration: default
-            name: "Win2019 MSC-19"
-
-          - os: windows-2019
-            cmp: vs2019
-            configuration: static
-            name: "Win2019 MSC-19, static"
-
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: true
-    - name: "apt-get install"
-      run: |
-        sudo apt-get update
-        sudo apt-get -y install qemu-system-x86 g++-mingw-w64-x86-64 gdb
-      if: runner.os == 'Linux'
-    - name: "apt-get install ${{ matrix.cmp }}"
-      run: |
-        export GCC_NAME="${{ matrix.cmp }}"
-        sudo apt-get update
-        sudo apt-get -y install software-properties-common
-        sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-        sudo apt-get update
-        sudo apt-get -y install g++-${GCC_NAME#gcc-}
-      if: matrix.utoolchain
-    - name: Prepare and compile dependencies
-      run: python .ci/cue.py prepare
-    - name: Build main module
-      run: python .ci/cue.py build
-    - name: Run main module tests
-      run: python .ci/cue.py test
-    - name: Upload tapfiles Artifact
-      if: ${{ always() }}
-      uses: actions/upload-artifact@v4
-      with:
-        name: tapfiles ${{ matrix.name }}
-        path: '**/O.*/*.tap'
-        if-no-files-found: ignore
-    - name: Collect and show test results
-      if: ${{ always() }}
-      run: python .ci/cue.py test-results

.gitignore

@@ -7,6 +7,8 @@
 /include/
 /templates/
 /configure/*.local
+/modules/RELEASE.*.local
+/modules/Makefile.local
 O.*/
 /QtC-*
 *.orig

.gitmodules

@@ -1,4 +1,36 @@
-[submodule ".ci"]
-    path = .ci
-    url = https://github.com/epics-base/ci-scripts
+[submodule "modules/libcom"]
+    path = modules/libcom
+    url = ./
+    branch = libcom/master
+[submodule "modules/database"]
+    path = modules/database
+    url = ./
+    branch = database/master
+[submodule "modules/ca"]
+    path = modules/ca
+    url = ./
+    branch = ca/master
+[submodule "modules/pvData"]
+    path = modules/pvData
+    url = https://github.com/epics-base/pvDataCPP
+    branch = master
+[submodule "modules/pvAccess"]
+    path = modules/pvAccess
+    url = https://github.com/epics-base/pvAccessCPP
+    branch = master
+[submodule "modules/normativeTypes"]
+    path = modules/normativeTypes
+    url = https://github.com/epics-base/normativeTypesCPP
+    branch = master
+[submodule "modules/pvaClient"]
+    path = modules/pvaClient
+    url = https://github.com/epics-base/pvaClientCPP
+    branch = master
+[submodule "modules/pvDatabase"]
+    path = modules/pvDatabase
+    url = https://github.com/epics-base/pvDatabaseCPP
+    branch = master
+[submodule "modules/pva2pva"]
+    path = modules/pva2pva
+    url = https://github.com/epics-base/pva2pva
     branch = master

.travis.yml

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

Makefile

@@ -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 file LICENSE that is included with this distribution. 
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 
 TOP = .
@@ -14,8 +14,12 @@ include $(TOP)/configure/CONFIG
 TOOLS = $(TOP)/src/tools
 
 DIRS += configure src
-
 src_DEPEND_DIRS = configure
 
-include $(TOP)/configure/RULES_TOP
+DIRS += test
+test_DEPEND_DIRS = src
 
+DIRS += modules
+modules_DEPEND_DIRS = src
+
+include $(TOP)/configure/RULES_TOP

README

@@ -2,14 +2,14 @@
 EPICS Base - the central core of a control system toolkit
 ---------------------------------------------------------
 
-Copyright (c) 1991-2003 The University of Chicago, as Operator
-of Argonne National Laboratory.
+Copyright UChicago Argonne LLC, as Operator of Argonne
+National Laboratory.
 Copyright (c) 1991-2003 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 the
-file LICENSE that is included with this distribution.
+EPICS Base is distributed subject to a Software License
+Agreement found in the file LICENSE that is included with
+this distribution.
 
 ---------------------------------------------------------
 
@@ -20,5 +20,8 @@ Additional information about EPICS including mailing list
 archives and subscription instructions, documentation and
 training materials, additional components, links to other
 websites etc. is available on the EPICS home page at
-	https://epics.anl.gov/
+	http://www.aps.anl.gov/epics/
 
+$Format:%cD$
+$Format:%H$
+https://code.launchpad.net/epics-base

configure/CONFIG

@@ -20,14 +20,11 @@ else
 endif
 
 # Provide a default if the user hasn't set EPICS_HOST_ARCH
-#
-ifeq ($(origin EPICS_HOST_ARCH), undefined)
-  # Bootstrapping ...
-  EHA := $(firstword $(wildcard $(EPICS_BASE)/lib/perl/EpicsHostArch.pl \
-        $(TOP)/src/tools/EpicsHostArch.pl))
-  # NB: We use a simply expanded variable here for performance:
-  export EPICS_HOST_ARCH := $(shell perl $(EHA))
-  EHA :=
+ifeq ($(strip $(EPICS_HOST_ARCH)),)
+  # NB: We must set the environment variable for submodules to include
+  # the correct modules/RELEASE.<host>.local file to set EPICS_BASE,
+  # they can't do this for themselves since CONFIG is relative to it:
+  export EPICS_HOST_ARCH := $(shell $(CONFIG)/../startup/EpicsHostArch.pl)
 endif
 
 -include $(CONFIG)/RELEASE

configure/CONFIG_BASE

@@ -3,13 +3,12 @@
 #     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.
 #*************************************************************************
 
 #---------------------------------------------------------------
-# Epics base directories
+# EPICS Base directories
 
 EPICS_BASE_HOST_BIN = $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)
 EPICS_BASE_HOST_LIB = $(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)
@@ -18,17 +17,6 @@ ifdef T_A
   EPICS_BASE_BIN    = $(EPICS_BASE)/bin/$(T_A)
 endif
 
-#---------------------------------------------------------------
-# Epics base Ioc libraries 
-
-EPICS_BASE_IOC_LIBS += dbRecStd dbCore ca Com 
-
-#---------------------------------------------------------------
-# Epics base Host libraries 
-
-EPICS_BASE_HOST_LIBS += cas gdd
-EPICS_BASE_HOST_LIBS += ca Com
-
 #---------------------------------------------------------------
 # Version number for base shared libraries (and win32 products)
 
@@ -39,17 +27,6 @@ ifdef BASE_TOP
   PROD_VERSION = $(EPICS_VERSION).$(EPICS_REVISION)
 endif # BASE_TOP
 
-#---------------------------------------------------------------
-# Base c preprocessor flags
-
-BASE_CPPFLAGS = 
-
-# osithread default stack
-OSITHREAD_USE_DEFAULT_STACK = NO
-OSITHREAD_DEFAULT_STACK_FLAGS_YES = -DOSITHREAD_USE_DEFAULT_STACK
-OSITHREAD_DEFAULT_STACK_FLAGS_NO =
-BASE_CPPFLAGS += $(OSITHREAD_DEFAULT_STACK_FLAGS_$(OSITHREAD_USE_DEFAULT_STACK))
-
 #---------------------------------------------------------------
 # Where to find the installed build tools
 #   Windows does not like commands with relative paths starting ../
@@ -59,74 +36,21 @@ TOOLS = $(abspath $(EPICS_BASE_HOST_BIN))
 FIND_TOOL = $(firstword $(wildcard $(TOOLS)/$(1) $(TOP)/src/tools/$(1)))
 
 #---------------------------------------------------------------
-# Epics base build tools and tool flags
+# EPICS Base build tools and tool flags
 
-MAKEBPT                    = $(TOOLS)/makeBpt$(HOSTEXE)
-DBEXPAND                   = $(PERL) $(TOOLS)/dbdExpand.pl
-DBTORECORDTYPEH            = $(PERL) $(TOOLS)/dbdToRecordtypeH.pl
-DBTOMENUH                  = $(PERL) $(TOOLS)/dbdToMenuH.pl
-REGISTERRECORDDEVICEDRIVER = $(PERL) $(TOOLS)/registerRecordDeviceDriver.pl
-CONVERTRELEASE             = $(PERL) $(call FIND_TOOL,convertRelease.pl)
-FULLPATHNAME               = $(PERL) $(TOOLS)/fullPathName.pl
+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)
 
-#-------------------------------------------------------
+#---------------------------------------------------------------
 # tools for installing libraries and products
-INSTALL_QUIETLY := $(if $(filter -s,$(MFLAGS)),-q,)
-INSTALL = $(PERL) $(TOOLS)/installEpics.pl $(INSTALL_QUIETLY)
+INSTALL = $(PERL) $(TOOLS)/installEpics.pl $(QUIET_FLAG)
 INSTALL_PRODUCT = $(INSTALL)
 INSTALL_LIBRARY = $(INSTALL)
 
 #---------------------------------------------------------------
-# tools for making header dependancies and variable replacement
-MKMF                       = $(PERL) $(TOOLS)/mkmf.pl
-REPLACEVAR                 = $(PERL) $(TOOLS)/replaceVAR.pl
-
-#---------------------------------------------------------------
-# Tools for testing
-TAPS_FAILED_LOG       = .taps-failed.log
-TESTS_FAILED_LOG      = .tests-failed.log
-TESTS_FAILED_PATH     = $(abspath $(TOP)/$(TESTS_FAILED_LOG))
-
-TAPTOJUNIT            = $(PERL) $(TOOLS)/tap-to-junit-xml.pl
-PROVE                 = $(PERL) $(TOOLS)/epicsProve.pl --failures --color
-PROVE.tap             = $(PROVE) --ext .tap --exec "$(CAT)"
-TESTFAILURES          = $(PERL) $(TOOLS)/testFailures.pl
-SHOWTESTFAILURES      = $(TESTFAILURES) $(TESTS_FAILED_PATH) $(TAPS_FAILED_LOG)
-
-PROVE_FAILURE         = echo $(abspath .)>> $(TESTS_FAILED_PATH)
-TAPFILE_FAILURE       = echo $@>> $(TAPS_FAILED_LOG)
-
-#---------------------------------------------------------------
-# private versions of lex/yacc from EPICS
-EYACC = $(TOOLS)/antelope$(HOSTEXE)
-ELEX = $(TOOLS)/e_flex$(HOSTEXE) -S$(EPICS_BASE)/include/flex.skel.static
-
-YACC  = $(EYACC)
-LEX   = $(ELEX)
-
-#---------------------------------------------------------------
-# Our use of msi is incompatible with older versions
-
-MSI3_15 = $(EPICS_BASE_HOST_BIN)/msi
-
-#---------------------------------------------------------------
-# External tools and tool flags - must be in path or defined in application
-
-ADL2DL ?= adl2dl
-
-# sch2edif compiler and flags
-SCH2EDIF = sch2edif
-SCH2EDIF_PATH =
-SCH2EDIF_SYSFLAGS = -n -ap -p.+..+$(SCH2EDIF_PATH)+$(CAPFAST_TEMPLATES)/sym+
-SCH2EDIF_FLAGS =
- 
-# e2db and flags
-#    - again there is an assumption where edb.def is installed.
-E2DB ?= e2db
-E2DB_SYSFLAGS = -ate -d $(CAPFAST_TEMPLATES)/edb.def
-E2DB_FLAGS =
-
-DBST ?= dbst
-
-
-
+# tools for making header dependencies and variable replacement
+MKMF       = $(PERL) $(TOOLS)/mkmf.pl
+REPLACEVAR = $(PERL) $(TOOLS)/replaceVAR.pl

configure/CONFIG_BASE_VERSION

@@ -15,27 +15,47 @@
 # EPICS_SITE_VERSION is defined in CONFIG_SITE for sites that want a local
 # version number to be included in the reported version string.
 
-# In 3.15 we still define BASE_3_14 so "ifdef BASE_3_14" means
-# 3.14 or later, but "ifeq ($(BASE_3_14),YES)" means 3.14 only.
+# We define BASE_3_14 and BASE_3_15 as NO and BASE_3_16 as YES, so
+#   ifdef BASE_3_14
+#       true for 3.14 or later
+#   ifdef BASE_3_15
+#       true for 3.15 or later
+#   ifeq ($(BASE_3_14),YES)
+#       true for 3.14.x only
+#   ifeq ($(BASE_3_15),YES)
+#       true for 3.15 only
+#   ifeq ($(BASE_3_16),YES)
+#       true for 3.16 only.
+
 BASE_3_14 = NO
-BASE_3_15 = YES
+BASE_3_15 = NO
+BASE_3_16 = NO
+BASE_7_0  = YES
 
 # EPICS_VERSION must be a number >0 and <256
-EPICS_VERSION = 3
+EPICS_VERSION = 7
 
 # EPICS_REVISION must be a number >=0 and <256
-EPICS_REVISION = 15
+EPICS_REVISION = 0
 
 # EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 9
+EPICS_MODIFICATION = 1
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included if zero
 EPICS_PATCH_LEVEL = 1
 
 # This will end in -DEV between official releases
-EPICS_DEV_SNAPSHOT=-DEV
-#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
+EPICS_DEV_SNAPSHOT=
 
 # No changes should be needed below here
 

configure/CONFIG_COMMON

@@ -38,10 +38,6 @@ BUILD_ARCHS = $(EPICS_HOST_ARCH) $(CROSS1) $(CROSS2)
 # otherwise override this in os/CONFIG_SITE.<host_arch>.Common
 PERL = perl -CSD
 
-#-------------------------------------------------------
-# dbst based database optimization default
-DB_OPT = NO
-
 #-------------------------------------------------------
 # Check configure/RELEASE file for consistency
 CHECK_RELEASE_YES = checkRelease
@@ -80,9 +76,10 @@ COMMON_DIR = ../O.Common
 IOCS_APPL_TOP               = $(shell $(FULLPATHNAME) $(INSTALL_LOCATION))
 
 #-------------------------------------------------------
-# Make echo output - suppress echoing if '-s' flag was given
+# Make echo output - suppress echoing if make's '-s' flag is set
 NOP = :
-ECHO = @$(if $(filter -s,$(MFLAGS)),$(NOP),echo)
+ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
+QUIET_FLAG := $(if $(findstring s,$(MAKEFLAGS)),-q,)
 
 #-------------------------------------------------------
 ifdef T_A
@@ -332,6 +329,14 @@ COMPILE.cpp = $(CCC) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES)
 # C preprocessor command
 PREPROCESS.cpp = $(CPP) $(CPPFLAGS) $(INCLUDES) $< > $@
 
+#--------------------------------------------------
+# genVersion header defaults
+
+# C macro name
+GENVERSIONMACRO = VCSVERSION
+# C macro default value (empty to use date+time)
+GENVERSIONDEFAULT =
+
 #--------------------------------------------------
 # Header dependency file generation
 

configure/CONFIG_ENV

@@ -35,8 +35,10 @@ EPICS_CA_CONN_TMO=30.0
 EPICS_CA_REPEATER_PORT=5065
 EPICS_CA_SERVER_PORT=5064
 EPICS_CA_MAX_ARRAY_BYTES=16384
+EPICS_CA_AUTO_ARRAY_BYTES=YES
 EPICS_CA_BEACON_PERIOD=15.0
 EPICS_CA_MAX_SEARCH_PERIOD=300.0
+EPICS_CA_MCAST_TTL=1
 EPICS_CAS_BEACON_PERIOD=
 EPICS_CAS_BEACON_PORT=
 EPICS_CAS_AUTO_BEACON_ADDR_LIST=""
@@ -45,6 +47,9 @@ EPICS_CAS_SERVER_PORT=
 EPICS_CAS_INTF_ADDR_LIST=""
 EPICS_CAS_IGNORE_ADDR_LIST=""
 
+# Servers to disable
+EPICS_IOC_IGNORE_SERVERS=""
+
 # Log Server:
 # EPICS_IOC_LOG_PORT Log server port number etc.
 EPICS_IOC_LOG_PORT=7004

configure/CONFIG_SITE_ENV

@@ -24,41 +24,45 @@
 
 #  Site-specific environment settings
 
-## 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"
-
+# 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 2017  US: Mar 12 - Nov 05
+#	              EU: Mar 26 - Oct 29
+EPICS_TIMEZONE = CUS::360:031202:110502
+#EPICS_TIMEZONE = MET::-60:032602:102902
+#
+#	DST for 2018  US: Mar 11 - Nov 04
+#	              EU: Mar 25 - Oct 28
+#EPICS_TIMEZONE = CUS::360:031102:110402
+#EPICS_TIMEZONE = MET::-60:032502:102802
+#
+#	DST for 2019  US: Mar 10 - Nov 03
+#	              EU: Mar 31 - Oct 27
+#EPICS_TIMEZONE = CUS::360:031002:110302
+#EPICS_TIMEZONE = MET::-60:033102:102702
+#
+#	DST for 2020  US: Mar 08 - Nov 01
+#	              EU: Mar 29 - Oct 25
+#EPICS_TIMEZONE = CUS::360:030802:110102
+#EPICS_TIMEZONE = MET::-60:032902:102502
+#
+#	DST for 2021  US: Mar 14 - Nov 07
+#	              EU: Mar 28 - Oct 31
+#EPICS_TIMEZONE = CUS::360:031402:110702
+#EPICS_TIMEZONE = MET::-60:032802:103102
+#
+#	DST for 2022  US: Mar 13 - Nov 06
+#	              EU: Mar 27 - Oct 30
+#EPICS_TIMEZONE = CUS::360:031302:110602
+#EPICS_TIMEZONE = MET::-60:032702:103002
 
 # EPICS_TS_NTP_INET
 #	NTP time server ip address for VxWorks and RTEMS.
@@ -70,8 +74,11 @@ EPICS_TS_NTP_INET=
 #	Prompt string
 # IOCSH_HISTSIZE
 #	Number of lines of command history to keep.
+# IOCSH_HISTEDIT_DISABLE
+# 	Prevents use of readline or equivalent if defined.
 IOCSH_PS1="epics> "
 IOCSH_HISTSIZE=50
+IOCSH_HISTEDIT_DISABLE=
 
 # Log Server:
 # EPICS_IOC_LOG_INET 

configure/RULES.Db

@@ -8,10 +8,12 @@
 #*************************************************************************
 #RULES.Db
 
-# Set db substitutions file suffix
+# Set db substitutions and template file suffixes
 SUBST_SUFFIX ?= .substitutions
+TEMPL_SUFFIX ?= .template
 
-#####################################################  vpath
+#---------------------------------------------------------------
+# vpath
 
 vpath %.pm $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
 vpath %.pod $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
@@ -19,12 +21,13 @@ vpath %.dbd $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
 vpath %.db $(USR_VPATH) $(SRC_DIRS) $(dir $(DB))
 vpath %.vdb $(USR_VPATH) $(SRC_DIRS) $(dir $(DB))
 vpath %$(SUBST_SUFFIX) $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
-vpath %.template $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
+vpath %$(TEMPL_SUFFIX) $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
 vpath bpt%.data $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
 vpath %.acf $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
 vpath %.acs $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
 
-##################################################### dbflags dbdflags
+#---------------------------------------------------------------
+# dbflags dbdflags
 
 DBD_SEARCH_DIRS = . .. $(COMMON_DIR) $(SRC_DIRS) $(INSTALL_DBD) $(RELEASE_DBD_DIRS)
 DB_SEARCH_DIRS = . .. $(COMMON_DIR) $(SRC_DIRS) $(INSTALL_DB) $(RELEASE_DB_DIRS)
@@ -33,13 +36,15 @@ DBDFLAGS = $(USR_DBDFLAGS) $(CMD_DBDFLAGS) $(addprefix -I,$(DBD_SEARCH_DIRS))
 DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) $(CMD_DBFLAGS) $(addprefix -I,$(DB_SEARCH_DIRS))
 REGRDDFLAGS = $(DBDFLAGS) $($*_REGRDDFLAGS) $(USR_REGRDDFLAGS) $(CMD_REGRDDFLAGS)
 
-##################################################### Targets
+#---------------------------------------------------------------
+# Targets
 
 # ---------------------------------------------------
 # To allow os specific dbd files AND have the -j option work properly,
 
-CROSS_TARGET_OS_TYPES = $(sort $(foreach target,  \
-    $(EPICS_HOST_ARCH) $(CROSS_COMPILER_TARGET_ARCHS),$(firstword $(subst -, ,$(target)))))
+CROSS_TARGET_OS_TYPES = $(sort $(foreach target, \
+    $(EPICS_HOST_ARCH) $(CROSS_COMPILER_TARGET_ARCHS), \
+    $(firstword $(subst -, ,$(target)))))
 DBD += $(foreach type, $(CROSS_TARGET_OS_TYPES), $(DBD_$(type)))
 
 # Users add os specific dbd files to a Makefile as follows
@@ -86,31 +91,28 @@ SOURCE_DB_bbb = $(foreach dir, $(GENERIC_SRC_DIRS), $(SOURCE_DB_aaa)  )
 SOURCE_DB_aaa = $(addsuffix /$(file), $(dir) )
 
 COMMONS = $(COMMON_DIR)/*.dbd $(COMMON_DIR)/*.db $(COMMON_DIR)/*.h \
-          $(COMMON_DIR)/*$(SUBST_SUFFIX) $(COMMON_DIR)/*.template
+          $(COMMON_DIR)/*$(SUBST_SUFFIX) $(COMMON_DIR)/*$(TEMPL_SUFFIX)
 
 # Remove trailing numbers (to 99) on stem
-TEMPLATE1=$(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%,$(patsubst %4,%, \
-          $(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%,$(patsubst %8,%,$(patsubst %9,%, \
-          $*))))))))))
-TEMPLATE2=$(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%,$(patsubst %4,%, \
-          $(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%,$(patsubst %8,%,$(patsubst %9,%, \
-          $(TEMPLATE1)))))))))))
-TEMPLATE3=$(addsuffix .template,$(addprefix ../,$(TEMPLATE2)))
-TEMPLATE_FILENAME=$(firstword $(wildcard $($*_TEMPLATE) $(addprefix ../,$($*_TEMPLATE)) ../$*.template $(TEMPLATE3) ../template))
-
-# dbst based database optimization
-ifeq '$(DB_OPT)' 'YES'
-RAW=.raw
-DBS = $(filter %.db,$(DB)) $(addsuffix $(RAW),$(filter %.db,$(DB)))
-COMMON_DBS = $(addprefix $(COMMON_DIR)/,$(DBS))
-endif
+TEMPLATE1 = $(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%, \
+            $(patsubst %4,%,$(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%, \
+            $(patsubst %8,%,$(patsubst %9,%,$*))))))))))
+TEMPLATE2 = $(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%, \
+            $(patsubst %4,%,$(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%, \
+            $(patsubst %8,%,$(patsubst %9,%,$(TEMPLATE1)))))))))))
+TEMPLATE3 = $(addsuffix $(TEMPL_SUFFIX),$(addprefix ../,$(TEMPLATE2)))
+TEMPLATE_FILENAME = $(firstword $(wildcard $($*_TEMPLATE) \
+            $(addprefix ../,$($*_TEMPLATE)) ../$*$(TEMPL_SUFFIX) $(TEMPLATE3) \
+            ../template))
 
 INSTALL_DB_INSTALLS = $(addprefix $(INSTALL_DB)/,$(notdir $(DB_INSTALLS)))
 INSTALL_DBD_INSTALLS = $(addprefix $(INSTALL_DBD)/,$(notdir $(DBD_INSTALLS)))
 
 COMMONDEP_TARGET = $(COMMON_DIR)/$(basename $@)
 
-#####################################################  acf files
+#---------------------------------------------------------------
+# acf files
+
 # An access security configuration file, *.acf, can be created from
 # an *.acs file (has format of acf file plus #include "filename" lines)
 
@@ -123,7 +125,8 @@ ACF_INCLUDES = -I. $(TARGET_INCLUDES) $(USR_INCLUDES)\
 ACFDEPENDS_CMD = $(MKMF) -m $@ $(ACF_INCLUDES) $(COMMONDEP_TARGET) $<
 ACF_CMD = $(CPP) $(ACF_CPPFLAGS) $(ACF_INCLUDES) $< > $@
 
-#####################################################  dependancies
+#---------------------------------------------------------------
+# dependencies
 
 HINC += $(addsuffix .h,$(DBDINC_NAME))
 COMMON_DBDINC += $(addprefix $(COMMON_DIR)/,$(HINC))
@@ -133,12 +136,12 @@ DBDDEPENDS_FILES += $(addsuffix $(DEP),$(HINC) \
                     $(patsubst $(COMMON_DIR)/%,%, \
                     $(filter-out $(COMMON_DIR)/bpt%.dbd,$(COMMON_DBDS))))
 
-##################################################### 
+#---------------------------------------------------------------
 
 ifndef T_A
 
 DEP = .d
-TEMPLATE3+=$(addsuffix .template, $(TEMPLATE2))
+TEMPLATE3 += $(addsuffix $(TEMPL_SUFFIX), $(TEMPLATE2))
 
 COMMON_DIR = .
 INSTALL_DBDS =
@@ -153,18 +156,13 @@ ACTIONS += install
 ACTIONS += buildInstall
 ACTIONS += runtests tapfiles clean-tests test-results junitfiles
 
-actionArchTargets = $(foreach x, $(ACTIONS),\ $(foreach arch,$(BUILD_ARCHS), $(x)$(DIVIDER)$(arch)))
+actionArchTargets = $(foreach action, $(ACTIONS), \
+    $(foreach arch, $(BUILD_ARCHS), $(action)$(DIVIDER)$(arch)))
+cleanArchTargets = $(foreach arch, $(BUILD_ARCHS), clean$(DIVIDER)$(arch))
 
-cleanArchTargets = $(foreach arch,$(BUILD_ARCHS), clean$(DIVIDER)$(arch))
 -include $(TOP)/configure/CONFIG_APP_INCLUDE
 
 all: install
-ifeq ($(EPICS_HOST_ARCH),$(T_A))
-host: install
-else
-# Do nothing
-host:
-endif
 
 install: buildInstall
 
@@ -172,23 +170,32 @@ buildInstall : build
 
 rebuild: clean install
 
-.PHONY: all host $(ACTIONS)
+.PHONY: all $(ACTIONS)
 
 $(actionArchTargets) $(BUILD_ARCHS): install
 $(cleanArchTargets): clean
 
 .PHONY: $(BUILD_ARCHS) $(actionArchTargets) $(cleanArchTargets)
 
-endif # T_A defined
+else
+  # T_A is defined
+  ifeq ($(EPICS_HOST_ARCH),$(T_A))
+    host: install
+  else
+    host:
+  endif
+
+  .PHONY: host
+endif # T_A
 
 ifneq (,$(strip $(DBDDEPENDS_FILES)))
 -include $(DBDDEPENDS_FILES)
 endif
 
-#####################################################  build dependancies, clean rule
+#---------------------------------------------------------------
+# build dependancies, clean rule
 
-inc : $(COMMON_INC) $(INSTALL_INC) $(COMMON_DBDS) $(COMMON_DBDCATS) \
-	$(INSTALL_DBDS) $(INSTALL_DBD_INSTALLS)
+inc : $(COMMON_INC) $(INSTALL_INC)
 
 build : $(COMMON_DBDS) $(COMMON_DBS) $(COMMON_DBDCATS) \
 	$(INSTALL_DBDS) $(INSTALL_DBS) \
@@ -206,7 +213,8 @@ db_clean :
 
 realclean: clean
 
-##################################################### Dependency files
+#---------------------------------------------------------------
+# Dependency files
 
 %Record.h$(DEP): $(COMMON_DIR)/%Record.dbd
 	@$(RM) $@
@@ -257,19 +265,19 @@ menu%.h$(DEP): ../menu%.dbd
 	@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $($*_DBD) > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-%.db$(RAW)$(DEP): %$(SUBST_SUFFIX)
+%.db$(DEP): %$(SUBST_SUFFIX)
 	@$(RM) $@
 	$(MSI3_15) -D $(DBFLAGS) -o $(COMMONDEP_TARGET) -S$< $(TEMPLATE_FILENAME) > $@
 
-%.db$(RAW)$(DEP): ../%$(SUBST_SUFFIX)
+%.db$(DEP): ../%$(SUBST_SUFFIX)
 	@$(RM) $@
 	$(MSI3_15) -D $(DBFLAGS) -o $(COMMONDEP_TARGET) -S$< $(TEMPLATE_FILENAME) > $@
 
-%.db$(RAW)$(DEP): %.template
+%.db$(DEP): %$(TEMPL_SUFFIX)
 	@$(RM) $@
 	$(MSI3_15) -D $(DBFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 
-%.db$(RAW)$(DEP): ../%.template
+%.db$(DEP): ../%$(TEMPL_SUFFIX)
 	@$(RM) $@
 	$(MSI3_15) -D $(DBFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 
@@ -283,14 +291,8 @@ menu%.h$(DEP): ../menu%.dbd
 
 .PRECIOUS: %$(DEP)
 
-##################################################### CapFast filter
-
-$(COMMON_DIR)/%.edf: ../%.sch $(DEPSCHS) 
-	@$(RM) $@
-	@if [ ! -f cad.rc -a -r ../cad.rc ] ; then ln -s ../cad.rc ; fi
-	$(SCH2EDIF) $(SCH2EDIF_SYSFLAGS) $(SCH2EDIF_FLAGS) -o $@  $<
-
-##################################################### Substitution files
+#---------------------------------------------------------------
+# Substitution files
 
 #  WARNING: CREATESUBSTITUTIONS script needs output dir on command line
 
@@ -311,25 +313,21 @@ $(INSTALL_DB)/%$(SUBST_SUFFIX): ../%$(SUBST_SUFFIX)
 
 .PRECIOUS: $(COMMON_DIR)/%$(SUBST_SUFFIX)
 
-##################################################### Template files
+#---------------------------------------------------------------
+# Template files
 
-$(COMMON_DIR)/%.template: $(COMMON_DIR)/%.edf 
-	@$(RM) $@
-	$(E2DB) $(E2DB_SYSFLAGS) $(E2DB_FLAGS) -n $@.VAR $<
-	@$(REPLACEVAR) < $@.VAR > $@
-	@$(RM) $@.VAR
-
-$(INSTALL_DB)/%.template: %.template
+$(INSTALL_DB)/%$(TEMPL_SUFFIX): %$(TEMPL_SUFFIX)
 	$(ECHO) "Installing template file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
-$(INSTALL_DB)/%.template: ../%.template
+$(INSTALL_DB)/%$(TEMPL_SUFFIX): ../%$(TEMPL_SUFFIX)
 	$(ECHO) "Installing template file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
-.PRECIOUS: $(COMMON_DIR)/%.template
+.PRECIOUS: $(COMMON_DIR)/%$(TEMPL_SUFFIX)
 
-##################################################### INC files
+#---------------------------------------------------------------
+# INC files
 
 $(COMMON_DIR)/%Record.h: $(COMMON_DIR)/%Record.dbd
 	@$(RM) $(notdir $@)
@@ -363,7 +361,8 @@ $(COMMON_DIR)/menu%.h: ../menu%.dbd
 
 .PRECIOUS: $(COMMON_DIR)/%.h
 
-##################################################### DBD files
+#---------------------------------------------------------------
+# DBD files
 
 $(COMMON_DIR)/bpt%.dbd: bpt%.data
 	@$(RM) $(notdir $@)
@@ -426,56 +425,64 @@ $(foreach file, $(DBD_INSTALLS), $(eval $(call DBD_INSTALLS_template, $(file))))
 
 .PRECIOUS: $(COMMON_DBDS) $(COMMON_DIR)/%.dbd
 
-##################################################### HTML files
+#---------------------------------------------------------------
+# HTML files
 
-$(COMMON_DIR)/%.html: %.dbd.pod $(TOOLS)/dbdToHtml.pl
-	@$(RM) $@ $(notdir $@)
-	$(PERL) $(TOOLS)/dbdToHtml.pl $(DBDFLAGS) -o $(notdir $@) $<
+$(COMMON_DIR)/%.html: %.dbd.pod
+	@$(RM) $(notdir $@)
+	$(DBDTOHTML) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: %.pod $(TOOLS)/podToHtml.pl
-	@$(RM) $@ $(notdir $@)
-	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
+$(COMMON_DIR)/%.html: %.pod
+	@$(RM) $(notdir $@)
+	$(PODTOHTML) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: %.pm $(TOOLS)/podToHtml.pl
-	@$(RM) $@ $(notdir $@)
-	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
+$(COMMON_DIR)/%.html: %.pm
+	@$(RM) $(notdir $@)
+	$(PODTOHTML) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: ../%.pm $(TOOLS)/podToHtml.pl
-	@$(RM) $@ $(notdir $@)
-	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
+$(COMMON_DIR)/%.html: ../%.pm
+	@$(RM) $(notdir $@)
+	$(PODTOHTML) -s -o $(notdir $@) $<
+	@$(MKDIR) $(dir $@)
 	@$(MV) $(notdir $@) $@
 
-.PRECIOUS: $(COMMON_DIR)/%.html
+$(COMMON_DIR)/%.html: ../%.pl
+	@$(RM) $(notdir $@)
+	$(PODTOHTML) -s -o $(notdir $@) $<
+	@$(MV) $(notdir $@) $@
 
-##################################################### DB files
+.PRECIOUS: $(COMMON_DIR)/%.html %.html
 
-$(COMMON_DIR)/%.db$(RAW): $(COMMON_DIR)/%.edf 
+#---------------------------------------------------------------
+# DB files
+
+$(COMMON_DIR)/%.db: $(COMMON_DIR)/%.edf 
 	$(E2DB) $(E2DB_SYSFLAGS) $(E2DB_FLAGS) -n $*.VAR $<
 	@$(REPLACEVAR) < $*.VAR > $@
 	@$(RM) $*.VAR
 
-$(COMMON_DIR)/%.db$(RAW): %$(SUBST_SUFFIX)
+$(COMMON_DIR)/%.db: %$(SUBST_SUFFIX)
 	$(ECHO) "Inflating database from $< $(TEMPLATE_FILENAME)"
 	@$(RM) $(notdir $@)
 	$(MSI3_15) $(DBFLAGS) -o $(notdir $@) -S$< $(TEMPLATE_FILENAME)
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.db$(RAW): ../%$(SUBST_SUFFIX)
+$(COMMON_DIR)/%.db: ../%$(SUBST_SUFFIX)
 	$(ECHO) "Inflating database from $< $(TEMPLATE_FILENAME)"
 	@$(RM) $(notdir $@)
 	$(MSI3_15) $(DBFLAGS) -o $(notdir $@) -S$< $(TEMPLATE_FILENAME)
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.db$(RAW): %.template
+$(COMMON_DIR)/%.db: %$(TEMPL_SUFFIX)
 	$(ECHO) "Inflating database from $<"
 	@$(RM) $(notdir $@)
 	$(MSI3_15) $(DBFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.db$(RAW): ../%.template
+$(COMMON_DIR)/%.db: ../%$(TEMPL_SUFFIX)
 	$(ECHO) "Inflating database from $<"
 	@$(RM) $(notdir $@)
 	$(MSI3_15) $(DBFLAGS) -o $(notdir $@) $<
@@ -493,22 +500,6 @@ $(COMMON_DIR)/%.acf: ../%.acs
 
 .PRECIOUS: $(COMMON_DIR)/%.acf
 
-# dbst based database optimization
-ifeq '$(DB_OPT)' 'YES'
-
-$(COMMON_DIR)/%.db$(RAW): ../%.db
-	@$(RM) $@
-	$(CP) $< $@
-
-$(COMMON_DIR)/%.db: $(COMMON_DIR)/%.db$(RAW)
-	$(ECHO) "Optimizing database $@"
-	@$(RM) $@
-	$(DBST) . $< -d > $@
-
-.PRECIOUS: $(COMMON_DIR)/%.db
-.PRECIOUS: $(DB:%=$(COMMON_DIR)/%$(RAW))
-else
-
 $(INSTALL_DB)/%: %
 	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
@@ -516,7 +507,6 @@ $(INSTALL_DB)/%: %
 $(INSTALL_DB)/%: ../%
 	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
-endif
 
 $(INSTALL_DB)/%.db: $(COMMON_DIR)/%.db
 	$(ECHO) "Installing created db file $@"
@@ -532,8 +522,8 @@ $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))
 .PRECIOUS: $(COMMON_DIR)/%.edf
 .PRECIOUS: $(COMMON_DBS)
 
-##################################################### register record,device,driver support
-
+#---------------------------------------------------------------
+# register record,device,driver support
 
 %_registerRecordDeviceDriver.cpp: $(COMMON_DIR)/%.dbd
 	@$(RM) $@
@@ -549,4 +539,3 @@ $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))
 
 .PRECIOUS: %_registerRecordDeviceDriver.cpp
 
-##################################################### END OF FILE

configure/RULES_BUILD

@@ -86,39 +86,35 @@ endif
 #---------------------------------------------------------------
 # Include defines and rules for prod, library and test* targets
 
-ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) \
-        $(LOADABLE_LIBRARY)))
+#ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRARY) ))
 include $(CONFIG)/RULES_TARGET
-endif
+#endif
 
 #---------------------------------------------------------------
 # Read dependency files
 
-ifneq (inc,$(strip $(MAKECMDGOALS)))
 ifneq (,$(strip $(HDEPENDS_FILES)))
 $(filter-out $(wildcard *$(DEP)), $(HDEPENDS_FILES)): | $(COMMON_INC)
 -include $(HDEPENDS_FILES)
 endif
-endif
 
 #---------------------------------------------------------------
 #   Products and Object libraries
 #
 PRODTARGETS += $(PRODNAME) $(MUNCHNAME) $(CTDT_SRCS) $(CTDT_OBJS) $(NMS)
-TESTPRODTARGETS += $(TESTPRODNAME) $(TESTMUNCHNAME)
 
 #---------------------------------------------------------------
-#   Test result files
+#   Test specifications and test result files
 #
+ifneq (,$(strip $(TESTS)))
+TARGETS += testspec
+endif
 
-# Enable testing if this host can run tests for the current target
-ifneq (,$(filter $(T_A), $(EPICS_HOST_ARCH) $(CROSS_COMPILER_RUNTEST_ARCHS)))
+# Enable testing if this host can run tests on the current target
+ifneq (,$(findstring $(T_A),$(EPICS_HOST_ARCH) $(CROSS_COMPILER_RUNTEST_ARCHS)))
 RUNTESTS_ENABLED = YES
-TESTSCRIPTS.t = $(filter %.t, $(TESTSCRIPTS))
-TAPFILES.t += $(TESTSCRIPTS.t:.t=.tap)
-JUNITFILES.t += $(TESTSCRIPTS.t:.t=-results.xml)
-TAPFILES += $(TAPFILES.t)
-JUNITFILES += $(JUNITFILES.t)
+TAPFILES += $(TESTSCRIPTS:.t=.tap)
+JUNITFILES += $(TAPFILES:.tap=.xml)
 endif
 
 #---------------------------------------------------------------
@@ -144,17 +140,17 @@ rebuild: clean install
 
 build: inc
 
-build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODTARGETS) \
+build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODNAME) \
 	$(TARGETS) $(TESTSCRIPTS) $(INSTALL_LIB_INSTALLS)
 
-inc : $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS) \
-	$(INSTALL_HTMLS)
+inc : $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS)
 
 buildInstall : \
 	$(INSTALL_SCRIPTS) $(INSTALL_PROD) $(INSTALL_MUNCHS) \
 	$(INSTALL_TCLLIBS) $(INSTALL_TCLINDEX) \
 	$(INSTALL_OBJS) \
 	$(INSTALL_DOCS) \
+	$(INSTALL_HTMLS) \
 	$(INSTALL_TEMPLATE) \
 	$(INSTALL_BIN_INSTALLS)
 
@@ -162,21 +158,20 @@ clean: build_clean
 
 build_clean:
 	$(ECHO) "Cleaning"
-	@$(RM) *.i *$(OBJ) *.a \
+	@$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) \
 	$(LIBNAME) $(TESTLIBNAME) $(SHRLIBNAME) $(TESTSHRLIBNAME) \
 	$(DLLSTUB_LIBNAME) $(TESTDLLSTUB_LIBNAME) \
 	$(LOADABLE_SHRLIBNAME) \
 	$(INC) $(TARGETS) $(TDS) $(CLEANS) \
 	*.out MakefileInclude *.manifest *.exp \
-	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) $(TESTPRODTARGETS) \
+	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) \
 	$(TESTSCRIPTS) $(TAPFILES) $(JUNITFILES)
 ifdef RES
 	@$(RM) *$(RES)
 endif
 
-# Sort mkdir targets to remove duplicates & make parents first
-$(DIRECTORY_TARGETS):
-	$(MKDIR) $(sort $@)
+$(DIRECTORY_TARGETS) :
+	$(MKDIR) $@
 
 # Install LIB_INSTALLS libraries before linking executables
 $(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIB_INSTALLS)
@@ -259,13 +254,15 @@ YACCOPT ?= $($*_YACCOPT)
 	$(MV) $*.tab.c $*.c
 	$(if $(findstring -d, $(YACCOPT)),$(MV) $*.tab.h $*.h,)
 
-# must be a separate rule since when not using '-d' the
+# must be a seperate rule since when not using '-d' the
 # prefix for .h will be different then .c
 %.h : %.c %.y
 
 %.c: %.l
+	@$(RM) $*.yy.c
+	$(LEX) $(LEXOPT) -t $< > $*.yy.c
 	@$(RM) $@
-	$(LEX) $(LEXOPT) -o$@ $<
+	$(MV) $*.yy.c $@
 
 #---------------------------------------------------------------
 # Libraries, shared/DLL and stubs
@@ -324,10 +321,6 @@ $(MUNCHNAME): %$(MUNCH_SUFFIX): $(MUNCH_DEPENDS) %$(EXE)
 	@$(RM) $@
 	$(MUNCH_CMD)
 
-$(TESTMUNCHNAME): %$(MUNCH_SUFFIX): $(MUNCH_DEPENDS) %$(EXE)
-	@$(RM) $@
-	$(MUNCH_CMD)
-
 #---------------------------------------------------------------
 # GeSys modules for RTEMS
 $(MODNAME): %$(MODEXT): %$(EXE)
@@ -335,55 +328,59 @@ $(MODNAME): %$(MODEXT): %$(EXE)
 	@$(RM) $@
 	$(LINK.mod)
 
+#---------------------------------------------------------------
+# Generate Perl include path module
+%ModuleDirs.pm: $(wildcard $(TOP)/configure/RELEASE*)
+	@$(MKDIR) $(dir $@)
+	$(CONVERTRELEASE) -T $(TOP) $@
+
 #---------------------------------------------------------------
 # Automated testing
 
-runtests: run-tap-tests
-run-tap-tests: $(TESTSCRIPTS.t)
-ifneq ($(TESTSCRIPTS.t),)
+runtests: $(TESTSCRIPTS)
 ifdef RUNTESTS_ENABLED
-	$(ECHO) "$(PROVE) $^"
-	@$(PROVE) $^ || $(PROVE_FAILURE)
-endif
+	-$(PERL) -MTest::Harness -e 'runtests @ARGV if @ARGV;' $^
 endif
 
-tapfiles: $(TAPFILES)
-junitfiles: $(JUNITFILES)
+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))" >> $@)
 
-test-results: tap-results
-tap-results: $(TAPFILES)
-ifneq ($(strip $(TAPFILES)),)
+test-results: tapfiles
+ifneq ($(TAPFILES),)
 ifdef RUNTESTS_ENABLED
-	$(ECHO) "$(PROVE.tap) $^"
-	@$(PROVE.tap) $^ || $(PROVE_FAILURE)
+	prove --failures --ext .tap --exec "$(CAT)" --color $(TAPFILES)
 endif
-
-CURRENT_TAPFILES := $(wildcard $(TAPFILES))
-CURRENT_JUNITFILES := $(wildcard $(JUNITFILES))
 endif
 
 clean-tests:
-ifneq ($(CURRENT_TAPFILES)$(TAPS_FAILED_LOG),)
-	$(RM) $(CURRENT_TAPFILES) $(TAPS_FAILED_LOG)
+ifneq ($(TAPFILES),)
+	$(RM) $(TAPFILES)
 endif
-ifneq ($(CURRENT_JUNITFILES),)
-	$(RM) $(CURRENT_JUNITFILES)
+ifneq ($(JUNITFILES),)
+	$(RM) $(JUNITFILES)
 endif
 
+tapfiles: $(TESTSCRIPTS) $(TAPFILES)
+junitfiles: $(JUNITFILES)
+
 # A .tap file is the output from running the associated test script
-$(TAPFILES.t): %.tap: %.t
+%.tap: %.t
 ifdef RUNTESTS_ENABLED
-	$(ECHO) "$(PERL) $< -tap > $@"
-	@$(PERL) $< -tap > $@ || $(TAPFILE_FAILURE)
+	-$(PERL) $< -tap > $@
 endif
 
-$(JUNITFILES.t): %-results.xml: %.tap
+%.xml: %.tap
 	$(TAPTOJUNIT) --puretap --output $@ --input $< $*
 
 # If there's a perl test script (.plt) available, use it
 %.t: ../%.plt
 	@$(RM) $@
-	$(CP) $< $@
+	$(EXPAND_TOOL) -t $(INSTALL_LOCATION) -a $(T_A) $< $@
 
 # Test programs (.t files) must be written in Perl.
 # Generate a perl program to exec the real test binary.
@@ -391,6 +388,14 @@ $(JUNITFILES.t): %-results.xml: %.tap
 	@$(RM) $@
 	$(PERL) $(TOOLS)/makeTestfile.pl $@ $<
 
+#---------------------------------------------------------------
+# Generate header with version number from VCS
+
+ifneq ($(GENVERSION),)
+$(COMMON_DIR)/$(GENVERSION): FORCE
+	$(GENVERSIONHEADER) -t $(TOP) -N $(GENVERSIONMACRO) -V "$(GENVERSIONDEFAULT)" $@
+endif
+
 #---------------------------------------------------------------
 # Install rules for BIN_INSTALLS and LIB_INSTALLS
 
@@ -466,6 +471,7 @@ ifneq (,$(strip $(LOADABLE_SHRLIB_VERSION)))
 endif # LOADABLE_SHRLIB_VERSION
 endif # LOADABLE_SHRLIB_SUFFIX
 
+ifneq ($(INSTALL_CONFIGS),)
 $(INSTALL_CONFIG)/%: %
 	$(ECHO) "Installing config file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
@@ -473,6 +479,7 @@ $(INSTALL_CONFIG)/%: %
 $(INSTALL_CONFIG)/%: ../%
 	$(ECHO) "Installing config file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+endif
 
 $(INSTALL_INCLUDE)/% : $(COMMON_DIR)/%
 	$(ECHO) "Installing generated generic include file $@"
@@ -498,10 +505,6 @@ $(INSTALL_DOC)/%: ../%
 	$(ECHO) "Installing doc $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(INSTALL_DOC)
 
-$(INSTALL_HTML)/$(HTMLS_DIR)/%: $(COMMON_DIR)/%
-	$(ECHO) "Installing generated html $@"
-	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
-
 $(INSTALL_HTML)/$(HTMLS_DIR)/%: %
 	$(ECHO) "Installing html $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
@@ -510,6 +513,10 @@ $(INSTALL_HTML)/$(HTMLS_DIR)/%: ../%
 	$(ECHO) "Installing html $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
+$(INSTALL_HTML)/$(HTMLS_DIR)/%: $(COMMON_DIR)/%
+	$(ECHO) "Installing generated html $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+
 $(INSTALL_TEMPLATES_SUBDIR)/%: ../%
 	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
@@ -524,8 +531,8 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
 .PRECIOUS: $(COMMON_INC)
 
 .PHONY: all host inc build install clean rebuild buildInstall build_clean
-.PHONY: runtests run-tap-tests tapfiles junitfiles test-results tap-results
-.PHONY: clean-tests checkRelease warnRelease noCheckRelease
+.PHONY: runtests tapfiles clean-tests test-results junitfiles
+.PHONY: checkRelease warnRelease noCheckRelease FORCE
 
 endif # BASE_RULES_BUILD
 #	EOF RULES_BUILD

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))) | before-$(2)
+    $$(addsuffix $$(DIVIDER)$(2),$$(ddir)))
 endef
 $(foreach action, $(ACTIONS), \
     $(foreach dir, $(DIRS), \
@@ -79,22 +79,15 @@ $(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) $(beforeActions)
+.PHONY : $(ARCHS) $(ACTIONS)
 .PHONY : $(dirActionTargets) $(dirArchTargets)
 .PHONY : $(dirActionArchTargets)
 .PHONY : $(actionArchTargets)

configure/RULES_EXPAND

@@ -33,10 +33,8 @@ expand_clean:
 ASSEMBLE_TOOL ?= $(PERL) $(TOOLS)/assembleSnippets.pl
 
 define COMMON_ASSEMBLY_template
-ifneq '$$($1_PATTERN)' ''
 $1_SNIPPETS += $$(foreach dir, .. $$(SRC_DIRS), \
     $$(wildcard $$(dir)/$$($1_PATTERN)))
-endif
 $(COMMON_DIR)/$1: $$($1_SNIPPETS)
 	$(ECHO) "Assembling common file $$@ from snippets"
 	@$(RM) $1
@@ -47,10 +45,8 @@ $(foreach asy, $(COMMON_ASSEMBLIES), \
     $(eval $(call COMMON_ASSEMBLY_template,$(strip $(asy)))))
 
 define ASSEMBLY_template
-ifneq '$$($1_PATTERN)' ''
 $1_SNIPPETS += $$(foreach dir, .. $$(SRC_DIRS), \
     $$(wildcard $$(dir)/$$($1_PATTERN)))
-endif
 $1: $$($1_SNIPPETS)
 	$(ECHO) "Assembling file $$@ from snippets"
 	@$(RM) $$@

configure/RULES_TARGET

@@ -26,6 +26,7 @@ $(foreach target, $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRA
 
 #-----------------------------------------------------------------------
 
+# This define block requires GNU make 3.81
 define PROD_template
 ifeq ($$(strip $$($(1)_OBJS) $$($(1)_SRCS) $$(PRODUCT_OBJS)),)
 $(1)_OBJS = $(1)$$(OBJ)

configure/RULES_TOP

@@ -16,36 +16,41 @@ cvsclean:
 	$(PERL) $(CVSCLEAN)
 
 realuninstall: uninstallDirs
-	$(RMDIR) $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB)
+	$(RMDIR) $(INSTALL_LOCATION_BIN)
+	$(RMDIR) $(INSTALL_LOCATION_LIB)
 
 UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC) \
     $(INSTALL_HTML) $(INSTALL_TEMPLATES) $(INSTALL_DB) $(DIRECTORY_TARGETS)
+ifneq ($(INSTALL_LOCATION),$(TOP))
+UNINSTALL_DIRS += $(INSTALL_CONFIG)
+endif
 uninstallDirs:
 	$(RMDIR) $(UNINSTALL_DIRS)
 
-EMPTY_INSTALL_DIRS = \
-    $(if $(wildcard $(INSTALL_LOCATION_BIN)/*),,$(INSTALL_LOCATION_BIN)) \
-    $(if $(wildcard $(INSTALL_LOCATION_LIB)/*),,$(INSTALL_LOCATION_LIB))
 uninstall: archuninstall uninstallDirs
-	$(RMDIR) $(EMPTY_INSTALL_DIRS)
 
-archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS))
+archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS)) | cleandirs
 
+archPart = $(word 2, $(subst $(DIVIDER), ,$@))
 uninstall$(DIVIDER)%:
-	$(RMDIR) $(addsuffix /$(subst uninstall$(DIVIDER),,$@), \
-	    $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB))
+	$(RMDIR) $(INSTALL_LOCATION_BIN)/$(archPart)
+	$(RMDIR) $(INSTALL_LOCATION_LIB)/$(archPart)
+
+cleandirs:
+	@$(NOP)
+ifeq ($(wildcard $(INSTALL_LOCATION_BIN)/*),)
+	$(RMDIR) $(INSTALL_LOCATION_BIN)
+endif
+ifeq ($(wildcard $(INSTALL_LOCATION_LIB)/*),)
+	$(RMDIR) $(INSTALL_LOCATION_LIB)
+endif
 
-before-runtests before-test-results: rm-failure-file
-rm-failure-file:
-	@$(RM) $(TESTS_FAILED_PATH)
-runtests test-results:
-	$(SHOWTESTFAILURES)
 
 help:
 	@echo "Usage: gnumake [options] [target] ..."
 	@echo "Targets supported by all Makefiles:"
 	@echo "     all            - Same as install (default rule)"
-	@echo "     inc            - Installs header, dbd and html files"
+	@echo "     inc            - Installs header files"
 	@echo "     build          - Builds and installs all targets"
 	@echo "     install        - Builds and installs all targets"
 	@echo "     buildInstall   - Same as install (deprecated)"
@@ -73,8 +78,8 @@ help:
 	@echo "Indiv. object targets are supported by O.<arch> level Makefile .e.g"
 	@echo "     xxxRecord.o"
 
-.PHONY: distclean cvsclean realuninstall archuninstall uninstallDirs
-.PHONY: uninstall rm-failure-file help
+.PHONY: cleandirs distclean cvsclean realuninstall archuninstall uninstallDirs
+.PHONY: uninstall help
 
 # Include <top>/cfg/TOP_RULES* files from tops defined in RELEASE* files
 #

configure/os/CONFIG.Common.RTEMS

@@ -72,7 +72,7 @@ CPPFLAGS += $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS) $(OPT_CPPFLAGS)\
  $(USR_CPPFLAGS) $(CMD_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS)\
  $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
 
-ECHO = @$(if $(filter -s,$(MFLAGS)),$(NOP),echo)
+ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
 
 #--------------------------------------------------
 # Although RTEMS uses gcc, it wants to use gcc its own way
@@ -136,13 +136,6 @@ MOD_LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(POSIX_LDFLAGS) \
 LINK.mod = $(CCC) -o $@ $(PRODDIR_LDFLAGS) $(MOD_LDFLAGS)
 LINK.mod += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(MOD_LDLIBS)
 
-#--------------------------------------------------
-# Here munching means creating a bootable object binary
-ifdef MUNCH_SUFFIX
-  MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
-  TESTMUNCHNAME = $(TESTPRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
-endif
-
 #--------------------------------------------------
 # RTEMS has neither shared libraries nor dynamic loading
 STATIC_BUILD=YES

configure/os/CONFIG.Common.RTEMS-beatnik

@@ -15,6 +15,7 @@ ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_CLUSTER_SPACE=5120
 OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef

configure/os/CONFIG.Common.RTEMS-mvme2100

@@ -13,6 +13,7 @@ ARCH_DEP_CFLAGS += -DHAVE_PPCBUG
 OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems
 	gzip -f9 rtems

configure/os/CONFIG.Common.RTEMS-mvme2700

@@ -7,6 +7,7 @@ ARCH_DEP_CFLAGS += -DHAVE_PPCBUG
 ARCH_DEP_CFLAGS += -DNVRAM_INDIRECT
 
 MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems
 	gzip -f9 rtems

configure/os/CONFIG.Common.RTEMS-mvme3100

@@ -15,6 +15,7 @@ ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_CLUSTER_SPACE=5120
 OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef

configure/os/CONFIG.Common.RTEMS-mvme5500

@@ -16,6 +16,7 @@ ARCH_DEP_CFLAGS += -DBSP_NVRAM_BASE_ADDR=0xf1110000
 OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef

configure/os/CONFIG.Common.RTEMS-pc386

@@ -8,6 +8,7 @@
 RTEMS_TARGET_CPU=i386
 
 MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< temp.bin
 	$(BIN2BOOT) $@ 0x00097E00 \

configure/os/CONFIG.Common.RTEMS-uC5282

@@ -9,6 +9,7 @@ RTEMS_TARGET_CPU = m68k
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 
 MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< $@
 endef

configure/os/CONFIG.Common.darwin-aarch64

@@ -1,14 +0,0 @@
-# CONFIG.Common.darwin-aarch64
-#
-# This file is maintained by the build community.
-#
-# Definitions for darwin-aarch64 target builds
-# Sites may override these definitions in CONFIG_SITE.Common.darwin-aarch64
-#-------------------------------------------------------
-
-#
-# To build universal binaries, configure ARCH_CLASS
-# in the file CONFIG_SITE.Common.darwin-aarch64
-
-# Include definitions common to all Darwin targets
-include $(CONFIG)/os/CONFIG.darwinCommon.darwinCommon

configure/os/CONFIG.Common.vxWorksCommon

@@ -1,7 +1,7 @@
 # CONFIG.Common.vxWorksCommon
 #
 # Definitions for vxWorks target archs
-# Sites may override these definitions in CONFIG_SITE.Common.vxWorksCommon
+# Override these definitions in CONFIG_SITE.Common.vxWorksCommon
 # or CONFIG_SITE.<host>.vxWorksCommon
 #-------------------------------------------------------
 
@@ -63,8 +63,6 @@ VXWORKS_MAJOR_VERSION = $(basename $(basename $(VXWORKS_VERSION)))
 
 # These are needed for vxWorks 6.x; the GNU toolset version number
 # is in the path to the compiler tools:
-VX_GNU_VERSION_5.4 = 2.95
-VX_GNU_VERSION_5.5 = 2.96
 VX_GNU_VERSION_6.0 = 3.3.2
 VX_GNU_VERSION_6.1 = 3.3.2
 VX_GNU_VERSION_6.2 = 3.3.2
@@ -80,30 +78,21 @@ VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
 VX_GNU_MAJOR_VERSION = $(basename $(basename $(VX_GNU_VERSION)))
 
 #--------------------------------------------------
-# Fix WIND_BASE for vxWorks 6.x on linux
-# NB: We know the value of WIND_HOST_TYPE here, but not VXWORKS_VERSION
+# Fix old Linux WIND_HOST_TYPE
 ifeq ($(WIND_HOST_TYPE),x86-linux)
-  WIND_HOST_TYPE_5 = x86-linux
-  WIND_HOST_TYPE_6 = x86-linux2
-  WIND_HOST_TYPE = $(WIND_HOST_TYPE_$(VXWORKS_MAJOR_VERSION))
+  WIND_HOST_TYPE = x86-linux2
 endif
 
 #--------------------------------------------------
 # vxWorks directory definitions
-VX_DIR_5 = $(WIND_BASE)
-VX_DIR_6 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
-VX_DIR = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))
+VX_DIR = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
 
-VX_INCLUDE_DIRS_5 = $(VX_DIR)/target/h
-VX_INCLUDE_DIRS_6 = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
-GNU_TARGET_INCLUDE_DIR = $(VX_INCLUDE_DIRS_$(VXWORKS_MAJOR_VERSION))
+GNU_TARGET_INCLUDE_DIR = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
 
 #--------------------------------------------------
 # vxWorks GNU directories
 
-GNU_DIR_5 = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
-GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
-GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION))
+GNU_DIR = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
 
 #--------------------------------------------------
 # This finds nm on any supported VxWorks version
@@ -113,9 +102,7 @@ NM = $(firstword $(wildcard $(WIND_BASE)/*/$(WIND_HOST_TYPE)/bin/$(NMPROG)))
 
 #--------------------------------------------------
 # A linker script is essential for munching from vxWorks 6.6 onwards
-# (i.e. with versions that use gcc 4.1.2 or later).  It can be used
-# with any vxWorks 5 or 6 version, but apparently should not be used
-# when compiling for 68K (which isn't supported in vxWorks 6 anyway)
+# (i.e. with versions that use gcc 4.1.2 or later).
 MUNCH_LDFLAGS_6 = -T $(VX_DIR)/target/h/tool/gnu/ldscripts/link.OUT
 MUNCH_LDFLAGS = $(MUNCH_LDFLAGS_$(VXWORKS_MAJOR_VERSION))
 
@@ -131,11 +118,10 @@ export TOOL_FAMILY = GNU
 OP_SYS_CPPFLAGS += -DvxWorks=vxWorks
 OP_SYS_CFLAGS += -fno-builtin
 
-# Fix for vxWorks 5 headers that use macros defined in vxWorks.h but
+# Fix for vxWorks headers that use macros defined in vxWorks.h but
 # which don't actually include vxWorks.h themselves, for example the
 # target/h/sys/stat.h file which uses ULONG.  This also stops dbDefs.h
-# from defining the OFFSET macro, which generates lots of warnings in
-# both vxWorks 5 and 6.
+# from defining the OFFSET macro, which generates lots of warnings.
 OP_SYS_INCLUDE_CPPFLAGS += -include $(VX_DIR)/target/h/vxWorks.h
 
 #--------------------------------------------------
@@ -148,7 +134,6 @@ OPT_CXXFLAGS_YES = -O2
 CODE_CFLAGS =
 #
 # For vxWorks versions before 6.3 we need this g++ compiler flag
-CODE_CXXFLAGS_5 = -fno-implicit-templates
 CODE_CXXFLAGS_6.0 = -fno-implicit-templates
 CODE_CXXFLAGS_6.1 = -fno-implicit-templates
 CODE_CXXFLAGS_6.2 = -fno-implicit-templates
@@ -185,12 +170,6 @@ COMPILE.ctdt = $(CC) -c $(CPPFLAGS) $(CFLAGS_ctdt) $(INCLUDES) $(SOURCE_FLAG)
 VXCPPFLAGS = $(filter-out $(OP_SYS_INCLUDE_CPPFLAGS),$(CPPFLAGS))
 PREPROCESS.cpp = $(CPP) $(VXCPPFLAGS) $(INCLUDES) $< > $@
 
-#--------------------------------------------------
-# Don't use gcc 2.x for dependency generation
-
-HDEPENDS_METHOD_2 = MKMF
-HDEPENDS_METHOD = $(firstword $(HDEPENDS_METHOD_$(VX_GNU_MAJOR_VERSION)) COMP)
-
 #--------------------------------------------------
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.Common.vxWorksCommon

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 -D__USE_MINGW_ANSI_STDIO
+OP_SYS_CPPFLAGS = -D_MINGW
 
 EXE = .exe
 RES = .coff

configure/os/CONFIG.UnixCommon.Common

@@ -8,7 +8,7 @@
 CP = cp
 MV = mv
 RM = rm -f
-MKDIR = mkdir
+MKDIR = mkdir -p
 RMDIR = rm -rf
 CAT = cat
 

configure/os/CONFIG.darwin-aarch64.Common

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

configure/os/CONFIG.darwinCommon.darwinCommon

@@ -65,14 +65,14 @@ GNU = NO
 #
 # Darwin shared libraries
 #
-SHRLIB_LDFLAGS = -dynamiclib -undefined dynamic_lookup \
+SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined suppress \
     -install_name $(shell $(FULLPATHNAME) $(INSTALL_LIB))/$@ \
     $(addprefix -compatibility_version , $(SHRLIB_VERSION)) \
     $(addprefix -current_version , $(SHRLIB_VERSION))
 SHRLIB_SUFFIX_BASE = .dylib
 SHRLIB_SUFFIX = $(addprefix ., $(SHRLIB_VERSION))$(SHRLIB_SUFFIX_BASE)
 
-LOADABLE_SHRLIB_LDFLAGS = -bundle -undefined dynamic_lookup
+LOADABLE_SHRLIB_LDFLAGS = -bundle -flat_namespace -undefined suppress
 
 #
 # Position-independent code is the default on Darwin.

configure/os/CONFIG.linux-386.Common

@@ -7,4 +7,4 @@
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
-WIND_HOST_TYPE = x86-linux
+WIND_HOST_TYPE = x86-linux2

configure/os/CONFIG.linux-486.Common

@@ -7,4 +7,4 @@
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
-WIND_HOST_TYPE = x86-linux
+WIND_HOST_TYPE = x86-linux2

configure/os/CONFIG.linux-586.Common

@@ -7,4 +7,4 @@
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
-WIND_HOST_TYPE = x86-linux
+WIND_HOST_TYPE = x86-linux2

configure/os/CONFIG.linux-686.Common

@@ -7,4 +7,4 @@
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
-WIND_HOST_TYPE = x86-linux
+WIND_HOST_TYPE = x86-linux2

configure/os/CONFIG.linux-x86.Common

@@ -7,4 +7,4 @@
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
-WIND_HOST_TYPE = x86-linux
+WIND_HOST_TYPE = x86-linux2

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

@@ -4,5 +4,21 @@
 # Override these definitions in CONFIG_SITE.linux-x86.windows-x64-mingw
 #-------------------------------------------------------
 
-# Use the definitions from the win32-x86-mingw target
-include $(CONFIG)/os/CONFIG.linux-x86.win32-x86-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

configure/os/CONFIG.linux-x86_64.Common

@@ -7,4 +7,4 @@
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
-WIND_HOST_TYPE = x86-linux
+WIND_HOST_TYPE = x86-linux2

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

@@ -49,9 +49,9 @@ OPT_CFLAGS_YES_NO = -Ox -Oy-
 OPT_CFLAGS_YES = $(OPT_CFLAGS_YES_$(OPT_WHOLE_PROGRAM))
 
 #
-# -Z7 generate C7 compatible debugging information (inside .obj)
+# -Zi generate program database for debugging information
 # -RTCsu enable run-time error checks
-OPT_CFLAGS_NO = -Z7 -RTCsu
+OPT_CFLAGS_NO = -Zi -RTCsu
 
 # specify object file name and location
 OBJ_CFLAG = -Fo
@@ -79,20 +79,16 @@ CPP = cl -nologo -C -E
 
 # Configure OS vendor C++ compiler
 #
+# __STDC__=0 gives us both:
+# 1) define STDC for code (pretend ANSI conformance)
+# 2) set it to 0 to use MS C "extensions" (open for _open etc.)
+# because MS uses:   if __STDC__ ... disable many nice things
+#
 # -EHsc - generate code for exceptions
 # -GR - generate code for run time type identification
 #
 CCC = cl -EHsc -GR
-
-# Other compiler flags, used for CPP, C and C++
-#
-# -FC - Show absolute path of source file in diagnostics
-# -D__STDC__=0 gives us both:
-#   1) define STDC for code (pretend ANSI conformance)
-#   2) set it to 0 to use MS C "extensions" (open for _open etc.)
-#   because MS uses:   if __STDC__ ... disable many nice things
-#
-CODE_CPPFLAGS += -nologo -FC -D__STDC__=0
+CODE_CPPFLAGS += -nologo -D__STDC__=0
 CODE_CPPFLAGS += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
 
 
@@ -116,9 +112,9 @@ OPT_CXXFLAGS_YES_NO = -Ox -Oy-
 OPT_CXXFLAGS_YES = $(OPT_CXXFLAGS_YES_$(OPT_WHOLE_PROGRAM))
 
 #
-# -Z7 generate C7 compatible debugging information (inside .obj)
+# -Zi generate program database for debugging information
 # -RTCsu enable run-time error checks
-OPT_CXXFLAGS_NO = -RTCsu -Z7
+OPT_CXXFLAGS_NO = -RTCsu -Zi
 
 # specify object file name and location
 OBJ_CXXFLAG = -Fo
@@ -140,6 +136,7 @@ STATIC_LDLIBS_NO=
 STATIC_LDFLAGS=
 RANLIB=
 
+#
 # add -profile here to run the ms profiler
 # -LTCG whole program optimization
 # -incremental:no full linking

configure/os/CONFIG_SITE.Common.darwin-aarch64

@@ -1,9 +0,0 @@
-# CONFIG_SITE.Common.darwin-aarch64
-#
-# Site override definitions for darwin-aarch64 target builds
-#-------------------------------------------------------
-
-#
-#   arm64 devices:  Apple Silicon M1
-
-ARCH_CLASS = arm64

configure/os/CONFIG_SITE.Common.linux-arm

@@ -1,35 +1,39 @@
 # CONFIG_SITE.Common.linux-arm
 #
-# Site-specific settings for the linux-arm target
+# Site Specific definitions for all linux-arm targets
+#-------------------------------------------------------
 
-# NOTE: In most cases if SHARED_LIBRARIES is set to YES the
+# 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
+# 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.
 
-# 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))
+# No other libraries needed (recent Fedora, Ubuntu etc.):
+#COMMANDLINE_LIBRARY = READLINE
 
-# 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:
+# Needs -lncurses (RHEL 5 etc.):
 #COMMANDLINE_LIBRARY = READLINE_NCURSES
 
-# Needs -lcurses:
+# Needs -lcurses (older versions)
 #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

configure/os/CONFIG_SITE.Common.linux-cris

@@ -1,8 +1,9 @@
 # CONFIG_SITE.Common.linux-cris
 #
-# Site-specific settings for the linux-cris target
+# Site Specific definitions for linux-cris target
+# Only the local epics system manager should modify this file
 
-# NOTE: In most cases if SHARED_LIBRARIES is set to YES the
+# 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:
@@ -14,21 +15,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.
 
-# Use GNU Readline if the header file is installed
-COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
-    $(GNU_DIR)/include/readline/readline.h), READLINE, EPICS))
+# No other libraries needed (recent Fedora, Ubuntu etc.):
+#COMMANDLINE_LIBRARY = READLINE
 
-# 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:
+# Needs -lncurses (RHEL 5 etc.):
 #COMMANDLINE_LIBRARY = READLINE_NCURSES
 
-# Needs -lcurses:
+# Needs -lcurses (older versions)
 #COMMANDLINE_LIBRARY = READLINE_CURSES
 
-# Readline is broken or you don't want use it:
-#COMMANDLINE_LIBRARY = EPICS
+
+OP_SYS_CFLAGS += -g
+

configure/os/CONFIG_SITE.Common.linux-microblaze

@@ -1,6 +1,7 @@
 # CONFIG_SITE.Common.linux-microblaze
 #
-# Site-specific settings for the linux-microblaze target
+# Site specific definitions for linux-microblaze target builds.
+#-------------------------------------------------------
 
 # The gnu tools for cross compiling for MicroBlaze (little endian)
 # on Linux can be downloaded from the Xilinx git server:
@@ -11,21 +12,3 @@
 
 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,8 +1,9 @@
 # CONFIG_SITE.Common.linux-x86
 #
-# Site-specific settings for the linux-x86 target
+# Site Specific definitions for linux-x86 target
+# Only the local epics system manager should modify this file
 
-# NOTE: In most cases if SHARED_LIBRARIES is set to YES the
+# 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:
@@ -14,15 +15,14 @@
 # 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.
 
-# 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.
+# No other libraries needed (recent Fedora, Ubuntu etc.):
+COMMANDLINE_LIBRARY = READLINE
 
 # Needs -lncurses (RHEL 5 etc.):
 #COMMANDLINE_LIBRARY = READLINE_NCURSES
@@ -30,9 +30,6 @@ COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
 # Needs -lcurses (older versions)
 #COMMANDLINE_LIBRARY = READLINE_CURSES
 
-# Readline is broken or you don't want use it:
-#COMMANDLINE_LIBRARY = EPICS
-
 
 # Permit access to 64-bit file-systems
 OP_SYS_CFLAGS += -D_FILE_OFFSET_BITS=64
@@ -46,6 +43,14 @@ OP_SYS_CFLAGS += -D_FILE_OFFSET_BITS=64
 #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

configure/os/CONFIG_SITE.Common.linux-x86_64

@@ -1,8 +1,9 @@
 # CONFIG_SITE.Common.linux-x86_64
 #
-# Site-specific settings for the linux-x86_64 target
+# Site Specific definitions for linux-x86_64 target
+# Only the local epics system manager should modify this file
 
-# NOTE: In most cases if SHARED_LIBRARIES is set to YES the
+# 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:
@@ -14,15 +15,14 @@
 # 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.
 
-# 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.
+# No other libraries needed (recent Fedora, Ubuntu etc.):
+COMMANDLINE_LIBRARY = READLINE
 
 # Needs -lncurses (RHEL 5 etc.):
 #COMMANDLINE_LIBRARY = READLINE_NCURSES
@@ -30,9 +30,6 @@ COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
 # Needs -lcurses (older versions)
 #COMMANDLINE_LIBRARY = READLINE_CURSES
 
-# Readline is broken or you don't want use it:
-#COMMANDLINE_LIBRARY = EPICS
-
 
 # Uncomment the followings lines to build with CLANG instead of GCC.
 #
@@ -42,6 +39,14 @@ COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
 #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 64-bit cpu-type
 # (e.g. generic, native, core2, nocona, k8, opteron, athlon64, barcelona etc.)
 GNU_TUNE_CFLAGS = -mtune=generic

configure/os/CONFIG_SITE.Common.linux-xscale_be

@@ -1,23 +1,4 @@
 # CONFIG_SITE.Common.linux-xscale_be
 #
-# 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
+# Site specific definitions for all linux-xscale_be target builds.
+#-------------------------------------------------------

configure/os/CONFIG_SITE.Common.linuxCommon

@@ -1,11 +0,0 @@
-# CONFIG_SITE.Common.linuxCommon
-#
-# Site-specific settings for all linux targets
-
-
-# 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.Common.vxWorksCommon

@@ -1,21 +1,13 @@
 # CONFIG_SITE.Common.vxWorksCommon
 #
 # Site specific definitions for vxWorks target builds.
-# Only the local epics system manager should modify this file
 
 # Compiler options can vary with the vxWorks version number, so we
-# need to know that.  However don't include any third-level digits
-# (e.g. the .2 in 5.5.2) because we don't need them.
+# need to know that.  Do not include any third-level digits.
 
-# Note: vxWorks 5.4.x (Tornado 2.0.x) is not supported
+# Note: vxWorks 5.4.x and 5.5.x (Tornado 2.x) are not supported.
+# VxWorks 6.0 through 6.5 use older, untested versions of GCC.
 
-#VXWORKS_VERSION = 5.5
-#VXWORKS_VERSION = 6.0
-#VXWORKS_VERSION = 6.1
-#VXWORKS_VERSION = 6.2
-#VXWORKS_VERSION = 6.3
-#VXWORKS_VERSION = 6.4
-#VXWORKS_VERSION = 6.5
 #VXWORKS_VERSION = 6.6
 #VXWORKS_VERSION = 6.7
 #VXWORKS_VERSION = 6.8
@@ -27,7 +19,6 @@ VXWORKS_VERSION = 6.9
 # CONFIG_SITE.$(EPICS_HOST_ARCH).vxWorksCommon file.
 
 # WIND_BASE is where you installed the Wind River software.
-# Under vxWorks 6.x this is *not* the same as the old VX_DIR setting
 
 #WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
 WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)

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

@@ -14,10 +14,10 @@
 #GNU_DIR = /usr/local
 
 # Different distribution cross-build packages use different prefixes:
-# Ubuntu:
-#CMPLR_PREFIX = i686-w64-mingw32-
-# RHEL:
-CMPLR_PREFIX = i686-pc-mingw32-
+# Ubuntu, RHEL7:
+CMPLR_PREFIX = i686-w64-mingw32-
+# RHEL6:
+#CMPLR_PREFIX = i686-pc-mingw32-
 # Debian?
 #CMPLR_PREFIX = i586-mingw32msvc-
 

documentation/KnownProblems.html

@@ -4,25 +4,33 @@
 <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 R3.15.9</title>
+  <title>Known Problems in EPICS 7.0.1</title>
 </head>
 
 <body>
-<h1 style="text-align: center">EPICS Base R3.15.9: Known Problems</h1>
+<h1 style="text-align: center">EPICS 7.0.1: Known Problems</h1>
 
 <p>Any patch files linked below should be applied at the root of the
-base-3.15.9 tree. Download them, then use the GNU Patch program as
+base-7.0.1 tree. Download them, then use the GNU Patch program as
 follows:</p>
 
-<blockquote><pre>% <b>cd <i>/path/to/</i>base-3.15.9</b>
+<blockquote><pre>% <b>cd <i>/path/to/</i>base-7.0.1</b>
 % <b>patch -p1 &lt; <i>/path/to/</i>file.patch</b></pre></blockquote>
 
-<p>The following significant problems have been reported with this
-version of EPICS Base:</p>
+<p>The following problems were known by the developers at the time of this
+release:</p>
 
 <ul>
 
-  <li>None known as yet.</li>
+<!-- Items added after release should be formatted thusly:
+  <li>YYYY-MM-DD: Description of problem.
+    <a href="fix.patch">This patch</a> fixes the problem.
+    ...</li>
+-->
+
+  <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>
 

documentation/README.1st

@@ -0,0 +1,347 @@
+                           Installation Instructions
+
+                           EPICS Base Release 7.0.1.1
+
+   --------------------------------------------------------------------------
+
+  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 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 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
+     later.
+
+     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.
+
+  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       C shell script to set EPICS_HOST_ARCH env variable
+         EpicsHostArch.pl    Perl script to set EPICS_HOST_ARCH env variable
+         Site.profile        bourne shell script to set path and env variables
+         Site.cshrc          c shell script to set path and env variables
+         cygwin.bat          WIN32 bat file to set cygwin path and env variables
+         win32.bat           WIN32 bat file to set path and env variables
+
+    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.darwin.html

@@ -0,0 +1,184 @@
+<html>
+<head>
+<title>Installation notes for EPICS on Mac OS X (Darwin)</title>
+</head>
+<body>
+
+
+<h1>Building EPICS base</h1>
+<ul>
+<li>
+To build base:
+<ol>
+<li>
+Set the EPICS_HOST_ARCH environment variable to darwin-ppc, darwin-x86 or darwin-ppcx86.
+The scripts in the
+base/startup directory can automate this.  For example, here's part
+of my Bash login script (~/.bash_login):
+<pre>
+#
+# EPICS
+#
+EPICS_BASE="${HOME}/src/EPICS/base"
+EPICS_EXTENSIONS="${HOME}/src/EPICS/extensions"
+<strong>.</strong> "${EPICS_BASE}"/startup/Site.profile
+</pre>
+</li>
+<li>
+<code>cd</code> to the EPICS base top-level source directory.
+</li>
+<li>
+Uncomment the appropriate line in the relevent
+EPICS_BASE/configure/os/CONFIG_SITE.Common.darwin-xxx file for your EPICS_HOST_ARCH value.
+Newer versions of OS X (e.g. Snow Leopard) may include only 64 bit versions of some OS libraries,
+so should only have the x86_64 ARCH_CLASS.
+</li>
+<li>
+Run <code>make</code>.
+</li>
+</ol>
+
+</li>
+
+<li>
+As distributed, EPICS on Mac OS X uses the readline command line input
+routines.  IOC applications are more pleasant to interact with if
+either the readline or libtecla library is used.  The easiest
+way to get either or both of these libraries on to your system is to
+download and install them using the either the DarwinPorts
+distribution or the Fink package manager. If you don't want to install
+the readline library, set the COMMANDLINE_LIBRARY variable in one of
+the CONFIG_SITE files to EPICS.
+<p>
+Information on DarwinPorts is available from
+<a href="http://www.opendarwin.org/projects/darwinports/">the DarwinPorts
+project page</a>.
+DarwinPorts binary packages are available from
+<a href="http://packages.opendarwin.org/">here</a>.
+<p>
+Fink may be downloaded from
+<a href="http://fink.sourceforge.net/">the Source Forge</a>.
+</li>
+
+<li>
+If broadcasts are not seen locally, try adding "localhost" (127.0.0.1)
+to the EPICS_CA_ADDR_LIST.
+</li>
+</ul>
+
+<h1>Building EPICS extensions</h1>
+<p>
+Many extensions build and run properly on OS X.  To build and run medm, first
+obtain the X11 run-time and developer packages from Apple and the OpenMotif3
+package from Fink.
+
+<h1>Objective-C and AppleScript</h1>
+<p>
+Code written in Objective-C can be included in host or IOC applications.
+Here are a couple of short Objective-C examples which can be used to send
+AppleScript events to other applications on the OS X machine.
+
+<pre>
+/*
+ * exampleAppleScriptRecord.m 
+ *
+ * Simple Objective-C/AppleScript subroutine record
+ *
+ * To use this record in an application:
+ *
+ * 1) Make the following changes to the application Makefile:
+ *    - Add exampleAppleScriptRecord.m to the application SRCS.
+ *    - Add -framework Foundation to the application LDFLAGS.
+ * 2) Add the following line to the application database description:
+ *      registrar(registerExampleAppleScript)
+ * 3) Add a record to the application database:
+ *      record(sub,"setVolume")
+ *      {
+ *          field(SNAM,"exampleAppleScriptProcess")
+ *      }
+ */
+#import &lt;Foundation/Foundation.h&gt;
+#include &lt;registryFunction.h&gt;
+#include &lt;subRecord.h&gt;
+#include &lt;alarm.h&gt;
+#include &lt;errlog.h&gt;
+#include &lt;recGbl.h&gt;
+#include &lt;epicsExport.h&gt;
+
+/*
+ * Shim between EPICS and NSAppleScript class.
+ */
+static long
+exampleAppleScriptProcess(struct subRecord *psub)
+ {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSDictionary *err;
+    NSAppleScript *nsa;
+    
+    nsa = [[NSAppleScript alloc] initWithSource:[NSString stringWithFormat:
+                @"tell application \"Finder\" to set volume %g\n", psub-&gt;a]];
+    if ([nsa executeAndReturnError:&amp;err] == nil) {
+        errlogPrintf("Failed to run AppleScript: %s\n",
+                        [[err objectForKey:NSAppleScriptErrorMessage] cString]);
+        recGblSetSevr(psub, SOFT_ALARM, INVALID_ALARM);
+    }
+    [nsa release];
+    [pool release];
+    return 0;
+}
+
+static registryFunctionRef subRef[] = {
+    {"exampleAppleScriptProcess",(REGISTRYFUNCTION)exampleAppleScriptProcess}
+};
+
+static void registerExampleAppleScript(void)
+{
+    registryFunctionRefAdd(subRef,NELEMENTS(subRef));
+}
+epicsExportRegistrar(registerExampleAppleScript);
+
+
+==============================================================================
+/*
+ * runAppleScript.m 
+ *
+ * Simple Objective-C/AppleScript shim to allow EPICS application to
+ * send arbitrary AppleScript messages to other applications.
+ *
+ * To use this subroutine in an application make the following
+ * changes to the application Makefile:
+ * - Add runAppleScript.m to the application SRCS.
+ * - Add -framework Foundation to the application LDFLAGS.
+ */
+#import &lt;Foundation/Foundation.h&gt;
+#include &lt;errlog.h&gt;
+
+int
+runAppleScript(const char *format, ...)
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    NSString *script;
+    NSMutableDictionary *err;
+    NSAppleScript *nsa;
+    va_list args;
+    int ret = 0;
+    
+    va_start(args, format);
+    script = [[NSString alloc] initWithFormat:
+                            [NSString stringWithCString:format] arguments:args];
+    va_end(args);
+    err = [NSMutableDictionary dictionaryWithCapacity:10];
+    nsa = [[NSAppleScript alloc] initWithSource:script];
+    if ([nsa executeAndReturnError:&amp;err] == nil) {
+        errlogPrintf("Failed to run AppleScript: %s\n",
+                        [[err objectForKey:NSAppleScriptErrorMessage] cString]);
+        ret = -1;
+    }
+    [script release];
+    [nsa release];
+    [pool release];
+    return ret;
+}
+</pre>
+</body>
+</html>

documentation/README.html

@@ -0,0 +1,383 @@
+<!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.1.1</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 GNU make, gnumake, for any EPICS builds. Set your path
+ so that a gnumake version 3.81 or later is available.
+
+<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="http://www.aps.anl.gov/epics/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 later.</P>
+
+<P><B>GNU readline or Tecla library</B><BR>
+ 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.</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="http://www.aps.anl.gov/epics/">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       C shell script to set EPICS_HOST_ARCH env variable
+        EpicsHostArch.pl    Perl script to set EPICS_HOST_ARCH env variable
+        Site.profile        bourne shell script to set path and env variables
+        Site.cshrc          c shell script to set path and env variables
+        cygwin.bat          WIN32 bat file to set cygwin path and env variables
+        win32.bat           WIN32 bat file to set path and env variables
+</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

@@ -1,402 +0,0 @@
-# Installation Instructions
-
-## EPICS Base Release 3.15.x
-
------
-
-### Table of Contents
-
-  - [What is EPICS base?](#what-is-epics-base?)
-  - [What is new in this release?](#what-is-new-in-this-release?)
-  - [Copyright](#copyright)
-  - [Supported platforms](#supported-platforms)
-  - [Supported compilers](#supported-compilers)
-  - [Software requirements](#software-requirements)
-  - [Host system storage requirements](#host-system-storage-requirements)
-  - [Documentation](#documentation)
-  - [Directory Structure](#directory-structure)
-  - [Site-specific build configuration](#site-specific-build-configuration)
-  - [Building EPICS base](#building-epics-base)
-  - [Example application and extension](#example-application-and-extension)
-  - [Multiple host platforms](#multiple-host-platforms)
-
------
-
-### What is EPICS base?
-
-The Experimental Physics and Industrial Control Systems (EPICS) is an
-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 `documentation/RELEASE_NOTES.md` file 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. Set your path
-so that version 3.81 or later is available (4.0 or later 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 5.5.x or 6.x installed if any of your target
-systems are vxWorks systems; the C++ compiler for vxWorks 5.4 is 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 5.x](https://epics.anl.gov/base/tornado.php) or
-[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.2 or
-4.10.x. RTEMS 5 and above are only supported in EPICS 7.0.6 or later.
-
-#### Command Line Editing
-
-
-GNU readline and other similar libraries can be used by the IOC shell
-to provide command line editing and command line history recall. The
-GNU readline development package (or Apple's emulator on macOS) must
-be installed for a target when its build configuration variable
-`COMMANDLINE_LIBRARY` is set to `READLINE`. The default specified in
-`CONFIG_COMMON` is `EPICS`, but most linux target builds can detect if
-readline is available and will then use it. RTEMS targets may be
-configured to use `LIBTECLA` if available, and on vxWorks the OS's
-ledLib line-editing library is normally used.
-
-### Host system storage requirements
-
-The compressed tar file is approximately 1.7 MB in size. The
-distribution source tree takes up approximately 12 MB. Each host
-target will need around 50 MB for build files, and each cross-compiled
-target around 30 MB.
-
-### Documentation
-
-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.
-
-### Directory Structure
-
-#### Distribution directory structure
-
-```
-    base                Root directory of the distribution
-    base/configure      Build rules and OS-independent config files
-    base/configure/os   OS-dependent build config files
-    base/documentation  Distribution documentation
-    base/src            Source code in various subdirectories
-    base/startup        Scripts for setting up path and environment
-```
-
-#### Directories created by the build
-
-These are created in the root directory of the installation (`base`
-above) or under the directory pointed to by the `INSTALL_LOCATION`
-configuration variable if that has been set.
-
-```
-    bin               Installed scripts and executables in subdirs
-    cfg               Installed build configuration files
-    db                Installed database files
-    dbd               Installed database definition 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
-```
-
-#### `base/documentation` Directory
-
-This contains documents on how to setup, build, and install EPICS.
-
-```
-    README.md           This file
-    RELEASE_NOTES.md    Notes on release changes
-    KnownProblems.html  List of known problems and workarounds
-```
-
-#### `base/startup` Directory
-
-This contains several example scripts that show how to set up the
-build environment and PATH for using EPICS. Sites would usually copy and/or modify these files as appropriate for their environment; they are not used by the build system at all.
-
-```
-    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
-
-This contains build-system files providing definitions and rules
-required by GNU Make to build EPICS. Users should only need to modify the `CONFIG_SITE` files to configure the EPICS build.
-
-```
-    CONFIG               Main entry point for building EPICS
-    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 only
-    Sample.Makefile      Sample makefile with comments
-```
-
-#### `base/configure/os` Directory
-
-Files in here provide definitions that are shared by or specific to particular host and/or target architectures. Users should only need to modify the `CONFIG_SITE` files in this directory to configure the EPICS build.
-
-```
-    CONFIG.<host>.<target>            Definitions for a specific host-target combination
-    CONFIG.Common.<target>            Definitions for a specific target, any host
-    CONFIG.<host>.Common              Definitions for a specific host, any target
-    CONFIG.UnixCommon.Common          Definitions for Unix hosts, any target
-    CONFIG.Common.UnixCommon          Definitions for Unix targets, any host
-    CONFIG.Common.RTEMS               Definitions for all RTEMS targets, any host
-    CONFIG.Common.vxWorksCommon       Definitions for all vxWorks targets, any host
-    CONFIG_SITE.<host>.<target>       Local settings for a specific host-target combination
-    CONFIG_SITE.Common.<target>       Local settings for a specific target, any host
-    CONFIG_SITE.<host>.Common         Local settings for a specific host, any target
-    CONFIG_SITE.Common.RTEMS          Local settings for all RTEMS targets, any host
-    CONFIG_SITE.Common.vxWorksCommon  Local settings for all vxWorks targets, any host
-```
-
-### Building EPICS base
-
-#### 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 R3.15, 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.
-
-* **`PATH`**
-As already mentioned, you must have the `perl` executable and you may
-need C and C++ compilers in your search path. When building base you
-must have `echo` in your search path. For Unix host builds you will
-also need `cp`, `rm`, `mv`, and `mkdir` in your search path. Some Unix
-systems may also need `ar` and `ranlib`, and the C/C++ compilers may
-require `as` and `ld` in your path. On Solaris systems you need
-`uname` in your path.
-
-* **`LD_LIBRARY_PATH`**
-R3.15 shared libraries and executables normally contain the full path
-to any libraries they require, so setting this variable is not usually
-necessary. However, if you move the EPICS installation to a new
-location after building it then in order for the shared libraries to
-be found at runtime it may need to be set, 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.
-
-### Site-specific build configuration
-
-#### Site configuration
-
-To configure EPICS, you may want to modify some values set in the
-following files:
-
-```
-    configure/CONFIG_SITE      Build settings. Specify target archs.
-    configure/CONFIG_SITE_ENV  Environment variable defaults
-```
-
-#### Host configuration
-
-To configure each host system, you can override the default
-definitions by adding a new settings file (or editing an existing
-settings file) in the `configure/os` directory with your override
-definitions. The settings file has the same name as the definitions
-file to be overridden except with `CONFIG` in the name changed to
-`CONFIG_SITE`.
-
-```
-    configure/os/CONFIG.<host>.<host>       Host self-build definitions
-    configure/os/CONFIG.<host>.Common       Host common build definitions
-    configure/os/CONFIG_SITE.<host>.<host>  Host self-build overrides
-    configure/os/CONFIG_SITE.<host>.Common  Host common build overrides
-```
-
-#### Target configuration
-
-To configure each target system, you may override the default
-definitions by adding a new settings file (or editing an existing
-settings file) in the `configure/os` directory with your override
-definitions. The settings file has the same name as the definitions
-file to be overridden except with `CONFIG` in the name changed to
-`CONFIG_SITE`.
-
-```
-    configure/os/CONFIG.Common.<target>       Target common definitions
-    configure/os/CONFIG.<host>.<target>       Host-target definitions
-    configure/os/CONFIG_SITE.Common.<target>  Target common overrides
-    configure/os/CONFIG_SITE.<host>.<target>  Host-target overrides
-```
-
-#### 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):
-
-```
-    make distclean
-    make
-```
-
-The command `make distclean` will remove all files and
-directories generated by a previous build. The command `make`
-will build and install everything for the configured host and
-targets.
-
-It is recommended that you do a `make distclean` at the
-root directory of an EPICS directory structure before each complete
-rebuild to ensure that all components will be rebuilt.
-
-In some cases GNU Make may have been installed as `gmake` or
-`gnumake`, in which case the above commands will have to be adjusted
-to match.
-
-### Example application and extension
-
-A perl tool `makeBaseApp.pl` and several template applications are
-included in the distribution. This script instantiates the selected
-template into an empty directory to provide an example application
-that can be built and then executed to try out this release of base.
-
-Instructions for building and executing the 3.15 example 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 &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.
-
-Another perl script `makeBaseExt.pl` is also included in the
-distribution file for creating an extensions tree and sample
-application that can also be built and executed. Both these 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`. Intermediate object files
-are stored in `O.<arch>` source subdirectories during the build
-process, to allow 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

@@ -1,71 +0,0 @@
-# Record Reference Documentation
-
-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)
-* [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)
-* [Process at iocInit Menu](menuPini.html)
-* [Post Monitors Menu](menuPost.html)
-* [Priority Menu](menuPriority.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 3.15 branch of Base.
-The document sources can be found in the `src/std/rec` and `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

@@ -33,29 +33,28 @@
 <h1>EPICS Base Release Procedures &amp; Checklist</h1>
 
 <p>This document describes the procedures and provides a checklist of tasks
-that should be performed when creating new releases of EPICS Base.</p>
+that should be performed when creating production releases of EPICS Base.</p>
 
 <h3>The Release Process</h3>
 
 <p>The version released on the Feature Freeze date is designated the first
-pre-release, <tt>-pre1</tt>. The first Release Candidate <tt>-rc1</tt> is the
-first version that has undergone widespread testing and which has no known
-problems in it that are slated to be fixed in this release. New versions should
-be made at 2-weekly intervals during the testing and debugging period, and will
-be designated as either pre-release versions or Release Candidates by the
-Release Manager. After a Release Candidate has been available to the whole
-community for testing for at least a week without any additional problems being
-reported or significant changes being committed, the branch can be designated as
-the final release version.</p>
+pre-release, <tt>-pre1</tt>. The first release candidate <tt>-rc1</tt> is the
+first version that has undergone testing by the developers and has shown no
+problems that must be fixed before release. New versions should be made at about
+2-weekly intervals after the <tt>-pre1</tt> release, and designated as either
+pre-release or release candidate versions by the Release Manager. Release
+candidates are announced to the whole community via the tech-talk mailing list,
+pre-releases are announced to to the developers via the core-talk list. After a
+release candidate has been available for 2 weeks without any new problems being
+reported or major changes having to be committed, the final release can be
+made.</p>
 
 <h3>Roles</h3>
 
-<p>The following roles are required. The individuals named here have have been
-responsible for these tasks in the past and are expected to continue in the
-relevent roles unless the Release Manager designates otherwise:</p>
+<p>The following roles are used below:</p>
 
 <dl>
-  <dt><strong>Release Manager</strong> (Ralph Lange)</dt>
+  <dt><strong>Release Manager</strong> ()</dt>
     <dd>Responsible for managing and tagging the release</dd>
   <dt><strong>Platform Developers</strong> (optional)</dt>
     <dd>Responsible for individual operating system platforms</dd>
@@ -79,7 +78,7 @@ relevent roles unless the Release Manager designates otherwise:</p>
       <td>&nbsp;</td>
       <td>Release Manager</td>
       <td>Email all developers about the upcoming release and ask for a list
-        of remaining jobs that must be finished.</td>
+        of remaining tasks that must be finished.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
@@ -112,7 +111,7 @@ relevent roles unless the Release Manager designates otherwise:</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Review and update this document for the upcoming release.</td>
+      <td>Review and update this checklist for the upcoming release.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
@@ -127,28 +126,31 @@ relevent roles unless the Release Manager designates otherwise:</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
+      <!-- Submodules... -->
       <td>Edit and commit changes to the EPICS version number file
         configure/CONFIG_BASE_VERSION.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Tag the module in Git, using these tag conventions:
+      <td>Tag the module in Git using these tag conventions:
         <ul>
           <li>
-            <tt>R3.15.9-pre1</tt>
+            <tt>R7.1.1-pre<i>n</i></tt>
             &mdash; pre-release tag
             </li>
           <li>
-            <tt>R3.15.9-rc1</tt>
+            <tt>R7.1.1-rc<i>n</i></tt>
             &mdash; release candidate tag
             </li>
         </ul>
         <blockquote><tt>
-          cd base-3.15<br />
-          git tag -m 'ANJ: Tagged for 3.15.9-rc1' R3.15.9-rc1
+          cd base-7.1<br />
+          git tag -m 'ANJ: Tagged for 7.1.1-rc1' R7.1.1-rc1
           </tt></blockquote>
-        </td>
+        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
+        that are only tagged at the final release.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
@@ -157,12 +159,12 @@ relevent roles unless the Release Manager designates otherwise:</p>
         script generates a gzipped tarfile directly from the tag, excluding the
         files and directories that are only used for continuous integration:
         <blockquote><tt>
-          cd base-3.15<br />
-          git archive --prefix=base-3.15.9-rc1/ --output=base-3.15.9-rc1.tar.gz R3.15.9-rc1 configure documentation LICENSE Makefile README src startup
+          cd base-7.1<br />
+          .ci/make-tar.sh R7.1.1-rc1 base-7.1.1-rc1.tar.gz base-7.1.1-rc1/
           </tt></blockquote>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
-          gpg --armor --sign --detach-sig base-3.15.9-rc1.tar.gz
+          gpg --armor --sign --detach-sig base-7.1.1-rc1.tar.gz
           </tt></blockquote>
         </td>
       </tr>
@@ -175,8 +177,9 @@ relevent roles unless the Release Manager designates otherwise:</p>
     <tr>
       <td>&nbsp;</td>
       <td>Website Manager</td>
-      <td>If necessary recreate the tarfile following the instructions above.
-        Copy the tar file to the Base download area of the website</td>
+      <td>Copy the tarfile and its signature to the Base download area of the
+        website and add the new files to the website Base download index
+        page.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
@@ -193,11 +196,6 @@ relevent roles unless the Release Manager designates otherwise:</p>
         versions should use the page and URL for the final release version
         number.</td>
       </tr>
-    <tr>
-      <td>&nbsp;</td>
-      <td>Website Manager</td>
-      <td>Add the new tar file to the website Base download index page.</td>
-      </tr>
     <tr>
       <th colspan="3">Testing</th>
       </tr>
@@ -233,7 +231,7 @@ relevent roles unless the Release Manager designates otherwise:</p>
       <td>&nbsp;</td>
       <td>Application Developers</td>
       <td>Build external applications against this version of Base on all
-        available platforms and test as appropriate.  Application code changes
+        available platforms and test as appropriate. Application code changes
         may be necessary where the EPICS Base APIs have been modified.</td>
       </tr>
     <tr>
@@ -256,8 +254,8 @@ relevent roles unless the Release Manager designates otherwise:</p>
       <td>&nbsp;</td>
       <td>Release Manager</td>
       <td>Obtain a positive <q>Ok to release</q> from all platform developers
-        once a Release Candidate version has gone a whole week without any
-        issues being reported.</td>
+        once a release candidate version has gone for 2 weeks without any major
+        new issues being reported.</td>
       </tr>
     <tr>
       <th colspan="3">Creating the final release version</th>
@@ -273,23 +271,24 @@ relevent roles unless the Release Manager designates otherwise:</p>
       <td>Release Manager</td>
       <td>Tag the module in Git:
         <blockquote><tt>
-          cd base-3.15<br />
-          git tag -m 'ANJ: Tagged for 3.15.9' R3.15.9
+          cd base-7.1<br />
+          git tag -m 'ANJ: Tagged for 7.1.1' R7.1.1</i>
           </tt></blockquote>
         </td>
       </tr>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Export the tagged version into a tarfile. Note that this command
-        generates a gzipped tarfile directly from the repository:
+      <td>Export the tagged version into a tarfile. The <tt>make-tar.sh</tt>
+        script generates a gzipped tarfile directly from the tag, excluding the
+        files and directories that are only used for continuous integration:
         <blockquote><tt>
-          cd base-3.15<br />
-          git archive --prefix=base-3.15.9/ --output=base-3.15.9.tar.gz R3.15.9 configure documentation LICENSE Makefile README src startup
+          cd base-7.1<br />
+          .ci/make-tar.sh R7.1.1 base-7.1.1.tar.gz base-7.1.1/
           </tt></blockquote>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
-          gpg --armor --sign --detach-sig base-3.15.9.tar.gz
+          gpg --armor --sign --detach-sig base-7.1.1.tar.gz
           </tt></blockquote>
         </td>
       </tr>
@@ -302,7 +301,8 @@ relevent roles unless the Release Manager designates otherwise:</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Upload the release tar file to the Launchpad download area.</td>
+      <td>Copy the tarfile and its signature to the Base download area of the
+        website.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>

modules/CONFIG_SITE.local

@@ -0,0 +1,10 @@
+#*************************************************************************
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
+#*************************************************************************
+
+# When building submodules, this should always be true:
+INSTALL_LOCATION = $(EPICS_BASE)
+
+# Stop submodules from installing their configuration files:
+CONFIG_INSTALLS =

modules/Makefile

@@ -0,0 +1,58 @@
+#*************************************************************************
+# 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
+
+# Submodules for bundle build
+SUBMODULES += libcom
+
+SUBMODULES += ca
+ca_DEPEND_DIRS = libcom
+
+SUBMODULES += database
+database_DEPEND_DIRS = ca
+
+SUBMODULES += pvData
+pvData_DEPEND_DIRS = libcom
+
+SUBMODULES += pvAccess
+pvAccess_DEPEND_DIRS = pvData database
+
+SUBMODULES += normativeTypes
+normativeTypes_DEPEND_DIRS = pvData
+
+SUBMODULES += pvaClient
+pvaClient_DEPEND_DIRS = pvAccess normativeTypes
+
+SUBMODULES += pvDatabase
+pvDatabase_DEPEND_DIRS = pvAccess
+
+SUBMODULES += pva2pva
+pva2pva_DEPEND_DIRS = pvAccess
+
+SUBMODULES += example
+example_DEPEND_DIRS = pva2pva pvaClient
+
+# Allow sites to add extra submodules
+-include Makefile.local
+
+# Add only checked-out submodules to DIRS
+DIRS += $(subst /Makefile,,$(wildcard $(addsuffix /Makefile, $(SUBMODULES))))
+
+include $(TOP)/configure/RULES_DIRS
+
+INSTALL_LOCATION_ABS := $(abspath $(INSTALL_LOCATION))
+RELEASE_LOCAL := RELEASE.$(EPICS_HOST_ARCH).local
+
+# Ensure that RELEASE.<host>.local exists before doing anything else
+all host $(DIRS) $(ARCHS) $(ACTIONS) $(dirActionTargets) $(dirArchTargets) \
+    $(dirActionArchTargets) $(actionArchTargets): | $(RELEASE_LOCAL)
+
+$(RELEASE_LOCAL):
+	$(ECHO) Creating $@, EPICS_BASE = $(INSTALL_LOCATION_ABS)
+	@echo EPICS_BASE = $(INSTALL_LOCATION_ABS)> $@
+realclean:
+	$(RM) $(RELEASE_LOCAL)

src/Makefile

@@ -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.
 #*************************************************************************
 
 TOP = ..
@@ -12,69 +12,10 @@ include $(TOP)/configure/CONFIG
 
 DIRS += tools
 
-DIRS += tools/test
-tools/test_DEPEND_DIRS = tools
-
 DIRS += template/base
 template/base_DEPEND_DIRS = tools
 
 DIRS += template/ext
 template/ext_DEPEND_DIRS = tools
 
-# Common
-
-DIRS += libCom
-libCom_DEPEND_DIRS = tools
-
-DIRS += libCom/RTEMS
-libCom/RTEMS_DEPEND_DIRS = libCom
-
-DIRS += libCom/test
-libCom/test_DEPEND_DIRS = libCom/RTEMS
-
-# Channel Access
-
-DIRS += ca/client
-ca/client_DEPEND_DIRS = libCom
-
-DIRS += ca/client/tools
-ca/client/tools_DEPEND_DIRS = ca/client
-
-DIRS += ca/legacy/gdd
-ca/legacy/gdd_DEPEND_DIRS = ca/client
-
-DIRS += ca/legacy/pcas
-ca/legacy/pcas_DEPEND_DIRS = ca/legacy/gdd
-
-DIRS += ca/legacy/pcas/ex
-# needs ioc for dbStaticHost
-ca/legacy/pcas/ex_DEPEND_DIRS = ca/legacy/pcas libCom ioc
-
-DIRS += ca/client/perl
-ca/client/perl_DEPEND_DIRS = ca/client
-
-# PDB Core
-
-DIRS += ioc
-ioc_DEPEND_DIRS = libCom ca/client
-
-DIRS += ioc/db/test
-ioc/db/test_DEPEND_DIRS = ioc libCom/RTEMS
-
-DIRS += ioc/dbtemplate/test
-ioc/dbtemplate/test_DEPEND_DIRS = ioc
-
-# PDB Standard Record Definitions
-
-DIRS += std
-std_DEPEND_DIRS = ioc libCom/RTEMS
-
-DIRS += std/filters/test
-std/filters/test_DEPEND_DIRS = std
-
-DIRS += std/rec/test
-std/rec/test_DEPEND_DIRS = std
-
-
 include $(TOP)/configure/RULES_DIRS
-

src/ca/client/CASG.cpp

@@ -1,308 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-*     National Laboratory.
-* 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 file LICENSE that is included with this distribution.
-\*************************************************************************/
-
-/*
- *      Author: Jeffrey O. Hill
- */
-
-#include <string>
-#include <stdexcept>
-
-#define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
-
-#include "errlog.h"
-
-#define epicsExportSharedSymbols
-#include "iocinf.h"
-#include "syncGroup.h"
-#include "oldAccess.h"
-#include "cac.h"
-#include "sgAutoPtr.h"
-
-CASG::CASG ( epicsGuard < epicsMutex > & guard, ca_client_context & cacIn ) :
-    client ( cacIn ), magic ( CASG_MAGIC )
-{
-    client.installCASG ( guard, *this );
-}
-
-CASG::~CASG ()
-{
-}
-
-void CASG::destructor (
-    CallbackGuard & cbGuard,
-    epicsGuard < epicsMutex > & guard )
-{
-    guard.assertIdenticalMutex ( this->client.mutexRef() );
-
-    if ( this->verify ( guard ) ) {
-        this->reset ( cbGuard, guard );
-        this->client.uninstallCASG ( guard, *this );
-        this->magic = 0;
-    }
-    else {
-        this->printFormated ( "cac: attempt to destroy invalid sync group ignored\n" );
-    }
-    this->~CASG ();
-}
-
-bool CASG::verify ( epicsGuard < epicsMutex > & ) const
-{
-    return ( this->magic == CASG_MAGIC );
-}
-
-/*
- * CASG::block ()
- */
-int CASG::block (
-    epicsGuard < epicsMutex > * pcbGuard,
-    epicsGuard < epicsMutex > & guard,
-    double timeout )
-{
-    epicsTime cur_time;
-    epicsTime beg_time;
-    double delay;
-    double remaining;
-    int status;
-
-    guard.assertIdenticalMutex ( this->client.mutexRef() );
-
-    // prevent recursion nightmares by disabling blocking
-    // for IO from within a CA callback.
-    if ( epicsThreadPrivateGet ( caClientCallbackThreadId ) ) {
-        return ECA_EVDISALLOW;
-    }
-
-    if ( timeout < 0.0 ) {
-        return ECA_TIMEOUT;
-    }
-
-    cur_time = epicsTime::getCurrent ();
-
-    this->client.flush ( guard );
-
-    beg_time = cur_time;
-    delay = 0.0;
-
-    while ( 1 ) {
-        if ( this->ioPendingList.count() == 0u ) {
-            status = ECA_NORMAL;
-            break;
-        }
-
-        remaining = timeout - delay;
-        if ( remaining <= CAC_SIGNIFICANT_DELAY ) {
-            /*
-             * Make sure that we take care of
-             * recv backlog at least once
-             */
-            status = ECA_TIMEOUT;
-            break;
-        }
-
-        if ( pcbGuard ) {
-            epicsGuardRelease < epicsMutex > unguard ( guard );
-            {
-                epicsGuardRelease < epicsMutex > uncbGuard ( *pcbGuard );
-                this->sem.wait ( remaining );
-            }
-        }
-        else {
-            epicsGuardRelease < epicsMutex > unguard ( guard );
-            this->sem.wait ( remaining );
-        }
-
-        /*
-         * force a time update
-         */
-        cur_time = epicsTime::getCurrent ();
-
-        delay = cur_time - beg_time;
-    }
-
-    return status;
-}
-
-void CASG::reset (
-    CallbackGuard & cbGuard,
-    epicsGuard < epicsMutex > & guard )
-{
-    guard.assertIdenticalMutex ( this->client.mutexRef() );
-    this->destroyCompletedIO ( cbGuard, guard );
-    this->destroyPendingIO ( cbGuard, guard );
-}
-
-// lock must be applied
-void CASG::destroyCompletedIO (
-    CallbackGuard & cbGuard,
-    epicsGuard < epicsMutex > & guard )
-{
-    guard.assertIdenticalMutex ( this->client.mutexRef() );
-    syncGroupNotify * pNotify;
-    while ( ( pNotify = this->ioCompletedList.get () ) ) {
-        pNotify->destroy ( cbGuard, guard );
-    }
-}
-
-void CASG::destroyPendingIO (
-    CallbackGuard & cbGuard,
-    epicsGuard < epicsMutex > & guard )
-{
-    guard.assertIdenticalMutex ( this->client.mutexRef() );
-    while ( syncGroupNotify * pNotify = this->ioPendingList.first () ) {
-        pNotify->cancel ( cbGuard, guard );
-        // cancel must release the guard while
-        // canceling put callbacks so we
-        // must double check list membership
-        if ( pNotify->ioPending ( guard ) ) {
-            this->ioPendingList.remove ( *pNotify );
-        }
-        else {
-            this->ioCompletedList.remove ( *pNotify );
-        }
-        pNotify->destroy ( cbGuard, guard );
-    }
-}
-
-void CASG::show ( unsigned level ) const
-{
-    epicsGuard < epicsMutex > guard ( this->client.mutexRef () );
-    this->show ( guard, level );
-}
-
-void CASG::show (
-    epicsGuard < epicsMutex > & guard, unsigned level ) const
-{
-    guard.assertIdenticalMutex ( this->client.mutexRef() );
-    ::printf ( "Sync Group: id=%u, magic=%u, opPend=%u\n",
-        this->getId (), this->magic, this->ioPendingList.count () );
-    if ( level ) {
-        ::printf ( "\tPending" );
-        tsDLIterConst < syncGroupNotify > notifyPending =
-            this->ioPendingList.firstIter ();
-        while ( notifyPending.valid () ) {
-            notifyPending->show ( guard, level - 1u );
-            notifyPending++;
-        }
-        ::printf ( "\tCompleted" );
-        tsDLIterConst < syncGroupNotify > notifyCompleted =
-            this->ioCompletedList.firstIter ();
-        while ( notifyCompleted.valid () ) {
-            notifyCompleted->show ( guard, level - 1u );
-            notifyCompleted++;
-        }
-    }
-}
-
-bool CASG::ioComplete (
-    CallbackGuard & cbGuard,
-    epicsGuard < epicsMutex > & guard )
-{
-    guard.assertIdenticalMutex ( this->client.mutexRef() );
-    this->destroyCompletedIO ( cbGuard, guard );
-    return this->ioPendingList.count () == 0u;
-}
-
-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 ( 
-        this->freeListWriteOP, *this, & CASG :: recycleWriteNotifyIO, pChan );
-    pNotify->begin ( guard, type, count, pValue );
-    pNotify.release ();
-}
-
-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 ( 
-        this->freeListReadOP, *this, & CASG :: recycleReadNotifyIO, pChan, pValue );
-    pNotify->begin ( guard, type, count );
-    pNotify.release ();
-}
-
-void CASG::completionNotify (
-    epicsGuard < epicsMutex > & guard, syncGroupNotify & notify )
-{
-    guard.assertIdenticalMutex ( this->client.mutexRef() );
-    this->ioPendingList.remove ( notify );
-    this->ioCompletedList.add ( notify );
-    if ( this->ioPendingList.count () == 0u ) {
-        this->sem.signal ();
-    }
-}
-
-void CASG :: recycleReadNotifyIO ( epicsGuard < epicsMutex > & guard, 
-                            syncGroupReadNotify & io )
-{
-    guard.assertIdenticalMutex ( this->client.mutexRef() );
-    this->freeListReadOP.release ( & io );
-}
-
-void CASG :: recycleWriteNotifyIO ( epicsGuard < epicsMutex > & guard, 
-                            syncGroupWriteNotify & io )
-{
-    guard.assertIdenticalMutex ( this->client.mutexRef() );
-    this->freeListWriteOP.release ( & io );
-}
-
-int CASG :: printFormated ( const char *pformat, ... )
-{
-    va_list theArgs;
-    int status;
-
-    va_start ( theArgs, pformat );
-
-    status = this->client.varArgsPrintFormated ( pformat, theArgs );
-
-    va_end ( theArgs );
-
-    return status;
-}
-
-void CASG::exception (
-    epicsGuard < epicsMutex > & guard,
-    int status, const char * pContext,
-    const char * pFileName, unsigned lineNo )
-{
-    guard.assertIdenticalMutex ( this->client.mutexRef() );
-    if ( status != ECA_CHANDESTROY ) {
-        this->client.exception (
-            guard, status, pContext, pFileName, lineNo );
-    }
-}
-
-void CASG::exception (
-    epicsGuard < epicsMutex > & guard,
-    int status, const char * pContext,
-    const char * pFileName, unsigned lineNo, oldChannelNotify & chan,
-    unsigned type, arrayElementCount count, unsigned op )
-{
-    guard.assertIdenticalMutex ( this->client.mutexRef() );
-    if ( status != ECA_CHANDESTROY ) {
-        this->client.exception (
-            guard, status, pContext, pFileName,
-            lineNo, chan, type, count, op );
-    }
-}
-
-void CASG::operator delete ( void * )
-{
-    // Visual C++ .net appears to require operator delete if
-    // placement operator delete is defined? I smell a ms rat
-    // because if I declare placement new and delete, but
-    // comment out the placement delete definition there are
-    // no undefined symbols.
-    errlogPrintf ( "%s:%d this compiler is confused about placement delete - memory was probably leaked",
-        __FILE__, __LINE__ );
-}

src/ca/client/Makefile

@@ -1,118 +0,0 @@
-#*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-#     National Laboratory.
-# 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 file LICENSE that is included with this distribution. 
-#*************************************************************************
-
-TOP=../../..
-
-include $(TOP)/configure/CONFIG
-
-HTMLS += CAref.html
-
-#
-#	includes to install from this subproject
-#
-INC += cadef.h
-INC += caerr.h
-INC += caeventmask.h
-INC += caProto.h
-INC += db_access.h
-INC += addrList.h
-INC += cacIO.h
-INC += caDiagnostics.h
-
-LIBSRCS += cac.cpp
-LIBSRCS += cacChannel.cpp
-LIBSRCS += cacChannelNotify.cpp
-LIBSRCS += cacContextNotify.cpp
-LIBSRCS += cacReadNotify.cpp
-LIBSRCS += cacWriteNotify.cpp
-LIBSRCS += cacStateNotify.cpp
-LIBSRCS += access.cpp
-LIBSRCS += iocinf.cpp
-LIBSRCS += convert.cpp
-LIBSRCS += test_event.cpp
-LIBSRCS += repeater.cpp
-LIBSRCS += searchTimer.cpp
-LIBSRCS += disconnectGovernorTimer.cpp
-LIBSRCS += repeaterSubscribeTimer.cpp
-LIBSRCS += baseNMIU.cpp
-LIBSRCS += nciu.cpp
-LIBSRCS += netiiu.cpp
-LIBSRCS += udpiiu.cpp
-LIBSRCS += tcpiiu.cpp
-LIBSRCS += noopiiu.cpp
-LIBSRCS += netReadNotifyIO.cpp
-LIBSRCS += netWriteNotifyIO.cpp
-LIBSRCS += netSubscription.cpp
-LIBSRCS += tcpSendWatchdog.cpp
-LIBSRCS += tcpRecvWatchdog.cpp
-LIBSRCS += bhe.cpp
-LIBSRCS += ca_client_context.cpp
-LIBSRCS += oldChannelNotify.cpp
-LIBSRCS += oldSubscription.cpp
-LIBSRCS += getCallback.cpp
-LIBSRCS += getCopy.cpp
-LIBSRCS += putCallback.cpp
-LIBSRCS += syncgrp.cpp
-LIBSRCS += CASG.cpp
-LIBSRCS += syncGroupNotify.cpp
-LIBSRCS += syncGroupReadNotify.cpp
-LIBSRCS += syncGroupWriteNotify.cpp
-LIBSRCS += localHostName.cpp
-LIBSRCS += comQueRecv.cpp
-LIBSRCS += comQueSend.cpp
-LIBSRCS += comBuf.cpp
-LIBSRCS += hostNameCache.cpp
-LIBSRCS += msgForMultiplyDefinedPV.cpp
-LIBSRCS_vxWorks += templateInstances.cpp
-
-LIBRARY=ca
-
-ca_RCS = ca.rc
-
-ca_LIBS = Com
-
-ca_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
-
-#   libs needed for PROD and TESTPRODUCT
-PROD_LIBS = ca Com 
-# needed when its an object library build
-PROD_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
-
-PROD_DEFAULT += caRepeater catime acctst caConnTest casw caEventRate
-PROD_vxWorks = -nil-
-PROD_RTEMS = -nil-
-PROD_iOS = -nil-
-
-OBJS_vxWorks = catime acctst caConnTest casw caEventRate acctstRegister
-
-caRepeater_SRCS = caRepeater.cpp
-catime_SRCS = catimeMain.c catime.c
-acctst_SRCS = acctstMain.c acctst.c
-caEventRate_SRCS = caEventRateMain.cpp caEventRate.cpp
-casw_SRCS = casw.cpp
-caConnTest_SRCS = caConnTestMain.cpp caConnTest.cpp
-
-casw_SYS_LIBS_solaris = socket
-
-SCRIPTS_HOST = S99caRepeater
-SCRIPTS_Linux = caRepeater.service
-
-EXPAND += S99caRepeater@
-EXPAND += caRepeater.service@
-EXPAND_VARS = INSTALL_BIN=$(abspath $(INSTALL_BIN))
-
-SRC_DIRS += $(TOP)/src/ca/client/test
-PROD_HOST += ca_test
-ca_test_SRCS = ca_test_main.c ca_test.c
-ca_test_LIBS  = ca Com
-ca_test_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
-
-OBJS_vxWorks += ca_test
-
-include $(TOP)/configure/RULES

src/ca/client/S99caRepeater@

@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# System-V init script for the EPICS CA Repeater.
-#
-
-INSTALL_BIN=@INSTALL_BIN@
-
-# To change the default values for the EPICS environment parameters,
-# uncomment and modify the relevant lines below. These are the only
-# EPICS environment variables that the CA Repeater makes use of.
-
-# EPICS_CA_REPEATER_PORT="5065" export EPICS_CA_REPEATER_PORT
-
-if [ $1 = "start" ]; then
-    if [ -x $INSTALL_BIN/caRepeater ]; then
-        echo "Starting EPICS CA Repeater "
-        $INSTALL_BIN/caRepeater &
-    fi
-else
-    if [ $1 = "stop" ]; then
-        pid=`ps -e | sed -ne '/caRepeat/s/^ *\([1-9][0-9]*\).*$/\1/p'`
-        if [ "${pid}" != "" ]; then
-            echo "Stopping EPICS CA Repeater "
-            kill ${pid}
-        fi
-    fi
-fi
-

src/ca/client/SearchDest.h

@@ -1,39 +0,0 @@
-/*************************************************************************\
- * Copyright (c) 2002 The University of Chicago, as Operator of Argonne
- *     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. 
-\*************************************************************************/
-
-#ifndef SearchDest_h
-#define SearchDest_h
-
-#include <osiSock.h>
-#include <epicsTime.h>
-#include <tsDLList.h>
-#include "caProto.h"
-
-class channelNode;
-class epicsMutex;
-template < class T > class epicsGuard;
-
-struct SearchDest :
-    public tsDLNode < SearchDest > {
-    virtual ~SearchDest () {};
-    struct Callback {
-        virtual ~Callback () {};
-        virtual void notify (
-            const caHdr & msg, const void * pPayload,
-            const osiSockAddr & addr, const epicsTime & ) = 0;
-        virtual void show ( 
-            epicsGuard < epicsMutex > &, unsigned level ) const = 0;
-    };
-    virtual void searchRequest ( epicsGuard < epicsMutex > &,
-        const char * pbuf, size_t len ) = 0;
-    virtual void show ( epicsGuard < epicsMutex > &, unsigned level ) const = 0;
-};
-
-#endif // SearchDest_h

src/ca/client/acctstMain.c

@@ -1,70 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-*     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. 
-\*************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "cadef.h"
-#include "caDiagnostics.h"
-
-int main ( int argc, char **argv )
-{
-    unsigned progressLoggingLevel;
-    unsigned channelCount;
-    unsigned repetitionCount;
-	enum ca_preemptive_callback_select preempt;
-	int aBoolean;
-
-
-    if ( argc < 2 || argc > 6 ) {
-        printf ("usage: %s <PV name> [progress logging level] [channel count] "
-                "[repetition count] [enable preemptive callback]\n", 
-                argv[0] );
-        return 1;        
-    }
-
-    if ( argc >= 3 ) {
-        progressLoggingLevel = atoi ( argv[2] );
-    }
-    else {
-        progressLoggingLevel = 0;
-    }
-
-    if ( argc >= 4 ) {
-        channelCount = atoi ( argv[3] );
-    }
-    else {
-        channelCount = 20000;
-    }
-
-    if ( argc >= 5 ) {
-        repetitionCount = atoi ( argv[4] );
-    }
-    else {
-        repetitionCount = 1;
-    }
-
-    if ( argc >= 6 ) {
-        aBoolean = atoi ( argv[5] );
-    }
-    else {
-        aBoolean = 0;
-    }
-	if ( aBoolean ) {
-		preempt = ca_enable_preemptive_callback;
-	}
-	else {
-		preempt = ca_disable_preemptive_callback;
-	}
-
-    acctst ( argv[1], progressLoggingLevel, channelCount, repetitionCount, preempt );
-
-    return 0;
-}

src/ca/client/acctstRegister.cpp

@@ -1,69 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-*     National Laboratory.
-* 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 file LICENSE that is included with this distribution.
-\*************************************************************************/
-
-/*
- * CA client library diagnostics IOC shell registration
- * Authors:
- * Jeff Hill
- */
-
-#include <iocsh.h>
-#include "caDiagnostics.h"
-
-/* Information needed by iocsh */
-static const iocshArg     acctstArg0 = { "channel name", iocshArgString };
-static const iocshArg     acctstArg1 = { "interest level", iocshArgInt };
-static const iocshArg     acctstArg2 = { "channel count", iocshArgInt };
-static const iocshArg     acctstArg3 = { "repetition count", iocshArgInt };
-static const iocshArg     acctstArg4 = { "preemptive callback select", iocshArgInt };
-
-static const iocshArg    *acctstArgs[] =
-{
-    &acctstArg0,
-    &acctstArg1,
-    &acctstArg2,
-    &acctstArg3,
-    &acctstArg4
-};
-static const iocshFuncDef acctstFuncDef = {"acctst", 5, acctstArgs};
-
-
-/* Wrapper called by iocsh, selects the argument types that print needs */
-static void acctstCallFunc(const iocshArgBuf *args) {
-    if ( args[1].ival <  0 ) {
-        printf ( "negative interest level not allowed\n" );
-        return;
-    }
-    if ( args[2].ival <  0 ) {
-        printf ( "negative channel count not allowed\n" );
-        return;
-    }
-    if ( args[3].ival <  0 ) {
-        printf ( "negative repetition count not allowed\n" );
-        return;
-    }
-    acctst (
-        args[0].sval, /* channel name */
-        ( unsigned ) args[1].ival, /* interest level */
-        ( unsigned ) args[2].ival, /* channel count */
-        ( unsigned ) args[3].ival, /* repetition count */
-        ( ca_preemptive_callback_select ) args[4].ival );  /* preemptive callback select */
-}
-
-struct AutoInit {
-    AutoInit ();
-};
-
-AutoInit :: AutoInit () 
-{
-    iocshRegister ( &acctstFuncDef, acctstCallFunc );
-}
-
-AutoInit autoInit;
-

src/ca/client/addrList.h

@@ -1,40 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-*     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. 
-\*************************************************************************/
-
-#ifndef addrListh
-#define addrListh
-
-#include "shareLib.h"
-#include "envDefs.h" 
-#include "osiSock.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-epicsShareFunc void epicsShareAPI configureChannelAccessAddressList 
-    ( struct ELLLIST *pList, SOCKET sock, unsigned short port );
-
-epicsShareFunc int epicsShareAPI addAddrToChannelAccessAddressList
-    ( struct ELLLIST *pList, const ENV_PARAM *pEnv, 
-    unsigned short port, int ignoreNonDefaultPort );
-
-epicsShareFunc void epicsShareAPI printChannelAccessAddressList 
-    ( const struct ELLLIST *pList );
-
-epicsShareFunc void epicsShareAPI removeDuplicateAddresses
-    ( struct ELLLIST *pDestList, ELLLIST *pSrcList, int silent);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ifndef addrListh */
-

src/ca/client/autoPtrDestroy.h

@@ -1,94 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-*     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. 
-\*************************************************************************/
-
-/*  
- *
- *                              
- *                    L O S  A L A M O S
- *              Los Alamos National Laboratory
- *               Los Alamos, New Mexico 87545
- *                                  
- *  Copyright, The Regents of the University of California.
- *                                  
- *           
- *	Author Jeffrey O. Hill
- *	johill@lanl.gov
- *	505 665 1831
- */
-
-#ifndef autoPtrDestroyh
-#define autoPtrDestroyh
-
-template < class T >
-class autoPtrDestroy {
-public:
-    autoPtrDestroy ( T * );
-    ~autoPtrDestroy ();
-    T & operator * () const;
-    T * operator -> () const;
-    autoPtrDestroy<T> & operator = ( T * );
-    T * get () const;
-    T * release ();
-private:
-    T * p;
-    // not implemented
-    autoPtrDestroy<T> & operator = ( const autoPtrDestroy<T> & );
-    autoPtrDestroy ( const autoPtrDestroy<T> & );
-};
-
-template < class T >
-inline autoPtrDestroy<T>::autoPtrDestroy ( T *pIn ) :
-    p ( pIn ) {}
-
-template < class T >
-inline autoPtrDestroy<T>::~autoPtrDestroy ()
-{
-    if ( this->p ) {
-        this->p->destroy ();
-    }
-}
-
-template < class T >
-inline T & autoPtrDestroy<T>::operator * () const
-{
-    return * this->p;
-}
-
-template < class T >
-inline T * autoPtrDestroy<T>::operator -> () const
-{
-    return this->p;
-}
-
-template < class T >
-inline autoPtrDestroy<T> & autoPtrDestroy<T>::operator = ( T * pIn )
-{
-    if ( this->p ) {
-        this->p->destroy ();
-    }
-    this->p = pIn;
-    return *this;
-}
-
-template < class T >
-inline T * autoPtrDestroy<T>::get () const
-{
-    return this->p;
-}
-
-template < class T >
-inline T * autoPtrDestroy<T>::release ()
-{
-    T *pTmp = this->p;
-    this->p = 0;
-    return pTmp;
-}
-
-#endif // #ifdef autoPtrDestroyh

src/ca/client/autoPtrFreeList.h

@@ -1,104 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-*     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. 
-\*************************************************************************/
-
-/*  
- *
- *                              
- *                    L O S  A L A M O S
- *              Los Alamos National Laboratory
- *               Los Alamos, New Mexico 87545
- *                                  
- *  Copyright, The Regents of the University of California.
- *                                  
- *           
- *	Author Jeffrey O. Hill
- *	johill@lanl.gov
- *	505 665 1831
- */
-
-#ifndef autoPtrFreeListh
-#define autoPtrFreeListh
-
-#ifdef epicsExportSharedSymbols
-#   define autoPtrFreeListh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
-#include "tsFreeList.h"
-#include "compilerDependencies.h"
-
-#ifdef autoPtrFreeListh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#endif
-
-template < class T, unsigned N = 0x400, class MUTEX = epicsMutex >
-class autoPtrFreeList {
-public:
-    autoPtrFreeList ( tsFreeList < T, N, MUTEX > &, T * );
-    ~autoPtrFreeList ();
-    T & operator * () const;
-    T * operator -> () const;
-    T * get () const;
-    T * release ();
-private:
-    T * p;
-    tsFreeList < T, N, MUTEX > & freeList;
-    // not implemented
-    autoPtrFreeList & operator = ( const autoPtrFreeList & );
-    autoPtrFreeList ( const autoPtrFreeList < T, N, MUTEX > & );
-};
-
-template < class T, unsigned N, class MUTEX >
-inline autoPtrFreeList < T, N, MUTEX >::autoPtrFreeList ( 
-    tsFreeList < T, N, MUTEX > & freeListIn, T * pIn ) :
-    p ( pIn ), freeList ( freeListIn ) {}
-
-template < class T, unsigned N, class MUTEX >
-inline autoPtrFreeList < T, N, MUTEX >::~autoPtrFreeList ()
-{
-    if ( this->p ) {
-        this->p->~T();
-        // its probably a good idea to require that the class has placement delete
-        // by calling it during cleanup if the compiler supports it
-#       if defined ( CXX_PLACEMENT_DELETE )
-            T::operator delete ( this->p, this->freeList );
-#       else
-            this->freeList.release ( this->p );
-#       endif
-    }
-}
-
-template < class T, unsigned N, class MUTEX >
-inline T & autoPtrFreeList < T, N, MUTEX >::operator * () const
-{
-    return * this->p;
-}
-
-template < class T, unsigned N, class MUTEX >
-inline T * autoPtrFreeList < T, N, MUTEX >::operator -> () const
-{
-    return this->p;
-}
-
-template < class T, unsigned N, class MUTEX >
-inline T * autoPtrFreeList < T, N, MUTEX >::get () const
-{
-    return this->p;
-}
-
-template < class T, unsigned N, class MUTEX >
-inline T * autoPtrFreeList < T, N, MUTEX >::release ()
-{
-    T *pTmp = this->p;
-    this->p = 0;
-    return pTmp;
-}
-
-#endif // #ifdef autoPtrFreeListh

src/ca/client/autoPtrRecycle.h

@@ -1,92 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-*     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. 
-\*************************************************************************/
-
-/*  
- *
- *                              
- *                    L O S  A L A M O S
- *              Los Alamos National Laboratory
- *               Los Alamos, New Mexico 87545
- *                                  
- *  Copyright, The Regents of the University of California.
- *                                  
- *           
- *	Author Jeffrey O. Hill
- *	johill@lanl.gov
- *	505 665 1831
- */
-
-#ifndef autoPtrRecycleh
-#define autoPtrRecycleh
-
-template < class T >
-class autoPtrRecycle {
-public:
-    autoPtrRecycle ( 
-        epicsGuard < epicsMutex > &, chronIntIdResTable < baseNMIU > &,
-        cacRecycle &, T * );
-    ~autoPtrRecycle ();
-    T & operator * () const;
-    T * operator -> () const;
-    T * get () const;
-    T * release ();
-private:
-    T * p;
-    cacRecycle & r;
-    chronIntIdResTable < baseNMIU > & ioTable;
-    epicsGuard < epicsMutex > & guard;
-    // not implemented
-	autoPtrRecycle ( const autoPtrRecycle & );
-	autoPtrRecycle & operator = ( const autoPtrRecycle & );
-};
-
-template < class T >
-inline autoPtrRecycle<T>::autoPtrRecycle ( 
-    epicsGuard < epicsMutex > & guardIn, chronIntIdResTable < baseNMIU > & tbl,
-        cacRecycle & rIn, T * pIn ) :
-    p ( pIn ), r ( rIn ), ioTable ( tbl ), guard ( guardIn ) {}
-
-template < class T >
-inline autoPtrRecycle<T>::~autoPtrRecycle ()
-{
-    if ( this->p ) {
-        baseNMIU *pb = this->p;
-        this->ioTable.remove ( *pb );
-        pb->destroy ( this->guard, this->r );
-    }
-}
-
-template < class T >
-inline T & autoPtrRecycle<T>::operator * () const
-{
-    return * this->p;
-}
-
-template < class T >
-inline T * autoPtrRecycle<T>::operator -> () const
-{
-    return this->p;
-}
-
-template < class T >
-inline T * autoPtrRecycle<T>::get () const
-{
-    return this->p;
-}
-
-template < class T >
-inline T * autoPtrRecycle<T>::release ()
-{
-    T *pTmp = this->p;
-    this->p = 0;
-    return pTmp;
-}
-
-#endif // #ifdef autoPtrRecycleh

src/ca/client/baseNMIU.cpp

@@ -1,39 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-*     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. 
-\*************************************************************************/
-
-/*  
- *
- *                    L O S  A L A M O S
- *              Los Alamos National Laboratory
- *               Los Alamos, New Mexico 87545
- *
- *  Copyright, the Regents of the University of California.
- *
- *  Author: Jeff Hill
- */
-
-#define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
-
-#include "iocinf.h"
-#include "nciu.h"
-#include "netIO.h"
-
-baseNMIU::~baseNMIU ()
-{
-}
-
-void baseNMIU::forceSubscriptionUpdate (
-        epicsGuard < epicsMutex > &, nciu & )
-{
-}
-
-
-
-

src/ca/client/bhe.cpp

@@ -1,358 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-*     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. 
-\*************************************************************************/
-    
-/*  
- *
- *                    L O S  A L A M O S
- *              Los Alamos National Laboratory
- *               Los Alamos, New Mexico 87545
- *
- *  Copyright, 1986, The Regents of the University of California.
- *
- *  Author: Jeff Hill
- */
-
-#include <string>
-#include <stdexcept>
-#include <limits.h>
-#include <float.h>
-
-#define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
-
-#include "errlog.h"
-
-#define epicsExportSharedSymbols
-#include "iocinf.h"
-#include "virtualCircuit.h"
-#include "bhe.h"
-
-/*
- * set average to -1.0 so that when the next beacon
- * occurs we can distinguish between:
- * o new server
- * o existing server's beacon we are seeing
- *  for the first time shortly after program
- *  start up
- *
- * if creating this in response to a search reply
- * and not in response to a beacon then 
- * we set the beacon time stamp to
- * zero (so we can correctly compute the period
- * between the 1st and 2nd beacons)
- */
-bhe::bhe ( epicsMutex & mutexIn, const epicsTime & initialTimeStamp, 
-          unsigned initialBeaconNumber, const inetAddrID & addr ) :
-    inetAddrID ( addr ), timeStamp ( initialTimeStamp ), averagePeriod ( - DBL_MAX ),
-    mutex ( mutexIn ), pIIU ( 0 ), lastBeaconNumber ( initialBeaconNumber )
-{
-#   ifdef DEBUG
-    {
-        char name[64];
-        addr.name ( name, sizeof ( name ) );
-        ::printf ( "created beacon entry for %s\n", name );
-    }
-#   endif
-}
-
-bhe::~bhe ()
-{
-}
-
-void bhe::beaconAnomalyNotify ( epicsGuard < epicsMutex > & guard )
-{
-    guard.assertIdenticalMutex ( this->mutex );
-    if ( this->pIIU ) {
-        this->pIIU->beaconAnomalyNotify ( guard );
-    }
-}
-
-#ifdef DEBUG
-void bhe::logBeacon ( const char * pDiagnostic, 
-                     const double & currentPeriod,
-                     const epicsTime & currentTime )
-{
-    if ( this->pIIU ) {
-        char name[64];
-        this->name ( name, sizeof ( name ) );
-        char date[64];
-        currentTime.strftime ( date, sizeof ( date ), 
-            "%a %b %d %Y %H:%M:%S.%f");
-        ::printf ( "%s cp=%g ap=%g %s %s\n",
-            pDiagnostic, currentPeriod, 
-            this->averagePeriod, name, date );
-    }
-}
-#else
-inline void bhe::logBeacon ( const char * /* pDiagnostic */,
-    const double & /* currentPeriod */,
-    const epicsTime & /* currentTime */ )
-{
-}
-#endif
-
-#ifdef DEBUG
-void bhe::logBeaconDiscard ( unsigned beaconAdvance,
-                     const epicsTime & currentTime )
-{
-    if ( this->pIIU ) {
-        char name[64];
-        this->name ( name, sizeof ( name ) );
-        char date[64];
-        currentTime.strftime ( date, sizeof ( date ), 
-            "%a %b %d %Y %H:%M:%S.%f");
-        ::printf ( "bb %u %s %s\n",
-            beaconAdvance, name, date );
-    }
-}
-#else
-void bhe::logBeaconDiscard ( unsigned /* beaconAdvance */,
-                     const epicsTime & /* currentTime */ )
-{
-}
-#endif
-
-/*
- * update beacon period
- *
- * updates beacon period, and looks for beacon anomalies
- */
-bool bhe::updatePeriod ( 
-    epicsGuard < epicsMutex > & guard, const epicsTime & programBeginTime, 
-    const epicsTime & currentTime, ca_uint32_t beaconNumber, 
-    unsigned protocolRevision )
-{
-    guard.assertIdenticalMutex ( this->mutex );
-
-    //
-    // this block is enetered if the beacon was created as a side effect of
-    // creating a connection and so we dont yet know the first beacon time 
-    // and  sequence number
-    //
-    if ( this->timeStamp == epicsTime () ) {
-        if ( CA_V410 ( protocolRevision ) ) {
-            this->lastBeaconNumber = beaconNumber;
-        }
-
-        this->beaconAnomalyNotify ( guard );
-
-        /* 
-         * this is the 1st beacon seen - the beacon time stamp
-         * was not initialized during BHE create because
-         * a TCP/IP connection created the beacon.
-         * (nothing to do but set the beacon time stamp and return)
-         */
-        this->timeStamp = currentTime;
-
-        logBeacon ( "fb", - DBL_MAX, currentTime );
-
-        return false;
-    }
-
-    // 1) detect beacon duplications due to redundant routes
-    // 2) detect lost beacons due to input queue overrun or damage
-    if ( CA_V410 ( protocolRevision ) ) {
-        unsigned beaconSeqAdvance;
-        if ( beaconNumber >= this->lastBeaconNumber ) {
-            beaconSeqAdvance = beaconNumber - this->lastBeaconNumber;
-        }
-        else {
-            beaconSeqAdvance = ( ca_uint32_max - this->lastBeaconNumber ) + beaconNumber;
-        }
-        this->lastBeaconNumber = beaconNumber;
-
-        // throw out sequence numbers just prior to, or the same as, the last one received 
-        // (this situation is probably caused by a temporary duplicate route )
-        if ( beaconSeqAdvance == 0 ||  beaconSeqAdvance > ca_uint32_max - 256 ) {
-            logBeaconDiscard ( beaconSeqAdvance, currentTime );
-            return false;
-        }
-
-        // throw out sequence numbers that jump forward by only a few numbers 
-        // (this situation is probably caused by a duplicate route 
-        // or a beacon due to input queue overun)
-        if ( beaconSeqAdvance > 1 &&  beaconSeqAdvance < 4 ) {
-            logBeaconDiscard ( beaconSeqAdvance, currentTime );
-            return false;
-        }
-    }
-
-    // compute the beacon period (if we have seen at least two beacons)
-    bool netChange = false;
-    double currentPeriod = currentTime - this->timeStamp;
-
-    if ( this->averagePeriod < 0.0 ) {
-        double totalRunningTime;
-
-        this->beaconAnomalyNotify ( guard );
-
-        /*
-         * this is the 2nd beacon seen. We cant tell about
-         * the change in period at this point so we just
-         * initialize the average period and return.
-         */
-        this->averagePeriod = currentPeriod;
-
-        logBeacon ( "fp", currentPeriod, currentTime );
-
-
-        /*
-         * ignore beacons seen for the first time shortly after
-         * init, but do not ignore beacons arriving with a short
-         * period because the IOC was rebooted soon after the 
-         * client starts up.
-         */
-        totalRunningTime = this->timeStamp - programBeginTime;
-        if ( currentPeriod <= totalRunningTime ) {
-            netChange = true;
-        }
-    }
-    else {
-
-        /*
-         * Is this an IOC seen because of a restored
-         * network segment? 
-         *
-         * It may be possible to get false triggers here 
-         * if the client is busy, but this does not cause
-         * problems because the echo response will tell us 
-         * that the server is available
-         */
-        if ( currentPeriod >= this->averagePeriod * 1.25 ) {
-
-            /* 
-             * trigger on any missing beacon 
-             * if connected to this server
-             */    
-            this->beaconAnomalyNotify ( guard );
-
-            if ( currentPeriod >= this->averagePeriod * 3.25 ) {
-                /* 
-                 * trigger on any 3 contiguous missing beacons 
-                 * if not connected to this server
-                 */
-                netChange = true;
-            }
-            logBeacon ( "bah", currentPeriod, currentTime );
-        }
-
-        /*
-         * Is this an IOC seen because of an IOC reboot
-         * (beacon come at a higher rate just after the
-         * IOC reboots). Lower tolarance here because we
-         * dont have to worry about lost beacons.
-         *
-         * It may be possible to get false triggers here 
-         * if the client is busy, but this does not cause
-         * problems because the echo response will tell us 
-         * that the server is available
-         */
-        else if ( currentPeriod <= this->averagePeriod * 0.80 ) {
-            this->beaconAnomalyNotify ( guard );
-            netChange = true;
-            logBeacon ( "bal", currentPeriod, currentTime );
-        }
-        else if ( this->pIIU ) {
-            // update state of health for active virtual circuits 
-            // if the beacon looks ok
-            this->pIIU->beaconArrivalNotify ( guard );
-            logBeacon ( "vb", currentPeriod, currentTime );
-        }
-
-        // update a running average period
-        this->averagePeriod = currentPeriod * 0.125 + 
-            this->averagePeriod * 0.875;
-    }
-
-    this->timeStamp = currentTime;
-
-    return netChange;
-}
-
-void bhe::show ( unsigned level ) const
-{
-    epicsGuard < epicsMutex > guard ( this->mutex );
-    this->show ( guard, level );
-}
-
-void bhe::show ( epicsGuard < epicsMutex > &, unsigned level ) const
-{
-    char host [64];
-    this->name ( host, sizeof ( host ) );
-    if ( this->averagePeriod == -DBL_MAX ) {
-        ::printf ( "CA beacon hash entry for %s <no period estimate>\n", 
-            host );
-    }
-    else {
-        ::printf ( "CA beacon hash entry for %s with period estimate %f\n", 
-            host, this->averagePeriod );
-    }
-    if ( level > 0u ) {
-        char date[64];
-        this->timeStamp.strftime ( date, sizeof ( date ), "%a %b %d %Y %H:%M:%S");
-        ::printf ( "\tbeacon number %u, on %s\n", 
-            this->lastBeaconNumber, date );
-    }
-}
-
-double bhe::period ( epicsGuard < epicsMutex > & guard ) const 
-{
-    guard.assertIdenticalMutex ( this->mutex );
-    return this->averagePeriod;
-}
-
-epicsTime bhe::updateTime ( epicsGuard < epicsMutex > & guard ) const
-{
-    guard.assertIdenticalMutex ( this->mutex );
-    return this->timeStamp;
-}
-
-void bhe::registerIIU ( 
-    epicsGuard < epicsMutex > & guard, tcpiiu & iiu )
-{
-    guard.assertIdenticalMutex ( this->mutex );
-    this->pIIU = & iiu;
-}
-
-void bhe::unregisterIIU ( 
-    epicsGuard < epicsMutex > & guard, tcpiiu & iiu )
-{
-    guard.assertIdenticalMutex ( this->mutex );
-    if ( this->pIIU == & iiu ) {
-        this->pIIU = 0;
-        this->timeStamp = epicsTime();
-        this->averagePeriod = - DBL_MAX;
-        logBeacon ( "ui", this->averagePeriod, epicsTime::getCurrent () );
-    }
-}
-
-void bhe::operator delete ( void * )
-{
-    // Visual C++ .net appears to require operator delete if
-    // placement operator delete is defined? I smell a ms rat
-    // because if I declare placement new and delete, but
-    // comment out the placement delete definition there are
-    // no undefined symbols.
-    errlogPrintf ( "%s:%d this compiler is confused about placement delete - memory was probably leaked",
-        __FILE__, __LINE__ );
-}
-
-void * bheFreeStore::allocate ( size_t size )
-{
-    return freeList.allocate ( size );
-}
-
-void bheFreeStore::release ( void * pCadaver )
-{
-    freeList.release ( pCadaver );
-}
-
-bheMemoryManager::~bheMemoryManager () {}
-
-

src/ca/client/bhe.h

@@ -1,122 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-*     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. 
-\*************************************************************************/
-
-/*  
- *
- *                    L O S  A L A M O S
- *              Los Alamos National Laboratory
- *               Los Alamos, New Mexico 87545
- *
- *  Copyright, 1986, The Regents of the University of California.
- *
- *  Author: Jeff Hill
- */
-
-#ifndef bheh
-#define bheh
-
-#ifdef epicsExportSharedSymbols
-#   define bhehEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
-#include "tsDLList.h"
-#include "tsFreeList.h"
-#include "epicsTime.h"
-#include "compilerDependencies.h"
-
-#ifdef bhehEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
-
-#include "inetAddrID.h"
-#include "caProto.h"
-
-class tcpiiu;
-class bheMemoryManager;
-
-// using a pure abstract wrapper class around the free list avoids
-// Tornado 2.0.1 GNU compiler bugs
-class epicsShareClass bheMemoryManager {
-public:
-    virtual ~bheMemoryManager ();
-    virtual void * allocate ( size_t ) = 0;
-    virtual void release ( void * ) = 0;
-};
-
-class bhe : public tsSLNode < bhe >, public inetAddrID {
-public:
-    epicsShareFunc bhe ( 
-        epicsMutex &, const epicsTime & initialTimeStamp, 
-        unsigned initialBeaconNumber, const inetAddrID & addr );
-    epicsShareFunc ~bhe (); 
-    epicsShareFunc bool updatePeriod ( 
-        epicsGuard < epicsMutex > &,
-        const epicsTime & programBeginTime, 
-        const epicsTime & currentTime, ca_uint32_t beaconNumber, 
-        unsigned protocolRevision );
-    epicsShareFunc double period ( epicsGuard < epicsMutex > & ) const;
-    epicsShareFunc epicsTime updateTime ( epicsGuard < epicsMutex > & ) const;
-    epicsShareFunc void show ( unsigned level ) const;
-    epicsShareFunc void show ( epicsGuard < epicsMutex > &, unsigned /* level */ ) const;
-    epicsShareFunc void registerIIU ( epicsGuard < epicsMutex > &, tcpiiu & );
-    epicsShareFunc void unregisterIIU ( epicsGuard < epicsMutex > &, tcpiiu & );
-    epicsShareFunc void * operator new ( size_t size, bheMemoryManager & );
-#ifdef CXX_PLACEMENT_DELETE
-    epicsShareFunc void operator delete ( void *, bheMemoryManager & );
-#endif
-private:
-    epicsTime timeStamp;
-    double averagePeriod;
-    epicsMutex & mutex;
-    tcpiiu * pIIU;
-    ca_uint32_t lastBeaconNumber;
-    void beaconAnomalyNotify ( epicsGuard < epicsMutex > & );
-    void logBeacon ( const char * pDiagnostic, 
-                     const double & currentPeriod,
-                     const epicsTime & currentTime );
-    void logBeaconDiscard ( unsigned beaconAdvance,
-                     const epicsTime & currentTime );
-	bhe ( const bhe & );
-	bhe & operator = ( const bhe & );
-    epicsShareFunc void operator delete ( void * );
-};
-
-// using a wrapper class around the free list avoids
-// Tornado 2.0.1 GNU compiler bugs
-class bheFreeStore : public bheMemoryManager {
-public:
-    bheFreeStore () {}
-    void * allocate ( size_t );
-    void release ( void * );
-private:
-    tsFreeList < bhe, 0x100 > freeList;
-	bheFreeStore ( const bheFreeStore & );
-	bheFreeStore & operator = ( const bheFreeStore & );
-};
-
-inline void * bhe::operator new ( size_t size, 
-        bheMemoryManager & mgr )
-{ 
-    return mgr.allocate ( size );
-}
-
-#ifdef CXX_PLACEMENT_DELETE
-inline void bhe::operator delete ( void * pCadaver, 
-        bheMemoryManager & mgr )
-{ 
-    mgr.release ( pCadaver );
-}
-#endif
-
-#endif // ifdef bheh
-
-

src/ca/client/ca.rc

@@ -1,36 +0,0 @@
-#include <winver.h>
-#include "epicsVersion.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
- PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS VOS__WINDOWS32
- FILETYPE VFT_UNKNOWN
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments","Channel Access Library for EPICS\0"
-            VALUE "CompanyName", "The EPICS collaboration\0"
-            VALUE "FileDescription", "Channel Access Library\0"
-            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
-            VALUE "InternalName", "ca\0"
-            VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
-            VALUE "OriginalFilename", "ca.dll\0"
-            VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
-            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END

src/ca/client/caConnTest.cpp

@@ -1,109 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-*     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. 
-\*************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
-
-#include "cadef.h"
-#include "epicsTime.h"
-
-static unsigned channelCount = 0u;
-static unsigned connCount = 0u;
-static bool subsequentConnect = false;
-
-epicsTime begin;
-
-extern "C" void caConnTestConnHandler ( struct connection_handler_args args )
-{
-    if ( args.op == CA_OP_CONN_UP ) {
-        if ( connCount == 0u ) {
-            if ( subsequentConnect ) {
-                printf ("the first channel connected\n");
-                begin = epicsTime::getCurrent ();
-            }
-        }
-        connCount++;
-        // printf  ( "." );
-        // fflush ( stdout );
-        if ( connCount == channelCount ) {
-            epicsTime current = epicsTime::getCurrent ();
-            double delay = current - begin;
-            printf ( "all channels connected after %f sec ( %f sec per channel)\n",
-                delay, delay / channelCount );
-        }
-    }
-    else if ( args.op == CA_OP_CONN_DOWN ) {
-        if ( connCount == channelCount ) {
-            printf ( "channels are disconnected\n" );
-            subsequentConnect = true;
-        }
-        connCount--;
-        if ( connCount == 0u ) {
-            printf ( "all channels are disconnected\n" );
-        }
-    }
-    else {
-        assert ( 0 );
-    }
-}
-
-void caConnTest ( const char *pNameIn, unsigned channelCountIn, double delayIn )
-{
-    unsigned iteration = 0u;
-    int status;
-	unsigned i;
-	chid *pChans;
-
-    channelCount = channelCountIn;
-
-    pChans = new chid [channelCount];
-	
-	while ( 1 ) {
-        connCount = 0u;
-        subsequentConnect = false;
-        begin = epicsTime::getCurrent ();
-
-        printf ( "initializing CA client library\n" );
-
-		status = ca_task_initialize();
-		SEVCHK ( status, "CA init failed" );
-
-        printf ( "creating channels\n" );
-
-		for ( i = 0u; i < channelCount; i++ ) {
-			status = ca_search_and_connect ( pNameIn, 
-                &pChans[i], caConnTestConnHandler, 0 );
-			SEVCHK ( status, "CA search problems" );
-		}
-
-        printf ( "all channels were created\n" );
-
-		ca_pend_event ( delayIn );
-
-        if ( iteration & 1 ) {
-		    for ( i = 0u; i < channelCount; i++ ) {
-			    status = ca_clear_channel ( pChans[i] );
-			    SEVCHK ( status, "ca_clear_channel() problems" );
-		    }
-            printf ( "all channels were destroyed\n" );
-        }
-
-        printf ( "shutting down CA client library\n" );
-
-		status = ca_task_exit ();
-		SEVCHK ( status, "task exit problems" );
-
-        iteration++;
-	}
-
-    //delete [] pChans;
-}

src/ca/client/caConnTestMain.cpp

@@ -1,45 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-*     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. 
-\*************************************************************************/
-
-#include <stdio.h>
-#include <epicsStdlib.h>
-
-#include "caDiagnostics.h"
-
-int main ( int argc, char **argv )
-{
-    double delay = 60.0 * 5.0;
-    unsigned count = 2000;
-
-    if ( argc < 2 || argc > 4 ) {
-        printf ( "usage: %s < channel name > [ < count > ] [ < delay sec > ]\n", argv[0] );
-        return -1;
-    }
-
-    if ( argc >= 3 ) {
-        int nConverted = sscanf ( argv[2], "%u", &count );
-        if ( nConverted != 1 ) {
-            printf ( "conversion failed, changing channel count arg \"%s\" to %u\n",
-                argv[1], count );
-        }
-    }
-
-    if ( argc >= 4 ) {
-        int nConverted = epicsScanDouble( argv[3], &delay );
-        if ( nConverted != 1 ) {
-            printf ( "conversion failed, changing delay arg \"%s\" to %f\n",
-                argv[2], delay );
-        }
-    }
-
-    caConnTest ( argv[1], count, delay );
-
-    return 0;
-}