Clear development flags for 7.0.3.1

Also contains some reformatting in README.md

.appveyor.yml

@@ -0,0 +1,123 @@
+# 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: 50
+
+# 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: mingw
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    TOOLCHAIN: 2019
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    TOOLCHAIN: 2017
+  - TOOLCHAIN: 14.0
+  - TOOLCHAIN: 12.0
+  - TOOLCHAIN: 11.0
+  - TOOLCHAIN: 10.0
+
+# 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
+  # Exclude to reduce total job runtime
+  # skip 64-bit for older and 32-bit for newer
+  - platform: x64
+    TOOLCHAIN: 11.0
+  - platform: x86
+    TOOLCHAIN: mingw
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+  - platform: x86
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    TOOLCHAIN: 2019
+  - platform: x86
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    TOOLCHAIN: 2017
+
+
+#---------------------------------#
+#     building & testing          #
+#---------------------------------#
+
+install:
+  - cmd: git submodule update --init --recursive
+  - cmd: .ci/appveyor-prepare.bat
+
+build_script:
+  - cmd: .ci/appveyor-make.bat
+
+test_script:
+  - cmd: .ci/appveyor-make.bat tapfiles
+  - cmd: .ci/appveyor-make.bat test-results
+
+on_finish:
+  - ps: Get-ChildItem *.tap -Recurse -Force | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+
+
+#---------------------------------#
+#         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
+
+#on_failure:
+#  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+#  - 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

.bzrignore

@@ -1,9 +0,0 @@
-./bin
-./lib
-./db
-./dbd
-./html
-./include
-./templates
-**/O.*
-./QtC-*

.ci/appveyor-make.bat

@@ -0,0 +1,132 @@
+:: Universal build script for AppVeyor (https://ci.appveyor.com/)
+:: Environment:
+::     TOOLCHAIN      -  toolchain version   [10.0/11.0/12.0/14.0/2017/2019/mingw]
+::     CONFIGURATION  -  determines EPICS build   [dynamic/static]
+::     PLATFORM       -  architecture   [x86/x64]
+::
+:: All command line args are passed to make
+
+Setlocal EnableDelayedExpansion
+
+:: we do not currently have a combined static and debug EPICS_HOST_ARCH target
+:: So a combined debug and static target will appear to be just static
+:: but debug will have been specified in CONFIG_SITE by appveyor-prepare.bat
+set "ST="
+echo.%CONFIGURATION% | findstr /C:"debug">nul && (
+    set "ST=-debug"
+)
+echo.%CONFIGURATION% | findstr /C:"static">nul && (
+    set "ST=-static"
+)
+
+set MY_OS=64BIT
+if "%PLATFORM%"=="x86" set MY_OS=32BIT
+
+echo [INFO] Platform: %MY_OS%
+
+:: Use parallel make, except for 3.14
+set "MAKEARGS=-j2 -Otarget"
+if "%APPVEYOR_REPO_BRANCH%"=="3.14" set MAKEARGS=
+
+if "%TOOLCHAIN%"=="mingw" (
+    set "MAKE=mingw32-make"
+    if "%MY_OS%"=="64BIT" (
+        set "EPICS_HOST_ARCH=windows-x64-mingw"
+        set "INCLUDE=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\include;%INCLUDE%"
+        set "PATH=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;%PATH%"
+        echo [INFO] MinGW Toolchain 64bit
+    ) else (
+        set "EPICS_HOST_ARCH=win32-x86-mingw"
+        set "INCLUDE=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\include;%INCLUDE%"
+        set "PATH=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin;%PATH%"
+        echo [INFO] MinGW Toolchain 32bit
+    )
+    echo [INFO] Compiler Version
+    gcc -v
+    goto Finish
+)
+
+if "%TOOLCHAIN%"=="2019" (
+    echo [INFO] Setting strawberry perl path
+    set "PATH=c:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH%"
+)
+
+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 "%MY_OS%"=="64BIT" (
+    set EPICS_HOST_ARCH=windows-x64%ST%
+    :: VS 2017/2019
+    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/2019
+    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% / %MY_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,52 @@
+:: Build script for AppVeyor (https://ci.appveyor.com/)
+:: Environment:
+::     TOOLCHAIN      -  Toolchain Version  [9.0/10.0/11.0/12.0/14.0/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 Mingw  (TOOLCHAIN setting) in the in the appropriate flavor
+::     - Download and install Make-4.1 from EPICS download page
+
+Setlocal EnableDelayedExpansion
+
+set MY_OS=64BIT
+if "%PLATFORM%"=="x86" set MY_OS=32BIT
+
+echo [INFO] Platform: %MY_OS%
+
+:: with MSVC either static or debug can be handled as part
+:: of EPICS_HOST_ARCH but not both. So we set the appropriate
+:: options in CONFIG_SITE. For mingw and cygwin they are missing
+:: some static and debug targets so set things here too
+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
+)
+
+echo [INFO] Installing Make 4.2.1 from ANL web site
+curl -fsS --retry 3 -o C:\tools\make-4.2.1.zip https://epics.anl.gov/download/tools/make-4.2.1-win64.zip
+cd \tools
+"C:\Program Files\7-Zip\7z" e make-4.2.1.zip
+
+set "PERLVER=5.30.0.1"
+if "%TOOLCHAIN%"=="2019" (
+    echo [INFO] Installing Strawberry Perl %PERLVER%
+    curl -fsS --retry 3 -o C:\tools\perl-%PERLVER%.zip http://strawberryperl.com/download/%PERLVER%/strawberry-perl-%PERLVER%-64bit.zip
+    cd \tools
+    "C:\Program Files\7-Zip\7z" x perl-%PERLVER%.zip -oC:\strawberry
+    cd \strawberry
+    :: we set PATH in appveyor-build.bat
+    call relocation.pl.bat
+)

.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/travis-build.sh

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

.gitattributes

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

.gitignore

@@ -0,0 +1,16 @@
+/cfg/
+/bin/
+/lib/
+/db/
+/dbd/
+/html/
+/include/
+/templates/
+/configure/*.local
+/modules/RELEASE.*.local
+/modules/Makefile.local
+O.*/
+/QtC-*
+*.orig
+*.log
+.*.swp

.gitmodules

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

.tools/make-tar.sh

@@ -0,0 +1,133 @@
+#!/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> [<prefix>]]
+
+  <rev> may be any git revision spec. (tag, branch, or commit id).
+
+  If provided, <outfile> must end with ".tar", ".tar.gz" or ".tar.bz2".
+  If <outfile> is omitted, "base-<rev>.tar.gz" will be used.
+  If provided, <prefix> must end with "/".  If <prefix> is omitted,
+  the default is "base-<rev>/".
+EOF
+   exit 1
+fi
+
+case "$FINALTAR" in
+"")
+  TAROPT=-z
+  FINALTAR="base-$TOPREV.tar.gz"
+  ;;
+*.tar)
+  TAROPT=""
+  ;;
+*.tar.gz)
+  TAROPT=-z
+  ;;
+*.tar.bz2)
+  TAROPT=-j
+  ;;
+*)
+  die "outfile must end with '.tar.gz' or '.tar.bz2'"
+  ;;
+esac
+
+case "$PREFIX" in
+"")
+  PREFIX="base-$TOPREV/"
+  ;;
+*/)
+  ;;
+*)
+  die "Prefix must end with '/'"
+  ;;
+esac
+
+# Check for both <tag> and R<tag>
+if [ "$TOPREV" = "HEAD" ]
+then
+  true
+elif ! [ `git tag -l $TOPREV` ]
+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 '/\/\.tools\//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
+tar -c $TAROPT -C "$TDIR"/tar -T "$TDIR"/list.2 -f "$FINALTAR"
+
+echo "Wrote $FINALTAR"
+
+tar -t $TAROPT -f "$FINALTAR" > "$TDIR"/list.3
+
+# make sure we haven't picked up anything extra
+if ! diff -u "$TDIR"/list.2 "$TDIR"/list.3
+then
+    echo "Oops! Tarfile diff against plan shown above"
+fi

.travis.yml

@@ -0,0 +1,27 @@
+sudo: false
+dist: trusty
+language: c
+compiler:
+  - gcc
+addons:
+  apt:
+    packages:
+    - libreadline6-dev
+    - libncurses5-dev
+    - perl
+    - clang
+    - g++-mingw-w64-i686
+    - qemu-system-x86
+script:
+  - .ci/travis-build.sh
+env:
+  - CMPLR=gcc EXTRA=LINKER_USE_RPATH=ORIGIN
+  - CMPLR=clang
+  - CMPLR=gcc   STATIC=YES
+  - CMPLR=clang STATIC=YES
+  - CMPLR=gcc   EXTRA=CMD_CXXFLAGS=-std=c++11
+  - CMPLR=clang EXTRA=CMD_CXXFLAGS=-std=c++11
+  - WINE=32 TEST=NO STATIC=YES
+  - WINE=32 TEST=NO STATIC=NO
+  - RTEMS=4.10 TEST=YES
+  - RTEMS=4.9  TEST=YES

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
-	http://www.aps.anl.gov/epics/
+	https://epics.anl.gov/
 
+$Format:%cD$
+$Format:%H$
+https://code.launchpad.net/epics-base

configure/CONFIG

@@ -20,11 +20,15 @@ else
 endif
 
 # Provide a default if the user hasn't set EPICS_HOST_ARCH
-ifeq ($(origin EPICS_HOST_ARCH), undefined)
-  # NB: We use a simply expanded variable here for performance:
-  EPICS_HOST_ARCH := $(shell $(CONFIG)/../startup/EpicsHostArch.pl)
-endif
 #
+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 :=
+endif
 
 -include $(CONFIG)/RELEASE
 -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH)
@@ -54,8 +58,12 @@ include $(CONFIG)/CONFIG_BASE_VERSION
 include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).Common
 -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
 
+# Parse configure/RELEASE
+# except when building Base itself, where this file is empty,
+# and would error in src/tools/ anyway.
+ifndef BASE_TOP
 RELEASE_TOPS := $(shell $(CONVERTRELEASE) -T $(TOP) releaseTops)
-
+endif
 
 ifdef T_A
 
@@ -73,17 +81,17 @@ ifdef T_A
   #
   -include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).$(T_A)
 
+  #  Site specific target and host-target definitions and overrides
+  #
+  -include $(CONFIG)/os/CONFIG_SITE.Common.$(T_A)
+  -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+
   #  RELEASE file specific definitions
   #
   ifneq ($(CONFIG),$(TOP)/configure)
     -include $(CONFIG)/CONFIG_APP_INCLUDE
   endif
 
-  #  Site specific target and host-target definitions
-  #
-  -include $(CONFIG)/os/CONFIG_SITE.Common.$(T_A)
-  -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
-
 endif # ifdef T_A
 
 

configure/CONFIG.CrossCommon

@@ -17,14 +17,14 @@ BUILD_CLASS = CROSS
 #   ifdef CROSS    looks better than  ifeq ($(BUILD_CLASS),CROSS)
 CROSS = YES
 
-GNU_TARGET_INCLUDE_DIR = $(GNU_TARGET:%= $(GNU_DIR)/%/include)
-GNU_TARGET_LIB_DIR = $(GNU_TARGET:%= $(GNU_DIR)/%/lib)
+GNU_TARGET_INCLUDE_DIR = $(wildcard $(GNU_TARGET:%=$(GNU_DIR)/%/include))
+GNU_TARGET_LIB_DIR = $(wildcard $(GNU_TARGET:%=$(GNU_DIR)/%/lib))
 
-CROSS_INCLUDES = $(addprefix -I,$(GNU_TARGET_INCLUDE_DIR))
-CROSS_LDFLAGS = $(addprefix -L,$(GNU_TARGET_LIB_DIR))
+CROSS_INCLUDES = $(GNU_TARGET_INCLUDE_DIR:%=-I%)
+CROSS_LDFLAGS = $(GNU_TARGET_LIB_DIR:%=-L%)
 
-CMPLR_PREFIX_CROSS=$(addsuffix -,$(GNU_TARGET))
-CMPLR_PREFIX=$(CMPLR_PREFIX_$(BUILD_CLASS))
+CMPLR_PREFIX_CROSS = $(addsuffix -,$(GNU_TARGET))
+CMPLR_PREFIX = $(CMPLR_PREFIX_$(BUILD_CLASS))
 
 # Cross builds usually use the gnu compiler
 include $(CONFIG)/CONFIG.gnuCommon

configure/CONFIG.gnuCommon

@@ -24,9 +24,14 @@ LD = $(GNU_BIN)/$(CMPLR_PREFIX)ld$(CMPLR_SUFFIX) -r
 CPP = $(CC) -x c -E
 RANLIB = $(GNU_BIN)/$(CMPLR_PREFIX)ranlib$(CMPLR_SUFFIX)
 
+# Requires at least GCC 4.8 or LLVM (clang) 3.1
+ASAN_FLAGS_YES = -fsanitize=address
+ASAN_LDFLAGS_YES = $(ASAN_FLAGS_YES)
+
 PROF_CFLAGS_YES = -p
 GPROF_CFLAGS_YES = -pg
 CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF))
+CODE_CFLAGS += $(ASAN_FLAGS_$(ENABLE_ASAN))
 WARN_CFLAGS_YES = -Wall
 WARN_CFLAGS_NO = -w
 OPT_CFLAGS_YES = -O3
@@ -35,12 +40,14 @@ OPT_CFLAGS_NO = -g
 PROF_CXXFLAGS_YES = -p
 GPROF_CXXFLAGS_YES = -pg
 CODE_CXXFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
+CODE_CXXFLAGS += $(ASAN_FLAGS_$(ENABLE_ASAN))
 WARN_CXXFLAGS_YES = -Wall
 WARN_CXXFLAGS_NO = -w
 OPT_CXXFLAGS_YES = -O3
 OPT_CXXFLAGS_NO = -g
 
 CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
+CODE_LDFLAGS += $(ASAN_LDFLAGS_$(ENABLE_ASAN))
 
 PIPE_CFLAGS_YES_YES = -pipe
 PIPE_CFLAGS = $(PIPE_CFLAGS_$(GCC_PIPE)_$(GNU))

configure/CONFIG_ADDONS

@@ -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.
 #*************************************************************************
 #
 #	check for add-on CFLAGS and CXXFLAGS
@@ -37,9 +37,6 @@
 #    PROD_LIBS     libs needed by PROD and TESTPROD
 #    LIB_LIBS      libs needed by shared LIBRARY
 #    SHRLIB_LIBS   libs needed by shared LIBRARY
-#    USR_OBJLIBS   R3.13 vxWorks object libs needed building libraries and prods
-#    PROD_OBJLIBS  R3.13 vxWorks object    libs needed for building prods
-#    LIB_OBJLIBS   R3.13 vxWorks object libs needed for building libraries
 #    USR_SYS_LIBS  system libs needed building libraries and prods
 #    PROD_SYS_LIBS system libs needed for building prods
 #    LIB_SYS_LIBS  system libs needed for building libraries
@@ -273,30 +270,6 @@ OBJS_HOST+=$(OBJS_HOST_DEFAULT)
 endif
 endif
 
-ifneq ($(strip $(PROD_OBJLIBS_$(OS_CLASS))),)
-PROD_OBJLIBS+=$(subst -nil-,,$(PROD_OBJLIBS_$(OS_CLASS)))
-else
-ifdef PROD_OBJLIBS_DEFAULT
-PROD_OBJLIBS+=$(PROD_OBJLIBS_DEFAULT)
-endif
-endif
-
-ifneq ($(strip $(LIB_OBJLIBS_$(OS_CLASS))),)
-LIB_OBJLIBS+=$(subst -nil-,,$(LIB_OBJLIBS_$(OS_CLASS)))
-else
-ifdef LIB_OBJLIBS_DEFAULT
-LIB_OBJLIBS+=$(LIB_OBJLIBS_DEFAULT)
-endif
-endif
-
-ifneq ($(strip $(USR_OBJLIBS_$(OS_CLASS))),)
-USR_OBJLIBS+=$(subst -nil-,,$(USR_OBJLIBS_$(OS_CLASS)))
-else
-ifdef USR_OBJLIBS_DEFAULT
-USR_OBJLIBS+=$(USR_OBJLIBS_DEFAULT)
-endif
-endif
-
 ifneq ($(strip $(LIB_OBJS_$(OS_CLASS))),)
 LIB_OBJS+=$(subst -nil-,,$(LIB_OBJS_$(OS_CLASS)))
 else
@@ -581,4 +554,3 @@ ifdef LIB_RCS_DEFAULT
 LIB_RCS+=$(LIB_RCS_DEFAULT)
 endif
 endif
-

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,79 +27,39 @@ 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 ../
-#   but the Perl scripts in TOP/src/tools are OK
+#   so TOOLS must be an absolute path, although Perl scripts are OK.
+#   FIND_TOOL is for scripts run before the build reaches src/tools.
 
 TOOLS = $(abspath $(EPICS_BASE_HOST_BIN))
-FIND_TOOL = $(firstword $(wildcard $(TOOLS)/$(1) $(TOP)/src/tools/$(1)))
+FIND_TOOL = $(firstword $(wildcard $(TOOLS)/$(1) $(EPICS_BASE)/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
+PROVE            = $(PERL) $(TOOLS)/epicsProve.pl
+GENVERSIONHEADER = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG) $(QUESTION_FLAG)
 
-#-------------------------------------------------------
+MAKERPATH = $(PYTHON) $(TOOLS)/makeRPath.py
+
+#---------------------------------------------------------------
 # tools for installing libraries and products
-INSTALL_QUIETLY := $(if $(findstring s,$(MAKEFLAGS)),-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 making header dependencies and variable replacement
+MKMF       = $(PERL) $(TOOLS)/mkmf.pl
+REPLACEVAR = $(PERL) $(TOOLS)/replaceVAR.pl
 
 #---------------------------------------------------------------
-# 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 cleaning out unwanted files
+CVSCLEAN = $(call FIND_TOOL,cvsclean.pl)
+DEPCLEAN = $(call FIND_TOOL,depclean.pl)

configure/CONFIG_BASE_VERSION

@@ -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.
 #*************************************************************************
 #
 #  EPICS Version information
@@ -15,35 +15,57 @@
 # 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 convenience macros for our release series to be NO or YES, so
+# Makefiles can detect 'Series X or later', or 'Series X only' like this:
+#
+#   ifdef BASE_3_14
+#       true for 3.14 or later
+#   ifdef BASE_3_15
+#       true for 3.15 or later
+#   ifdef BASE_3_16
+#       true for 3.16 or later
+#   ifdef BASE_7_0
+#       true for 7.0 or later
+#
+#   ifeq ($(BASE_3_14),YES)
+#       true for 3.14.x only
+#   ifeq ($(BASE_3_15),YES)
+#       true for 3.15.x only
+#   ifeq ($(BASE_3_16),YES)
+#       true for 3.16.x only.
+#   ifeq ($(BASE_7_0),YES)
+#       true for 7.0.x 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 = 5
+EPICS_MODIFICATION = 3
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
-# Not included if zero
-EPICS_PATCH_LEVEL = 0
+# Not included in the official EPICS version number if zero
+EPICS_PATCH_LEVEL = 1
 
-# This will end in -DEV between official releases
+# Immediately after an official release the EPICS_PATCH_LEVEL is incremented
+# and the -DEV suffix is added (similar to the Maven -SNAPSHOT versions)
+EPICS_DEV_SNAPSHOT=
 #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
 #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_CA_MODULE

@@ -0,0 +1,9 @@
+#*************************************************************************
+# Copyright (c) 2017 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
+#*************************************************************************
+
+# Libraries needed to link a host tool
+EPICS_BASE_HOST_LIBS = ca Com

configure/CONFIG_CA_VERSION

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

configure/CONFIG_COMMON

@@ -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.
 #*************************************************************************
 #
 #  CONFIG_COMMON
@@ -38,9 +38,7 @@ 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
+PYTHON = python
 
 #-------------------------------------------------------
 # Check configure/RELEASE file for consistency
@@ -80,9 +78,14 @@ COMMON_DIR = ../O.Common
 IOCS_APPL_TOP               = $(shell $(FULLPATHNAME) $(INSTALL_LOCATION))
 
 #-------------------------------------------------------
-# Make echo output - suppress echoing if make's '-s' flag is set
+# Silencing the build - suppress messages during 'make -s'
 NOP = :
-ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
+ECHO = @$(if $(findstring s,$(MFLAGS)),$(NOP),echo)
+QUIET_FLAG := $(if $(findstring s,$(MFLAGS)),-q,)
+
+#-------------------------------------------------------
+# Convert 'make -q' flag into '-i' for genVersionHeader.pl
+QUESTION_FLAG := $(if $(findstring q,$(MFLAGS)),-i,)
 
 #-------------------------------------------------------
 ifdef T_A
@@ -92,7 +95,7 @@ INSTALL_SHRLIB              = $(INSTALL_LOCATION_LIB)/$(T_A)
 INSTALL_TCLLIB              = $(INSTALL_LOCATION_LIB)/$(T_A)
 INSTALL_BIN                 = $(INSTALL_LOCATION_BIN)/$(T_A)
 
-#Directories for libraries
+# Directories for libraries
 SHRLIB_SEARCH_DIRS          = $(INSTALL_LIB)
 
 #-------------------------------------------------------
@@ -166,13 +169,13 @@ TESTSHRLIBNAME = $(TESTSHRLIBNAME_$(SHARED_LIBRARIES))
 #--------------------------------------------------
 # obj files
 
-TARGET_OBJS =  $($*_OBJLIBS) $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS) $($*_SRCS)))
+TARGET_OBJS =  $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS) $($*_SRCS)))
 
 PRODUCT_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(USR_OBJS) $(PROD_OBJS)))
-PROD_LD_OBJS = $(USR_OBJLIBS) $(PROD_OBJLIBS) $(TARGET_OBJS) $(PRODUCT_OBJS)
+PROD_LD_OBJS = $(TARGET_OBJS) $(PRODUCT_OBJS)
 
 LIBRARY_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(LIB_SRCS) $(LIBSRCS) $(USR_OBJS) $(LIB_OBJS)))
-LIBRARY_LD_OBJS = $(USR_OBJLIBS) $(LIB_OBJLIBS) $(TARGET_OBJS) $(LIBRARY_OBJS)
+LIBRARY_LD_OBJS = $(TARGET_OBJS) $(LIBRARY_OBJS)
 
 #--------------------------------------------------
 # Windows resource files
@@ -264,7 +267,7 @@ LIBRARY_SRCS=$(basename $(foreach lib,$(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRA
 LIBRARY_SRC_CFLAGS=$($(patsubst $*,SHRLIB,$(findstring $*,$(LIBRARY_SRCS)))_CFLAGS)
 
 #--------------------------------------------------
-# prefix, suffix, and ldflags for loadable shared libraries 
+# prefix, suffix, and ldflags for loadable shared libraries
 TARGET_LIB_LDFLAGS=$($(patsubst $*,LOADABLE_,$(findstring $*,$(LOADABLE_LIBRARY)))SHRLIB_LDFLAGS)
 LOADABLE_SHRLIB_PREFIX=$(SHRLIB_PREFIX)
 LOADABLE_SHRLIB_SUFFIX=$(SHRLIB_SUFFIX)
@@ -332,6 +335,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
 
@@ -367,14 +378,14 @@ PATH_FILTER = $(1)$(warning PATH_FILTER is deprecated; used for $(1))
 #	each list starts with the destination directory name(s)
 #	to make sure it's there
 
-INSTALL_PROD= $(PRODNAME:%= $(INSTALL_BIN)/%)
-INSTALL_LIBS= $(LIBNAME:%=$(INSTALL_LIB)/%)
-INSTALL_MUNCHS= $(MUNCHNAME:%=$(INSTALL_BIN)/%)
-INSTALL_SHRLIBS= $(SHRLIBNAME:%=$(INSTALL_SHRLIB)/%)
-INSTALL_LOADABLE_SHRLIBS= $(LOADABLE_SHRLIBNAME:%=$(INSTALL_SHRLIB)/%)
-INSTALL_DLLSTUB_LIBS=$(DLLSTUB_LIBNAME:%=$(INSTALL_LIB)/%)
-INSTALL_TCLLIBS=$(TCLLIBNAME:%=$(INSTALL_TCLLIB)/%)
-INSTALL_TCLINDEX=$(TCLINDEX:%=$(INSTALL_TCLLIB)/%)
+INSTALL_PROD = $(PRODNAME:%= $(INSTALL_BIN)/%)
+INSTALL_LIBS = $(LIBNAME:%=$(INSTALL_LIB)/%)
+INSTALL_MUNCHS = $(MUNCHNAME:%=$(INSTALL_BIN)/%)
+INSTALL_SHRLIBS = $(SHRLIBNAME:%=$(INSTALL_SHRLIB)/%)
+INSTALL_LOADABLE_SHRLIBS = $(LOADABLE_SHRLIBNAME:%=$(INSTALL_SHRLIB)/%)
+INSTALL_DLLSTUB_LIBS = $(DLLSTUB_LIBNAME:%=$(INSTALL_LIB)/%)
+INSTALL_TCLLIBS = $(TCLLIBNAME:%=$(INSTALL_TCLLIB)/%)
+INSTALL_TCLINDEX = $(TCLINDEX:%=$(INSTALL_TCLLIB)/%)
 INSTALL_SCRIPTS = $(SCRIPTS:%= $(INSTALL_BIN)/%)
 INSTALL_OBJS = $(OBJSNAME:%= $(INSTALL_BIN)/%)
 
@@ -454,5 +465,5 @@ COMMON_INC += $(filter $(COMMON_DIR)/%, $(foreach file, $(INC), \
 SOURCE_INC = $(wildcard $(file) $(SOURCE_INC_bbb) )
 SOURCE_INC_bbb = $(foreach dir, $(ALL_SRC_DIRS), $(SOURCE_INC_aaa)  )
 SOURCE_INC_aaa = $(addsuffix /$(file), $(dir) )
- 
+
 endif

configure/CONFIG_DATABASE_MODULE

@@ -0,0 +1,26 @@
+#*************************************************************************
+# Copyright (c) 2017 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
+#*************************************************************************
+
+# Set EPICS_DATABASE if necessary
+ifndef EPICS_DATABASE
+  EPICS_DATABASE = $(if $(BUILDING_DATABASE),$(INSTALL_LOCATION),$(EPICS_BASE))
+
+  # Paths to tools built here
+  EPICS_DATABASE_HOST_BIN = $(EPICS_DATABASE)/bin/$(EPICS_HOST_ARCH)
+endif
+
+# Set location of locally-built tools
+MAKEBPT                    = $(EPICS_DATABASE_HOST_BIN)/makeBpt$(HOSTEXE)
+DBEXPAND                   = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdExpand.pl
+DBTORECORDTYPEH            = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdToRecordtypeH.pl
+DBTOMENUH                  = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdToMenuH.pl
+DBDTOHTML                  = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdToHtml.pl
+REGISTERRECORDDEVICEDRIVER = $(PERL) $(EPICS_DATABASE_HOST_BIN)/registerRecordDeviceDriver.pl
+MSI3_15                    = $(EPICS_DATABASE_HOST_BIN)/msi$(HOSTEXE)
+
+# Libraries needed to link a basic IOC
+EPICS_BASE_IOC_LIBS = dbRecStd dbCore ca Com

configure/CONFIG_DATABASE_VERSION

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

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_LIBCOM_MODULE

@@ -0,0 +1,17 @@
+#*************************************************************************
+# Copyright (c) 2017 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
+#*************************************************************************
+
+# Set location of locally generated tools
+YACC = $(abspath $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH))/antelope$(HOSTEXE)
+LEX = $(abspath $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH))/e_flex$(HOSTEXE) \
+        -S$(EPICS_BASE)/include/flex.skel.static
+
+# Default stack size for osiThread
+OSITHREAD_USE_DEFAULT_STACK = NO
+OSITHREAD_DEFAULT_STACK_FLAGS_YES = -DOSITHREAD_USE_DEFAULT_STACK
+
+BASE_CPPFLAGS += $(OSITHREAD_DEFAULT_STACK_FLAGS_$(OSITHREAD_USE_DEFAULT_STACK))

configure/CONFIG_LIBCOM_VERSION

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

configure/CONFIG_SITE

@@ -117,11 +117,10 @@ CROSS_COMPILER_TARGET_ARCHS=
 #  configure/os/CONFIG_SITE.<host>.Common files instead.
 CROSS_COMPILER_HOST_ARCHS=
 
-#  The 'make runtests' and 'make tapfiles' build targets normally only run
+#  The 'runtests', 'tapfiles' and 'junitfiles' make targets normally only run
 #  self-tests for the EPICS_HOST_ARCH architecture. If the host can execute
 #  the self-test programs for any other cross-built architectures such as
-#  a -debug architecture, those architectures can be named here.
-#
+#  a -debug architecture, those architectures must be named in this variable:
 CROSS_COMPILER_RUNTEST_ARCHS=
 
 # Build shared libraries (DLLs on Windows).
@@ -170,8 +169,18 @@ EPICS_SITE_VERSION =
 GCC_PIPE = NO
 
 # Set RPATH when linking executables and libraries.
-#  Must be either YES or NO.  If you set this to NO you must also provide a
+#  Must be either YES, NO, or ORIGIN.  If you set this to NO you must also provide a
 #  way for Base executables to find their shared libraries when they are
 #  run at build-time, e.g. set the LD_LIBRARY_PATH environment variable.
+#  ORIGIN is a feature of the ELF executable format used by Linux, freebsd, and solaris.
 LINKER_USE_RPATH = YES
 
+# Only used when LINKER_USE_RPATH=ORIGIN
+# The build time root(s) of the relocatable tree (separate multiple w/ ':').
+# Linking to libraries under any root directory will be relative.
+# Linking to libraries outside of this root will be absolute.
+# All root directories are considered to be the same.
+LINKER_ORIGIN_ROOT = $(INSTALL_LOCATION)
+
+# Overrides for the settings above may appear in a CONFIG_SITE.local file
+-include $(CONFIG)/CONFIG_SITE.local

configure/CONFIG_SITE_ENV

@@ -13,7 +13,7 @@
 #
 #	CONFIG_SITE_ENV - EPICS Environment Parameter Site configuration file
 #
-# This file is read by the script base/src/libCom/env/bldEnvdata.pl
+# This file is read by the script base/src/libCom/env/bldEnvData.pl
 # Variable definitions must take the form
 #	VAR = VALUE
 # or
@@ -24,33 +24,44 @@
 
 #  Site-specific environment settings
 
-# Time service:
-# EPICS_TIMEZONE
-#	local timezone info for vxWorks and RTEMS IOCs.  The format is
-#	    <name>::<minutesWest>:<start daylight>:<end daylight>
-#	where the start and end are mmddhh - that is month,day,hour
-#	e.g. for ANL in 2016: EPICS_TIMEZONE=CST/CDT::360:031302:110602
-#
-#	DST for 2016  US: Mar 13 - Nov 06
-#	              EU: Mar 27 - Oct 30
-#	DST for 2017  US: Mar 12 - Nov 05
-#	              EU: Mar 26 - Oct 29
-#	DST for 2018  US: Mar 11 - Nov 04
-#	              EU: Mar 25 - Oct 28
-#	DST for 2019  US: Mar 10 - Nov 03
-#	              EU: Mar 31 - Oct 27
-#	DST for 2020  US: Mar 08 - Nov 01
-#	              EU: Mar 29 - Oct 25
-#	DST for 2021  US: Mar 14 - Nov 07
-#	              EU: Mar 28 - Oct 31
-#	(see: http://www.timeanddate.com/time/dst/2016.html etc. )
-#
-# These values are for 2016:
-EPICS_TIMEZONE=CST/CDT::360:031302:110602
-#EPICS_TIMEZONE=CET/CEST::-60:032702:103002
+## Time service:
+# EPICS_TZ
+#       Local timezone rules for vxWorks and RTEMS. The value follows the Posix
+#       TZ environment variable's Mm.n.d/h format (see the IBM link below for
+#       details). If TZ hasn't already been set when the osdTime timeRegister()
+#       C++ static constructor runs, this parameter will be copied into the TZ
+#       environment variable. Once the OS clock has been synchronized to NTP the
+#       routine tz2timezone() will be run to convert TZ into the TIMEZONE
+#       variable format that VxWorks needs.
+#               https://developer.ibm.com/articles/au-aix-posix/
+
+# Japan Standard Time, no DST:
+#EPICS_TZ = "JST-9"
+
+# Central European (Summer) Time:
+#EPICS_TZ = "CET-1CEST,M3.5.0/2,M10.5.0/3"
+
+# Greenwich Mean/British Summer Time:
+#EPICS_TZ = "GMT0BST,M3.5.0/1,M10.5.0/2"
+
+# US Eastern Standard/Daylight Time:
+#EPICS_TZ = "EST5EDT,M3.2.0/2,M11.1.0/2"
+
+# US Central Standard/Daylight Time:
+EPICS_TZ = "CST6CDT,M3.2.0/2,M11.1.0/2"
+
+# US Mountain Standard/Daylight Time:
+#EPICS_TZ = "MST7MDT,M3.2.0/2,M11.1.0/2"
+
+# US Pacific Standard/Daylight Time:
+#EPICS_TZ = "PST8PDT,M3.2.0/2,M11.1.0/2"
+
+# US Hawaiian Standard Time, no DST:
+#EPICS_TZ = "HST10"
 
 # EPICS_TS_NTP_INET
-#	NTP time server ip address.  Uses boot host if not set.
+#	NTP time server ip address for VxWorks and RTEMS.
+#	IOC will use its boot host if this is not set.
 EPICS_TS_NTP_INET=
 
 # IOC Shell:
@@ -58,8 +69,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/Makefile

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

configure/RELEASE

@@ -1,19 +1,20 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2012 UChicago Argonne LLC, 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. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
-# RELEASE: Define location of external EPICS products
 
+#
+# RELEASE: Define the location of external EPICS products
+#
+
+# The version of this file in Base should normally be empty.
+#
 # Define INSTALL_LOCATION in CONFIG_SITE
 
-# VX_DIR definition now in os/CONFIG_SITE.Common.vxWorksCommon
-# RTEMS_BASE (and RTEMS_VERSION) now in os/CONFIG_SITE.Common.RTEMS
-
 # NB: Settings in RELEASE files can be overridden in files named
 #   RELEASE.$(EPICS_HOST_ARCH).Common
 #   RELEASE.Common.$(T_A)

configure/RULES

@@ -1,11 +1,10 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 UChicago Argonne LLC, 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. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
 
 ifndef T_A

configure/RULES.Db

@@ -4,14 +4,17 @@
 # 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 the file LICENSE that is included with this distribution.
 #*************************************************************************
-#RULES.Db
 
-# Set db substitutions file suffix
+# RULES.Db
+
+# 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 +22,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 +37,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 +92,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 +126,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 +137,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 =
@@ -151,61 +155,67 @@ ACTIONS = inc
 ACTIONS += build
 ACTIONS += install
 ACTIONS += buildInstall
-ACTIONS += runtests tapfiles
+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
+include $(CONFIG)/CONFIG_APP_INCLUDE
 
 all: install
-ifeq ($(EPICS_HOST_ARCH),$T_A)
-host: install
-else
-# Do nothing
-host:
-endif
 
 install: buildInstall
 
-buildInstall : build
+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)
+inc: $(COMMON_INC) $(INSTALL_INC)
 
-build : $(COMMON_DBDS) $(COMMON_DBS) $(COMMON_DBDCATS) \
+build: $(COMMON_DBDS) $(COMMON_DBS) $(COMMON_DBDCATS) \
 	$(INSTALL_DBDS) $(INSTALL_DBS) \
 	$(DBDDEPENDS_FILES) $(TARGETS) \
 	$(INSTALL_DB_INSTALLS) $(INSTALL_DBD_INSTALLS)
 
 clean: db_clean
 
-db_clean : 
+db_clean:
 	@$(RM) $(COMMONS) $(DBDDEPENDS_FILES)
 	@$(RM) *_registerRecordDeviceDriver.cpp
 	@$(RM) $(TARGETS)
 
-.PHONY : db_clean
+.PHONY: db_clean
 
 realclean: clean
 
-##################################################### Dependency files
+#---------------------------------------------------------------
+# Dependency files
 
 %Record.h$(DEP): $(COMMON_DIR)/%Record.dbd
 	@$(RM) $@
@@ -256,19 +266,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) $< > $@
 
@@ -282,14 +292,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
 
@@ -310,25 +314,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 $@)
@@ -362,7 +362,8 @@ $(COMMON_DIR)/menu%.h: ../menu%.dbd
 
 .PRECIOUS: $(COMMON_DIR)/%.h
 
-##################################################### DBD files
+#---------------------------------------------------------------
+# DBD files
 
 $(COMMON_DIR)/bpt%.dbd: bpt%.data
 	@$(RM) $(notdir $@)
@@ -388,7 +389,7 @@ $(COMMON_DIR)/%.dbd: ../%Include.dbd
 
 # Make DBDCAT file x depend on x_DBD source files
 define  DBDCAT_template
-$$(COMMON_DIR)/$(1).dbd : ../Makefile $$(foreach file, $$($(1)_DBD),$$(DBDCAT_SOURCE) )
+$$(COMMON_DIR)/$(1).dbd: ../Makefile $$(foreach file, $$($(1)_DBD),$$(DBDCAT_SOURCE) )
 endef
 $(foreach name,$(subst .dbd,,$(DBDCAT)), $(eval $(call DBDCAT_template,$(name))))
 
@@ -417,7 +418,7 @@ $(INSTALL_DBD)/%: ../%
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 define  DBD_INSTALLS_template
-$$(INSTALL_DBD)/$$(notdir $(1)) : $(1)
+$$(INSTALL_DBD)/$$(notdir $(1)): $(1)
 	$(ECHO) "Installing $$@"
 	@$$(INSTALL) -d -m $$(INSTALL_PERMISSIONS) $$^ $$(INSTALL_DBD)
 endef
@@ -425,56 +426,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
+$(COMMON_DIR)/%.html: %.dbd.pod
 	@$(RM) $(notdir $@)
-	$(PERL) $(TOOLS)/dbdToHtml.pl $(DBDFLAGS) -o $(notdir $@) $<
+	$(DBDTOHTML) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: %.pod $(TOOLS)/podToHtml.pl
+$(COMMON_DIR)/%.html: %.pod
 	@$(RM) $(notdir $@)
-	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
+	$(PODTOHTML) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: %.pm $(TOOLS)/podToHtml.pl
+$(COMMON_DIR)/%.html: %.pm
 	@$(RM) $(notdir $@)
-	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
+	$(PODTOHTML) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: ../%.pm $(TOOLS)/podToHtml.pl
+$(COMMON_DIR)/%.html: ../%.pm
 	@$(RM) $(notdir $@)
-	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
+	$(PODTOHTML) -s -o $(notdir $@) $<
+	@$(MKDIR) $(dir $@)
+	@$(MV) $(notdir $@) $@
+
+$(COMMON_DIR)/%.html: ../%.pl
+	@$(RM) $(notdir $@)
+	$(PODTOHTML) -s -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
 .PRECIOUS: $(COMMON_DIR)/%.html %.html
 
-##################################################### DB files
+#---------------------------------------------------------------
+# DB files
 
-$(COMMON_DIR)/%.db$(RAW): $(COMMON_DIR)/%.edf 
+$(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 $@) $<
@@ -492,22 +501,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)
@@ -515,14 +508,13 @@ $(INSTALL_DB)/%: %
 $(INSTALL_DB)/%: ../%
 	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
-endif
 
 $(INSTALL_DB)/%.db: $(COMMON_DIR)/%.db
 	$(ECHO) "Installing created db file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 define  DB_INSTALLS_template
-$$(INSTALL_DB)/$$(notdir $(1)) : $(1)
+$$(INSTALL_DB)/$$(notdir $(1)): $(1)
 	$(ECHO) "Installing $$@"
 	@$$(INSTALL) -d -m $$(INSTALL_PERMISSIONS) $$^ $$(INSTALL_DB)
 endef
@@ -531,8 +523,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) $@
@@ -547,5 +539,3 @@ $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))
 	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ $< $(basename $@) $(IOCS_APPL_TOP)
 
 .PRECIOUS: %_registerRecordDeviceDriver.cpp
-
-##################################################### END OF FILE

configure/RULES.ioc

@@ -4,9 +4,10 @@
 # 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 the file LICENSE that is included with this distribution.
 #*************************************************************************
-#RULES.ioc
+
+# RULES.ioc
 
 include $(CONFIG)/RULES_DIRS
 
@@ -14,7 +15,7 @@ build$(DIVIDER)$(ARCH) build: buildInstall
 install$(DIVIDER)$(ARCH) install: buildInstall
 $(ARCH): buildInstall
 
-ifeq ($(filter $(ARCH),$(BUILD_ARCHS)),$(ARCH))
+ifeq ($(filter $(ARCH),$(BUILD_ARCHS)),$(strip $(ARCH)))
     buildInstall$(DIVIDER)$(ARCH) buildInstall: $(TARGETS)
 
     clean$(DIVIDER)$(ARCH) clean:
@@ -35,4 +36,3 @@ envPaths: $(wildcard $(TOP)/configure/RELEASE*) \
 
 realclean:
 	$(RM) cdCommands envPaths dllPath.bat relPaths.sh
-

configure/RULES_ARCHS

@@ -14,7 +14,7 @@ ACTIONS = inc
 ACTIONS += build
 ACTIONS += install
 ACTIONS += buildInstall
-ACTIONS += runtests tapfiles
+ACTIONS += runtests tapfiles clean-tests test-results junitfiles
 
 actionArchTargets = $(foreach action, $(ACTIONS), \
     $(addprefix $(action)$(DIVIDER), $(BUILD_ARCHS)))
@@ -90,6 +90,4 @@ realclean:
 .PHONY : $(BUILD_ARCHS) rebuild archsCommonClean
 .PHONY : $(ACTIONS) clean realclean archclean host all
 
-#  User specific rules
-#
--include $(HOME)/configure/RULES_USER
+include $(CONFIG)/RULES_COMMON

configure/RULES_BUILD

@@ -4,13 +4,14 @@
 # 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.
 #*************************************************************************
+
+# RULES_BUILD
+
+# Rules for making things specified in a Makefile
 #
-#	Rules for making things specified in Makefile
-#
-#	we are in O.$(T_A), but most sources are elsewhere
-#
+# CWD is O.$(T_A), but most sources are elsewhere
 
 ifndef BASE_RULES_BUILD
 BASE_RULES_BUILD=1
@@ -25,7 +26,6 @@ vpath %.html $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.skel.static $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.y $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.l $(USR_VPATH) $(ALL_SRC_DIRS)
-vpath %.pl $(USR_VPATH) $(ALL_SRC_DIRS)
 
 #---------------------------------------------------------------
 
@@ -43,6 +43,7 @@ LOADABLE_LIBRARY += $(LOADABLE_LIBRARY_HOST)
 OBJS += $(OBJS_HOST)
 PROD += $(PROD_HOST)
 SCRIPTS += $(SCRIPTS_HOST)
+TARGETS += $(TARGETS_HOST)
 TESTLIBRARY += $(TESTLIBRARY_HOST)
 TESTSCRIPTS += $(TESTSCRIPTS_HOST)
 TESTPROD += $(TESTPROD_HOST)
@@ -54,6 +55,7 @@ LOADABLE_LIBRARY += $(LOADABLE_LIBRARY_IOC)
 OBJS += $(OBJS_IOC)
 PROD += $(PROD_IOC)
 SCRIPTS += $(SCRIPTS_IOC)
+TARGETS += $(TARGETS_IOC)
 TESTLIBRARY += $(TESTLIBRARY_IOC)
 TESTSCRIPTS += $(TESTSCRIPTS_IOC)
 TESTPROD += $(TESTPROD_IOC)
@@ -73,16 +75,16 @@ HTMLS_DIR ?= .
 #	First target
 
 all: install
-ifeq ($(EPICS_HOST_ARCH),$T_A)
+ifeq ($(EPICS_HOST_ARCH),$(T_A))
 host: install
 else
 # Do nothing
 host:
 endif
 
--include $(CONFIG)/RULES_FILE_TYPE
+include $(CONFIG)/RULES_FILE_TYPE
 
--include $(CONFIG)/RULES.Db
+include $(CONFIG)/RULES.Db
 
 #---------------------------------------------------------------
 # Include defines and rules for prod, library and test* targets
@@ -103,6 +105,7 @@ endif
 #   Products and Object libraries
 #
 PRODTARGETS += $(PRODNAME) $(MUNCHNAME) $(CTDT_SRCS) $(CTDT_OBJS) $(NMS)
+TESTPRODTARGETS += $(TESTPRODNAME) $(TESTMUNCHNAME)
 
 #---------------------------------------------------------------
 #   Test specifications and test result files
@@ -115,10 +118,11 @@ endif
 ifneq (,$(findstring $(T_A),$(EPICS_HOST_ARCH) $(CROSS_COMPILER_RUNTEST_ARCHS)))
 RUNTESTS_ENABLED = YES
 TAPFILES += $(TESTSCRIPTS:.t=.tap)
+JUNITFILES += $(TAPFILES:.tap=.xml)
 endif
 
 #---------------------------------------------------------------
-#   Libraries 
+#   Libraries
 #
 
 LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS) $(TESTLIBNAME) \
@@ -129,28 +133,27 @@ LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS) $(TESTLIBNAME) \
 
 #	Main targets
 
-install: buildInstall 
+install: buildInstall
 
-buildInstall : build 
+buildInstall: build
 
 # Allows rebuild to work with parallel builds option, -j.
 install: $(patsubst rebuild,clean,$(filter rebuild,$(MAKECMDGOALS)))
 
 rebuild: clean install
 
-build : inc 
+build: inc
 
-build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODNAME) \
+build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODTARGETS) \
 	$(TARGETS) $(TESTSCRIPTS) $(INSTALL_LIB_INSTALLS)
 
-inc : $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS)
+inc: $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS)
 
-buildInstall : \
+buildInstall: \
 	$(INSTALL_SCRIPTS) $(INSTALL_PROD) $(INSTALL_MUNCHS) \
 	$(INSTALL_TCLLIBS) $(INSTALL_TCLINDEX) \
+	$(INSTALL_HTMLS) $(INSTALL_DOCS) \
 	$(INSTALL_OBJS) \
-	$(INSTALL_DOCS) \
-	$(INSTALL_HTMLS) \
 	$(INSTALL_TEMPLATE) \
 	$(INSTALL_BIN_INSTALLS)
 
@@ -158,20 +161,21 @@ clean: build_clean
 
 build_clean:
 	$(ECHO) "Cleaning"
-	@$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) \
+	@$(RM) *.i *$(OBJ) *.a \
 	$(LIBNAME) $(TESTLIBNAME) $(SHRLIBNAME) $(TESTSHRLIBNAME) \
 	$(DLLSTUB_LIBNAME) $(TESTDLLSTUB_LIBNAME) \
 	$(LOADABLE_SHRLIBNAME) \
 	$(INC) $(TARGETS) $(TDS) $(CLEANS) \
 	*.out MakefileInclude *.manifest *.exp \
-	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) \
-	$(TESTSCRIPTS) $(TAPFILES)
+	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) $(TESTPRODTARGETS) \
+	$(TESTSCRIPTS) $(TAPFILES) $(JUNITFILES)
 ifdef RES
 	@$(RM) *$(RES)
 endif
 
-$(DIRECTORY_TARGETS) :
-	$(MKDIR) -p $@
+# Sort mkdir targets to remove duplicates & make parents first
+$(DIRECTORY_TARGETS):
+	$(MKDIR) $(sort $@)
 
 # Install LIB_INSTALLS libraries before linking executables
 $(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIB_INSTALLS)
@@ -183,26 +187,33 @@ endif
 
 # RELEASE file consistency checking
 checkRelease:
-	$(CONVERTRELEASE) checkRelease
+	+$(CONVERTRELEASE) checkRelease
 warnRelease:
-	-$(CONVERTRELEASE) checkRelease
+	$(CONVERTRELEASE) checkRelease
 noCheckRelease:
 ifeq ($(EPICS_HOST_ARCH),$(T_A))
-	@echo "Warning: RELEASE file consistency checks have been disabled"
+	$(info Warning: RELEASE file consistency checks have been disabled)
 endif
 
+# $(FINAL_DIR) signals eventual install locations to makeRPath script
+$(TESTPRODNAME): FINAL_DIR=.
+$(PRODNAME): FINAL_DIR=$(INSTALL_BIN)
+$(TESTSHRLIBNAME): FINAL_DIR=.
+$(SHRLIBNAME): FINAL_DIR=$(INSTALL_SHRLIB)
+$(LOADABLE_SHRLIBNAME): FINAL_DIR=$(INSTALL_SHRLIB)
+
 #---------------------------------------------------------------
 #  The order of the following rules is
 #  VERY IMPORTANT !!!!
 
 $(TESTPRODNAME) $(PRODNAME): $(PRODUCT_OBJS) $(PROD_RESS) $(PROD_DEPLIBS)
 
-$(TESTPRODNAME) $(PRODNAME): %$(EXE):
+$(TESTPRODNAME) $(PRODNAME): %$(EXE): | $(INSTALL_LIB)
 	@$(RM) $@
-	$(DEBUGCMD) $(LINK.cpp)
+	$(LINK.cpp)
 	$(MT_EXE_COMMAND)
 
-%_ctdt$(OBJ) : %_ctdt.c
+%_ctdt$(OBJ): %_ctdt.c
 	@$(RM) $@
 	$(COMPILE.ctdt) $<
 
@@ -220,9 +231,9 @@ $(TESTPRODNAME) $(PRODNAME): %$(EXE):
 
 # Cancel GNUMake's built-in rules, which don't have our _INC
 # dependencies so could get used in some circumstances (gdd)
-%.o : %.c
-%.o : %.cc
-%.o : %.cpp
+%.o: %.c
+%.o: %.cc
+%.o: %.cpp
 
 # Include files are order-only prerequisites for compilation:
 %$(OBJ): %.c | $(COMMON_INC) $(INSTALL_INC)
@@ -254,15 +265,13 @@ YACCOPT ?= $($*_YACCOPT)
 	$(MV) $*.tab.c $*.c
 	$(if $(findstring -d, $(YACCOPT)),$(MV) $*.tab.h $*.h,)
 
-# must be a seperate rule since when not using '-d' the
+# must be a separate rule since when not using '-d' the
 # prefix for .h will be different then .c
-%.h : %.c %.y
+%.h: %.c %.y
 
 %.c: %.l
-	@$(RM) $*.yy.c
-	$(LEX) $(LEXOPT) -t $< > $*.yy.c
 	@$(RM) $@
-	$(MV) $*.yy.c $@
+	$(LEX) $(LEXOPT) -o$@ $<
 
 #---------------------------------------------------------------
 # Libraries, shared/DLL and stubs
@@ -279,13 +288,17 @@ endif # RANLIB
 $(SHRLIBNAME) $(DLLSTUB_LIBNAME) $(TESTSHRLIBNAME) $(TESTDLLSTUB_LIBNAME): \
     $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
 
-$(DLLSTUB_LIBNAME): $(SHRLIBNAME);
+# Stub library timestamps may be earlier than the DLL itself.
+# This order-only prerequisite resolves any related problems.
+# The $(LINK.shrlib) command must build both library files if
+# the target requires a separate stub library file.
+$(DLLSTUB_LIBNAME): | $(SHRLIBNAME);
 $(SHRLIBNAME): $(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX):
 	@$(RM) $@
 	$(LINK.shrlib)
 	$(MT_DLL_COMMAND)
 
-$(TESTDLLSTUB_LIBNAME): $(TESTSHRLIBNAME);
+$(TESTDLLSTUB_LIBNAME): | $(TESTSHRLIBNAME);
 $(TESTSHRLIBNAME): $(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX):
 	@$(RM) $@
 	$(LINK.shrlib)
@@ -298,6 +311,10 @@ $(LOADABLE_SHRLIBNAME): $(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX):
 	$(LINK.shrlib)
 	$(MT_DLL_COMMAND)
 
+$(LIBNAME) $(SHRLIBNAME) $(LOADABLE_SHRLIBNAME): | $(INSTALL_LIB)
+$(INSTALL_LIB):
+	@$(MKDIR) $@
+
 #---------------------------------------------------------------
 # C++ munching for VxWorks
 
@@ -317,6 +334,10 @@ $(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)
@@ -324,12 +345,18 @@ $(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: $(TESTSCRIPTS)
 ifdef RUNTESTS_ENABLED
-	-$(PERL) -MTest::Harness -e 'runtests @ARGV if @ARGV;' $^
+	$(PERL) -MTest::Harness -e 'runtests @ARGV if @ARGV;' $^
 endif
 
 testspec: $(TESTSCRIPTS)
@@ -340,37 +367,67 @@ testspec: $(TESTSCRIPTS)
 	$(if $(TESTFILES), @echo Files: $(TESTFILES) >> $@)
 	$(if $(TESTSPEC_$(OS_CLASS)), @echo "Harness: $(TESTSPEC_$(OS_CLASS))" >> $@)
 
+test-results: tapfiles
+ifneq ($(TAPFILES),)
+ifdef RUNTESTS_ENABLED
+	$(PROVE) --failures --ext .tap --exec "$(CAT)" --color $(TAPFILES)
+endif
+
+CURRENT_TAPFILES := $(wildcard $(TAPFILES))
+CURRENT_JUNITFILES := $(wildcard $(JUNITFILES))
+endif
+
+clean-tests:
+ifneq ($(CURRENT_TAPFILES),)
+	$(RM) $(CURRENT_TAPFILES)
+endif
+ifneq ($(CURRENT_JUNITFILES),)
+	$(RM) $(CURRENT_JUNITFILES)
+endif
+
 tapfiles: $(TESTSCRIPTS) $(TAPFILES)
+junitfiles: $(JUNITFILES)
 
 # A .tap file is the output from running the associated test script
 %.tap: %.t
 ifdef RUNTESTS_ENABLED
-	-$(PERL) $< -tap > $@
+	$(PERL) $< -tap > $@
 endif
 
+%.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.
 %.t: %$(EXE) $(TOOLS)/makeTestfile.pl
 	@$(RM) $@
-	$(PERL) $(TOOLS)/makeTestfile.pl $@ $<
+	$(PERL) $(TOOLS)/makeTestfile.pl $(T_A) $(EPICS_HOST_ARCH) $@ $<
+
+#---------------------------------------------------------------
+# 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
 
 define  BIN_INSTALLS_template
-$$(INSTALL_BIN)/$$(notdir $(1)) : $(1)
+$$(INSTALL_BIN)/$$(notdir $(1)): $(1)
 	$(ECHO) "Installing $$(<F)"
 	@$$(INSTALL) -d -m $$(BIN_PERMISSIONS) $$^ $$(INSTALL_BIN)
 endef
 $(foreach file, $(BIN_INSTALLS), $(eval $(call BIN_INSTALLS_template, $(file))))
 
 define  LIB_INSTALLS_template
-$$(INSTALL_LIB)/$$(notdir $(1)) : $(1)
+$$(INSTALL_LIB)/$$(notdir $(1)): $(1)
 	$(ECHO) "Installing $$(<F)"
 	@$$(INSTALL) -d -m $$(LIB_PERMISSIONS) $$^ $$(INSTALL_LIB)
 endef
@@ -420,9 +477,11 @@ $(INSTALL_TCLLIB)/%: ../%
 	@$(INSTALL) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_TCLLIB)
 endif
 
+ifneq ($(TCLINDEX),)
 $(INSTALL_TCLLIB)/$(TCLINDEX): $(INSTALL_TCLLIBS)
 	$(ECHO) "Updating $@"
 	$(ECHO) eval auto_mkindex $(INSTALL_TCLLIB) "$(TCLLIBNAME)" | tclsh
+endif
 
 $(INSTALL_LOADABLE_SHRLIBS): $(INSTALL_SHRLIB)/%: %
 	$(ECHO) "Installing loadable shared library $@"
@@ -434,6 +493,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)
@@ -441,20 +501,21 @@ $(INSTALL_CONFIG)/%: %
 $(INSTALL_CONFIG)/%: ../%
 	$(ECHO) "Installing config file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+endif
 
-$(INSTALL_INCLUDE)/% : $(COMMON_DIR)/%
+$(INSTALL_INCLUDE)/%: $(COMMON_DIR)/%
 	$(ECHO) "Installing generated generic include file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
-$(INSTALL_INCLUDE)/% : %
+$(INSTALL_INCLUDE)/%: %
 	$(ECHO) "Installing generic include file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
-$(INSTALL_INCLUDE)/os/$(OS_CLASS)/% : %
+$(INSTALL_INCLUDE)/os/$(OS_CLASS)/%: %
 	$(ECHO) "Installing OS dependent include file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
-$(INSTALL_INCLUDE)/compiler/$(CMPLR_CLASS)/% : %
+$(INSTALL_INCLUDE)/compiler/$(CMPLR_CLASS)/%: %
 	$(ECHO) "Installing compiler dependent include file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
@@ -486,13 +547,18 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
 	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
--include $(CONFIG)/RULES_EXPAND
+include $(CONFIG)/RULES_EXPAND
 
 .PRECIOUS: %.i %.o %.c %.nm %.cpp %.cc
 .PRECIOUS: $(COMMON_INC)
 
 .PHONY: all host inc build install clean rebuild buildInstall build_clean
-.PHONY: runtests tapfiles checkRelease warnRelease noCheckRelease
+.PHONY: runtests tapfiles clean-tests test-results junitfiles
+.PHONY: checkRelease warnRelease noCheckRelease FORCE
 
+include $(CONFIG)/RULES_COMMON
+
+else
+    $(warning Warning: Base configure/RULES_BUILD file included more than once. \
+        Does configure/RELEASE have multiple pointers to $(EPICS_BASE)?)
 endif # BASE_RULES_BUILD
-#	EOF RULES_BUILD

configure/RULES_COMMON

@@ -0,0 +1,48 @@
+#*************************************************************************
+# Copyright (c) 2018 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
+#*************************************************************************
+
+# These rules show the set of Makefiles, config files and
+# rules files loaded by GNUmake.
+
+show-makefiles::
+	@echo
+	@echo Makefiles read:
+define SHOW_MAKEFILE_template
+show-makefiles::
+	@echo "    $(1)"
+endef
+$(foreach file,$(MAKEFILE_LIST), \
+    $(eval $(call SHOW_MAKEFILE_template,$(file))))
+
+.PHONY: show-makefiles
+
+
+# These rules support printing a Makefile variable values.
+# Many variables are only set inside an O.<arch> build directory.
+#   make PRINT.T_A
+
+PRINT_Var = $(@:PRINT.%=%)
+PRINT.%:
+	@echo $(PRINT_Var) = '$($(PRINT_Var))'
+
+.PHONY: PRINT PRINT.%
+
+
+# Clean rules for recursively deleting editor backup files
+# and dependency (.d) files from CWD and below.
+
+cvsclean:
+	$(PERL) $(CVSCLEAN)
+depclean:
+	$(PERL) $(DEPCLEAN)
+
+.PHONY: cvsclean depclean
+
+
+#  User specific rules
+#
+-include $(HOME)/configure/RULES_USER

configure/RULES_DIRS

@@ -9,7 +9,7 @@
 
 ARCHS += $(BUILD_ARCHS)
 ACTIONS += inc build install buildInstall clean realclean archclean
-ACTIONS += runtests tapfiles
+ACTIONS += runtests tapfiles clean-tests test-results junitfiles
 
 dirActionArchTargets = $(foreach dir, $(DIRS), \
     $(foreach action, $(ACTIONS), \
@@ -86,13 +86,11 @@ $(DIRS) $(dirActionTargets) $(dirArchTargets) $(dirActionArchTargets) :
 $(ARCHS) $(ACTIONS) $(actionArchTargets) :%: \
     $(foreach dir, $(DIRS), $(dir)$(DIVIDER)%)
 
-.PHONY : $(DIRS) all host rebuild
-.PHONY : $(ARCHS) $(ACTIONS)
-.PHONY : $(dirActionTargets) $(dirArchTargets)
-.PHONY : $(dirActionArchTargets)
-.PHONY : $(actionArchTargets)
 
+.PHONY: $(DIRS) all host rebuild
+.PHONY: $(ARCHS) $(ACTIONS)
+.PHONY: $(dirActionTargets) $(dirArchTargets)
+.PHONY: $(dirActionArchTargets)
+.PHONY: $(actionArchTargets)
 
-#  User specific rules
-#
--include $(HOME)/configure/RULES_USER
+include $(CONFIG)/RULES_COMMON

configure/RULES_EXPAND

@@ -1,4 +1,13 @@
-# <top>/configure/RULES_EXPAND
+#*************************************************************************
+# Copyright (c) 2011 UChicago Argonne LLC, 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 the file LICENSE that is included with this distribution.
+#*************************************************************************
+
+# RULES_EXPAND
 
 vpath %@ $(USR_VPATH) $(ALL_SRC_DIRS)
 

configure/RULES_FILE_TYPE

@@ -7,9 +7,11 @@
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# Include <top>/configure/RULES_BUILD from tops defined in RELEASE* files
+# Include <top>/configure/RULES_BUILD from tops defined in RELEASE* files,
+# excluding EPICS_BASE
 #
-RELEASE_RULES_BUILDS = $(foreach top, $(RELEASE_TOPS), \
+RELEASE_RULES_BUILDS = $(foreach top, \
+    $(filter-out EPICS_BASE, $(RELEASE_TOPS)), \
     $(wildcard $($(top))/configure/RULES_BUILD))
 ifneq ($(RELEASE_RULES_BUILDS),)
   include $(RELEASE_RULES_BUILDS)
@@ -23,7 +25,7 @@ ifneq ($(RELEASE_CFG_RULES),)
   include $(RELEASE_CFG_RULES)
 endif
 
-# If this is not BASE then include <TOP>/configure/RULES_BUILD
+# If this is not BASE then include <top>/configure/RULES_BUILD
 #
 ifeq ($(wildcard $(TOP)/configure/CONFIG_BASE_VERSION),)
 TOP_RULES_BUILDS = $(wildcard $(TOP)/configure/RULES_BUILD)
@@ -67,7 +69,3 @@ file_type_clean:
 	@$(RM) $(foreach type, $(FILE_TYPE), $($(type)))
 
 .PHONY : file_type_clean
-
-#  User specific rules
-#
--include $(HOME)/configure/RULES_USER

configure/RULES_MODULES

@@ -0,0 +1,47 @@
+#*************************************************************************
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
+#*************************************************************************
+
+# Support modules can use these rules to build submodules too.
+#
+# The requirements to do so are:
+#    1. Create a file CONFIG_SITE.local in the same directory as the
+#       Makefile, which defines these variables (the last one is empty):
+#           PARENT_MODULE - The name submodules call their parent
+#           INSTALL_LOCATION := $($(PARENT_MODULE))
+#           CONFIG_INSTALLS =
+#    2. The Makefile must set TOP and include $(TOP)/configure/CONFIG and
+#       CONFIG_SITE.local
+#    3. Submodules are added to the SUBMODULES variable in the Makefile
+#    4. Dependencies between submodules must be set using
+#           <name>_DEPEND_DIRS = <prerequisites>
+#    5. The Makefile must end by including $(TOP)/configure/RULES_MODULES
+#    6. Submodules must have a configure/RELEASE file that contains
+#           -include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local
+#    7. Submodules must have a configure/CONFIG_SITE file that contains
+#           -include $(TOP)/../CONFIG_SITE.local
+
+# Add checked-out submodules to DIRS
+DIRS += $(subst /Makefile,,$(wildcard $(addsuffix /Makefile, $(SUBMODULES))))
+
+include $(CONFIG)/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)
+
+# Convenience target
+RELEASE.host: $(RELEASE_LOCAL)
+
+$(RELEASE_LOCAL): Makefile CONFIG_SITE.local
+	$(ECHO) Creating $@ with
+	$(ECHO) "    $(PARENT_MODULE) = $(INSTALL_LOCATION_ABS)"
+	@echo $(PARENT_MODULE) = $(INSTALL_LOCATION_ABS)> $@
+realclean:
+	$(RM) $(wildcard RELEASE.*.local)
+
+.PHONY: RELEASE.host realclean

configure/RULES_OCTAVE

@@ -1,11 +1,10 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 UChicago Argonne LLC, 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. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
 
 # Octave definitions and rules

configure/RULES_TARGET

@@ -1,18 +1,13 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2011 UChicago Argonne LLC, 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.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
-#
-#  RULES_TARGET
-#
-#  This file is to be maintained by the community.
-#
-#-----------------------------------------------------------------------
+
+# RULES_TARGET
 
 define TARGET_template
 $(1)_$(2) += $$(if $$(strip $$($(1)_$(2)_$$(OS_CLASS))), \
@@ -20,7 +15,7 @@ $(1)_$(2) += $$(if $$(strip $$($(1)_$(2)_$$(OS_CLASS))), \
              $$($(1)_$(2)_DEFAULT))
 endef
 
-$(foreach type, SRCS RCS OBJS LDFLAGS OBJLIBS LDOBJS SYS_LIBS , \
+$(foreach type, SRCS RCS OBJS LDFLAGS LDOBJS SYS_LIBS , \
 $(foreach target, $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRARY) , \
     $(eval $(call TARGET_template,$(strip $(target)),$(type)))))
 
@@ -38,6 +33,17 @@ $(foreach target, $(PROD) $(TESTPROD), \
 
 #-----------------------------------------------------------------------
 
+# These must be done before PROD2_template
+define TESTLIBRARY_template
+$(1)_DIR = .
+TESTBUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),)
+endef
+
+$(foreach target, $(TESTLIBRARY), \
+    $(eval $(call TESTLIBRARY_template,$(strip $(target)))))
+
+#-----------------------------------------------------------------------
+
 define TARGET2_template
 $(1)_LDLIBS += $$($(1)_LIBS)
 $(1)_LDLIBS += $$(if $$(strip $$($(1)_LIBS_$(OS_CLASS))), \
@@ -123,16 +129,6 @@ $(foreach target, $(LIBRARY), \
 
 #-----------------------------------------------------------------------
 
-define LIBRARY3_template
-$(1)_DIR = .
-TESTBUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),)
-endef
-
-$(foreach target, $(TESTLIBRARY), \
-    $(eval $(call LIBRARY3_template,$(strip $(target)))))
-
-#-----------------------------------------------------------------------
-
 define LOADABLE_LIBRARY_template
 LOADABLE_BUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),)
 
@@ -151,4 +147,3 @@ $(foreach target, $(LOADABLE_LIBRARY), \
     $(eval $(call LOADABLE_LIBRARY_template,$(strip $(target)))))
 
 #-----------------------------------------------------------------------
-

configure/RULES_TOP

@@ -9,18 +9,31 @@
 
 include $(CONFIG)/RULES_DIRS
 
-distclean: realclean cvsclean realuninstall
+# Disable most top rules when installing into a parent's tree, indicated
+# by PARENT_MODULE being set in the modules/CONFIG_SITE.local file and
+# INSTALL_LOCATION pointing to the the same place as in the parent.
+ifeq ($(origin PARENT_MODULE),file)
+  ifeq ($(INSTALL_LOCATION),$($(PARENT_MODULE)))
+    DISABLE_TOP_RULES=YES
+  endif
+endif
 
-CVSCLEAN = $(call FIND_TOOL,cvsclean.pl)
-cvsclean:
-	$(PERL) $(CVSCLEAN)
+ifndef DISABLE_TOP_RULES
+  #
+  # Rules for a regular application top directory
+  #
+
+distclean: realclean cvsclean realuninstall
 
 realuninstall: uninstallDirs
 	$(RMDIR) $(INSTALL_LOCATION_BIN)
 	$(RMDIR) $(INSTALL_LOCATION_LIB)
 
-UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC) \
-    $(INSTALL_HTML) $(INSTALL_TEMPLATES) $(INSTALL_DB) $(DIRECTORY_TARGETS)
+UNINSTALL_DIRS += $(INSTALL_DB) $(INSTALL_DBD) $(INSTALL_DOC) $(INSTALL_HTML)
+UNINSTALL_DIRS += $(INSTALL_INCLUDE) $(INSTALL_TEMPLATES) $(DIRECTORY_TARGETS)
+ifneq ($(INSTALL_LOCATION),$(TOP))
+  UNINSTALL_DIRS += $(INSTALL_CONFIG)
+endif
 uninstallDirs:
 	$(RMDIR) $(UNINSTALL_DIRS)
 
@@ -33,6 +46,8 @@ uninstall$(DIVIDER)%:
 	$(RMDIR) $(INSTALL_LOCATION_BIN)/$(archPart)
 	$(RMDIR) $(INSTALL_LOCATION_LIB)/$(archPart)
 
+# Remove the bin and lib directories if they have no sub-directories
+#
 cleandirs:
 	@$(NOP)
 ifeq ($(wildcard $(INSTALL_LOCATION_BIN)/*),)
@@ -42,6 +57,16 @@ ifeq ($(wildcard $(INSTALL_LOCATION_LIB)/*),)
 	$(RMDIR) $(INSTALL_LOCATION_LIB)
 endif
 
+else
+  #
+  # Using a disabled rule aborts
+  #
+
+  cleandirs distclean uninstall realuninstall archuninstall:
+	$(error Target '$@' not available in a submodule)
+
+endif # DISABLE_TOP_RULES
+
 
 help:
 	@echo "Usage: gnumake [options] [target] ..."
@@ -57,30 +82,39 @@ help:
 	@echo "                      Cannot be used within an O.<arch> dir"
 	@echo "     rebuild        - Same as clean install"
 	@echo "     archclean      - Removes O.<arch> dirs but not O.Common dir"
+	@echo "     depclean       - Removes .d files from all O.<arch> dirs."
+	@echo "     cvsclean       - Removes backup files etc. from all dirs below"
+	@echo "     runtests       - Run self-tests, summarize results immediately"
+	@echo "     tapfiles       - Run self-tests, save to O.<arch>/*.tap files"
+	@echo "     test-results   - Summarize all O.<arch>/*.tap files"
+	@echo "     clean-tests    - Removes all O.<arch>/*.tap files"
 	@echo "\"Partial\" build targets supported by Makefiles:"
 	@echo "     host           - Builds and installs $(EPICS_HOST_ARCH) only."
 	@echo "     inc$(DIVIDER)<arch>     - Installs <arch> only header files."
 	@echo "     build$(DIVIDER)<arch>   - Builds and installs <arch> only."
 	@echo "     install$(DIVIDER)<arch> - Builds and installs <arch> only."
 	@echo "     clean$(DIVIDER)<arch>   - Cleans <arch> binaries in O.<arch> dirs only."
-	@echo "     uninstall$(DIVIDER)<arch> - Remove bin & lib directories for <arch> only."
 	@echo "Targets supported by top level Makefile:"
+ifndef DISABLE_TOP_RULES
 	@echo "     archuninstall  - Remove bin & lib directories created by this hostarch."
+	@echo "     uninstall$(DIVIDER)<arch> - Remove bin & lib directories for <arch> only."
 	@echo "     uninstall      - Remove install directories created by this hostarch."
 	@echo "     realuninstall  - Removes ALL install dirs"
 	@echo "     distclean      - Same as realclean cvsclean realuninstall."
-	@echo "     cvsclean       - Removes cvs .#* files in all dirs of directory tree"
+endif
 	@echo "     help           - Prints this list of valid make targets "
-	@echo "Indiv. object targets are supported by O.<arch> level Makefile .e.g"
+	@echo "Object targets are supported by the O.<arch> level Makefile .e.g"
 	@echo "     xxxRecord.o"
 
-.PHONY: cleandirs distclean cvsclean realuninstall archuninstall uninstallDirs
-.PHONY: uninstall help
+.PHONY: cleandirs distclean uninstall help
+.PHONY: realuninstall archuninstall uninstallDirs
 
-# Include <top>/cfg/TOP_RULES* files from tops defined in RELEASE* files
-#
-RELEASE_CFG_TOP_RULES = $(foreach top, $(RELEASE_TOPS), \
-    $(wildcard $($(top))/cfg/TOP_RULES*))
-ifneq ($(RELEASE_CFG_TOP_RULES),)
-  include $(RELEASE_CFG_TOP_RULES)
+ifndef DISABLE_TOP_RULES
+  # Include <top>/cfg/TOP_RULES* files from tops defined in RELEASE* files
+  #
+  RELEASE_CFG_TOP_RULES = $(foreach top, $(RELEASE_TOPS), \
+      $(wildcard $($(top))/cfg/TOP_RULES*))
+  ifneq ($(RELEASE_CFG_TOP_RULES),)
+    include $(RELEASE_CFG_TOP_RULES)
+  endif
 endif

configure/os/CONFIG.Common.RTEMS

@@ -27,9 +27,13 @@ ifneq ($(CONFIG),$(TOP)/configure)
 -include $(TOP)/configure/CONFIG_SITE.Common.RTEMS
 endif
 
+#--------------------------------------------------
+# Set RTEMS_BSP from T_A if not already done
+RTEMS_BSP ?= $(subst RTEMS-,,$(T_A))
+
 #-------------------------------------------------------
 # Pick up the RTEMS tool/path definitions from the RTEMS BSP directory.
-include $(RTEMS_BASE)/$(RTEMS_TARGET_CPU)-rtems$(RTEMS_VERSION)/$(subst RTEMS-,,$(T_A))/Makefile.inc
+include $(RTEMS_BASE)/$(RTEMS_TARGET_CPU)-rtems$(RTEMS_VERSION)/$(RTEMS_BSP)/Makefile.inc
 include $(RTEMS_CUSTOM)
 include $(CONFIG.CC)
 
@@ -72,7 +76,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 $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
+ECHO = @$(if $(findstring s,$(MFLAGS)),$(NOP),echo)
 
 #--------------------------------------------------
 # Although RTEMS uses gcc, it wants to use gcc its own way
@@ -136,6 +140,13 @@ 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-at91rm9200ek

@@ -9,5 +9,6 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_TARGET_CPU=arm
+RTEMS_BSP = at91rm9200ek
+RTEMS_TARGET_CPU = arm
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-beatnik

@@ -5,6 +5,7 @@
 # All RTEMS targets use the same Makefile fragment
 #
 EXE = .elf
+RTEMS_BSP = beatnik
 RTEMS_TARGET_CPU = powerpc
 GNU_TARGET = powerpc-rtems
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
@@ -15,7 +16,6 @@ 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-gen68360

@@ -5,5 +5,6 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_TARGET_CPU=m68k
+RTEMS_BSP = gen68360
+RTEMS_TARGET_CPU = m68k
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-mcp750

@@ -5,5 +5,6 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_TARGET_CPU=ppc
+RTEMS_BSP = mcp750
+RTEMS_TARGET_CPU = ppc
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-mvme167

@@ -5,5 +5,6 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_TARGET_CPU=m68k
+RTEMS_BSP = mvme167
+RTEMS_TARGET_CPU = m68k
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-mvme2100

@@ -5,6 +5,7 @@
 # All RTEMS targets use the same Makefile fragment
 #
 EXE = .elf
+RTEMS_BSP = mvme2100
 RTEMS_TARGET_CPU = powerpc
 GNU_TARGET = powerpc-rtems
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
@@ -13,7 +14,6 @@ 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

@@ -1,13 +1,13 @@
 #
 # Author: Matt Rippa
 #
+RTEMS_BSP = mvme2700
 RTEMS_TARGET_CPU = powerpc
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 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

@@ -5,6 +5,7 @@
 # All RTEMS targets use the same Makefile fragment
 #
 EXE = .elf
+RTEMS_BSP = mvme3100
 RTEMS_TARGET_CPU = powerpc
 GNU_TARGET = powerpc-rtems
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
@@ -15,7 +16,6 @@ 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

@@ -5,6 +5,7 @@
 # All RTEMS targets use the same Makefile fragment
 #
 EXE = .elf
+RTEMS_BSP = mvme5500
 RTEMS_TARGET_CPU = powerpc
 GNU_TARGET = powerpc-rtems
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
@@ -16,7 +17,6 @@ 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

@@ -5,15 +5,15 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_TARGET_CPU=i386
+RTEMS_BSP = pc386
+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
+	$(RM) $*.bin
+	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< $*.bin
 	$(BIN2BOOT) $@ 0x00097E00 \
-		$(PROJECT_RELEASE)/lib/start16.bin 0x00097C00 0 temp.bin 0x00100000 0
-	rm -f temp.bin
+	    $(PROJECT_RELEASE)/lib/start16.bin 0x00097C00 0 $*.bin 0x00100000 0
 endef
 
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-pc386-qemu

@@ -0,0 +1,11 @@
+# CONFIG.Common.RTEMS-pc386-qemu
+#
+# Definitions for the RTEMS-pc386-qemu target
+# Site-specific overrides go in CONFIG_SITE.Common.RTEMS-pc386-qemu
+#
+#-------------------------------------------------------
+
+# Include definitions from RTEMS-pc386
+include $(CONFIG)/os/CONFIG.Common.RTEMS-pc386
+
+RTEMS_QEMU_FIXUPS = YES

configure/os/CONFIG.Common.RTEMS-psim

@@ -5,5 +5,6 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_TARGET_CPU=ppc
+RTEMS_BSP = psim
+RTEMS_TARGET_CPU = ppc
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-uC5282

@@ -5,11 +5,11 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
+RTEMS_BSP = uC5282
 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.linux-xscale_be

@@ -15,5 +15,14 @@ ARCH_CLASS = xscale
 ifeq ($(BUILD_CLASS),CROSS)
     VALID_BUILDS = Ioc
     GNU_TARGET = xscale_be
-    CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
+    CMPLR_PREFIX = $(GNU_TARGET:%=%-)
+
+    # Configure for readline if requested
+    OP_SYS_INCLUDES += $(READLINE_DIR:%=-I%/include)
+    READLINE_LDFLAGS = $(READLINE_DIR:%=-L%/lib)
+    RUNTIME_LDFLAGS_READLINE_YES_NO = $(READLINE_DIR:%=-Wl,-rpath,%/lib)
+    RUNTIME_LDFLAGS += \
+        $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
+    SHRLIBDIR_LDFLAGS += $(READLINE_LDFLAGS)
+    PRODDIR_LDFLAGS += $(READLINE_LDFLAGS)
 endif

configure/os/CONFIG.Common.linuxCommon

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

configure/os/CONFIG.Common.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,58 +78,38 @@ 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)
 
 #--------------------------------------------------
-# Wind River moved nm out of GNU_BIN in some versions
+# This finds nm on any supported VxWorks version
 
-WORKBENCH_BIN = $(WIND_BASE)/workbench-$(WORKBENCH_VERSION)/$(WIND_HOST_TYPE)/bin
-UTILITIES_BIN = $(WIND_BASE)/utilities-$(UTILITIES_VERSION)/$(WIND_HOST_TYPE)/bin
-
-NM_DIR_6.4 = $(WORKBENCH_BIN)
-NM_DIR_6.5 = $(WORKBENCH_BIN)
-NM_DIR_6.6 = $(WORKBENCH_BIN)
-NM_DIR_6.7 = $(GNU_BIN)
-NM_DIR_6.8 = $(UTILITIES_BIN)
-NM_DIR_6.9 = $(UTILITIES_BIN)
-NM_DIR = $(firstword $(NM_DIR_$(VXWORKS_VERSION)) $(GNU_BIN))
-
-NM = $(NM_DIR)/$(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE)
+NMPROG = $(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE)
+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))
 
 #--------------------------------------------------
 # These are required by some of the Wind River tools
 export WIND_BASE
+export WIND_HOME = $(WIND_BASE)
 export WIND_HOST_TYPE
 export TOOL_FAMILY = GNU
 
@@ -140,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
 
 #--------------------------------------------------
@@ -157,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
@@ -170,8 +146,10 @@ SHRLIB_CFLAGS =
 SHRLIB_LDFLAGS =
 
 #--------------------------------------------------
-# Earlier versions of gcc don't understand -MF
-HDEPENDS_COMPFLAGS = -MM > $@
+# Don't use gcc 2.x for dependency generation
+
+HDEPENDS_METHOD_2 = MKMF
+HDEPENDS_METHOD = $(firstword $(HDEPENDS_METHOD_$(VX_GNU_MAJOR_VERSION)) COMP)
 
 #--------------------------------------------------
 # osithead use default stack, YES or NO override
@@ -179,6 +157,8 @@ OSITHREAD_USE_DEFAULT_STACK = NO
 
 #--------------------------------------------------
 # Link definitions
+CROSS_LDFLAGS =
+#
 LINK.cpp = $(LD) -o $@ $(STATIC_LDFLAGS) $(PRODDIR_LDFLAGS) $(LDFLAGS)
 LINK.cpp += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(PROD_LDLIBS)
 
@@ -192,6 +172,10 @@ COMPILE.ctdt = $(CC) -c $(CPPFLAGS) $(CFLAGS_ctdt) $(INCLUDES) $(SOURCE_FLAG)
 VXCPPFLAGS = $(filter-out $(OP_SYS_INCLUDE_CPPFLAGS),$(CPPFLAGS))
 PREPROCESS.cpp = $(CPP) $(VXCPPFLAGS) $(INCLUDES) $< > $@
 
+#--------------------------------------------------
+# Use LEDLIB for command-line editing
+COMMANDLINE_LIBRARY = LEDLIB
+
 #--------------------------------------------------
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.Common.vxWorksCommon

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

@@ -65,14 +65,14 @@ GNU = NO
 #
 # Darwin shared libraries
 #
-SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined suppress \
+SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined dynamic_lookup \
     -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 -flat_namespace -undefined suppress
+LOADABLE_SHRLIB_LDFLAGS = -bundle -undefined dynamic_lookup
 
 #
 # 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.linux-arm

@@ -11,19 +11,14 @@ GNU_TARGET = arm-linux
 CMPLR_SUFFIX =
 CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
 
-# Provide a link-time path for shared libraries
-SHRLIBDIR_RPATH_LDFLAGS_YES += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
-SHRLIBDIR_LDFLAGS += $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
-
-# Provide a link-time path for products
-PRODDIR_RPATH_LDFLAGS_YES += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
-PRODDIR_LDFLAGS += $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
-
-# Provide a link-time path for readline 
-RUNTIME_LDFLAGS_READLINE_YES = -Wl,-rpath-link,$(GNU_DIR)/lib
-RUNTIME_LDFLAGS_READLINE = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
-RUNTIME_LDFLAGS_READLINE_CURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
-RUNTIME_LDFLAGS_READLINE_NCURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
+# Provide a link-time path for readline if needed
+OP_SYS_INCLUDES += $(READLINE_DIR:%=-I%/include)
+READLINE_LDFLAGS = $(READLINE_DIR:%=-L%/lib)
+RUNTIME_LDFLAGS_READLINE_YES_NO = $(READLINE_DIR:%=-Wl,-rpath,%/lib)
+RUNTIME_LDFLAGS += \
+    $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
+SHRLIBDIR_LDFLAGS += $(READLINE_LDFLAGS)
+PRODDIR_LDFLAGS += $(READLINE_LDFLAGS)
 
 # Library flags
 STATIC_LDFLAGS_YES= -Wl,-Bstatic

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

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

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-mingw.win32-x86-mingw

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

configure/os/CONFIG.win32-x86.Common

@@ -26,3 +26,5 @@ endif
 # Needed to find dlls for base installed build tools (antelope,eflex,...)
 PATH := $(EPICS_BASE_BIN):$(PATH)
 
+# Silence the tr1 namespace deprecation warnings
+USR_CXXFLAGS_WIN32 += -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING

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

@@ -79,27 +79,32 @@ 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
-CODE_CPPFLAGS += -nologo -D__STDC__=0
+
+# 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 += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
 
 
 # Compiler flags for C++ files
 
 #
-# -W<N> use warning level N
-# (maximum lint level warnings at level 4)
-# -w44355 set "'this' used in the base initializer list" to be level 4
+# -W<n> disable warnings from levels > n
+# -w<n><m> set warning m to level n
+# -w44355 "'this' used in the base initializer list"
 # -w44344 "behavior change: use of explicit template arguments results in ..."
-WARN_CXXFLAGS_YES = -W3 -w44355 -w44344
+# -w44251 "class needs to have dll-interface to be used by clients of ..."
+WARN_CXXFLAGS_YES = -W3 -w44355 -w44344 -w44251
 WARN_CXXFLAGS_NO  = -W1
 
 #
@@ -130,11 +135,24 @@ OBJ_CXXFLAG = -Fo
 STATIC_CXXFLAGS_YES= -MT$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS)
 STATIC_CXXFLAGS_NO= -MD$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS) -DEPICS_CALL_DLL
 
-STATIC_LDLIBS_YES=ws2_32.lib advapi32.lib user32.lib kernel32.lib winmm.lib
+STATIC_LDLIBS_YES=ws2_32.lib advapi32.lib user32.lib kernel32.lib winmm.lib dbghelp.lib
 STATIC_LDLIBS_NO=
 STATIC_LDFLAGS=
 RANLIB=
 
+#
+# option needed for parallel builds with Visual Studio 2013 onward
+# VS2012 and above have VisualStudioVersion, so just need to exclude 2012 (11.0)
+# -FS Force Synchronous PDB Writes
+#
+ifneq ($(VisualStudioVersion),)
+ifneq ($(VisualStudioVersion),11.0)
+  OPT_CXXFLAGS_NO += -FS
+  OPT_CFLAGS_NO += -FS
+endif
+endif
+
+
 #
 # add -profile here to run the ms profiler
 # -LTCG whole program optimization
@@ -165,48 +183,38 @@ EXE=.exe
 OBJ=.obj
 RES=.res
 
-#       Problem: MS Visual C++ does not recognize  *.cc as C++ source,
-#       so we do C++ compiles using the global flag -TP 
+# MS Visual C++ doesn't recognize *.cc as a C++ source file,
+# so C++ compiles get the flag -TP
 COMPILER_CXXFLAGS = -TP
 
-#	Operating system flags 
+# Operating system flags
 OP_SYS_CFLAGS =
 OP_SYS_CXXFLAGS = $(COMPILER_CXXFLAGS)
 
-#
-#	Files and flags needed to link DLLs (used in RULES_BUILD)
-#
-WIN32_DLLFLAGS = /subsystem:windows /dll $(OPT_LDFLAGS) \
+# Files and flags needed to link DLLs (used in RULES_BUILD)
+WIN32_DLLFLAGS = -subsystem:windows -dll $(OPT_LDFLAGS) \
  $(USR_LDFLAGS) $(CMD_LDFLAGS) $(TARGET_LDFLAGS) $(LIB_LDFLAGS)
 
-#
-# specify dll .def file only if it exists
-#
+# Specify dll .def file only if it exists
 DLL_DEF_FLAG = $(addprefix -def:,$(wildcard ../$(addsuffix .def,$*)))
 
-#
-#	A WIN32 dll has three parts:
+# A WIN32 dll has three parts:
 #	x.dll: the real dll (SHRLIBNAME)
 #	x.lib: what you link to progs that use the dll (DLLSTUB_LIBNAME)
 #	x.exp: what you need to build the dll (in no variable)
-#
 LINK.shrlib = $(WINLINK) -nologo $(WIN32_DLLFLAGS) -out:$@ \
     -implib:$(@:%$(SHRLIB_SUFFIX)=%$(LIB_SUFFIX)) \
     $(DLL_DEF_FLAG) $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS)
 
-
-#	adjust names of libraries to build
-#
+# Adjust names of libraries to build
 SHRLIB_SUFFIX_BASE = .dll
 SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
 SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
 LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
 TESTSHRLIBNAME_YES = $(TESTBUILD_LIBRARY:%=%$(SHRLIB_SUFFIX_BASE))
 
-#
-# When SHARED_LIBRARIES is YES we are building a DLL link library 
-# and when SHARED_LIBRARIES is NO we are building an object library
-#
+# When SHARED_LIBRARIES is YES we are building a DLL shared library.
+# When SHARED_LIBRARIES is NO we are building an object library
 DLLSTUB_SUFFIX = .lib
 DLLSTUB_LIBNAME_YES = $(BUILD_LIBRARY:%=%.lib)
 DLLSTUB_LIBNAME = $(DLLSTUB_LIBNAME_$(SHARED_LIBRARIES))
@@ -220,7 +228,7 @@ LIBNAME = $(LIBNAME_$(SHARED_LIBRARIES))
 TESTLIBNAME_NO = $(TESTBUILD_LIBRARY:%=%.lib)
 TESTLIBNAME = $(TESTLIBNAME_$(SHARED_LIBRARIES))
 
-#	dll install location
+# dll install location
 INSTALL_SHRLIB = $(INSTALL_BIN)
 
 
@@ -280,7 +288,7 @@ LINK.cpp = $(WINLINK) -nologo $(STATIC_LDFLAGS) $(LDFLAGS) $(PROD_LDFLAGS) \
 #--------------------------------------------------
 # UseManifestTool.pl checks MS Visual c++ compiler version number to
 # decide whether or not to use the Manifest Tool command to embed the
-# linker created .manifest file into a library or product target. 
+# linker created .manifest file into a library or product target.
 # useManifestTool.pl returns 0(don't use) or 1(use).
 #
 MT.exe = mt.exe -nologo -manifest $@.manifest
@@ -290,4 +298,3 @@ MT_EXE_COMMAND_NO = $(MT.exe) "-outputresource:$@;\#1"
 MT_EXE_COMMAND1 = $(MT_EXE_COMMAND_$(STATIC_BUILD))
 MT_DLL_COMMAND = $(MT_DLL_COMMAND$(shell $(PERL) $(TOOLS)/useManifestTool.pl))
 MT_EXE_COMMAND = $(MT_EXE_COMMAND$(shell $(PERL) $(TOOLS)/useManifestTool.pl))
-

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

@@ -8,8 +8,7 @@
 include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
 -include $(CONFIG)/os/CONFIG_SITE.win32-x86.win32-x86
 
-OPT_LDFLAGS += /MACHINE:X64
-#	/MACHINE:X64
-#	/MACHINE:IA64  (Itanium)
-#	/MACHINE:X86
-
+OPT_LDFLAGS += -MACHINE:X64
+#	-MACHINE:X64
+#	-MACHINE:IA64  (Itanium)
+#	-MACHINE:X86

configure/os/CONFIG_SITE.Common.RTEMS-pc386

@@ -1,3 +0,0 @@
-#
-# Site-specific overrides for RTEMS-pc386 target
-#

configure/os/CONFIG_SITE.Common.RTEMS-pc386-qemu

@@ -0,0 +1,9 @@
+# CONFIG_SITE.Common.RTEMS-pc386-qemu
+#
+# Site-specific overrides for the RTEMS-pc386-qemu target
+#
+
+# If you're building this architecture you _probably_ want to
+# run the tests for it under QEMU, but if not you can turn
+# them off here by commenting out this line:
+CROSS_COMPILER_RUNTEST_ARCHS += RTEMS-pc386-qemu

configure/os/CONFIG_SITE.Common.linux-arm

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

configure/os/CONFIG_SITE.Common.linux-cris

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

configure/os/CONFIG_SITE.Common.linux-microblaze

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

configure/os/CONFIG_SITE.Common.linux-x86

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

configure/os/CONFIG_SITE.Common.linux-x86_64

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

configure/os/CONFIG_SITE.Common.linux-xscale_be

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

configure/os/CONFIG_SITE.Common.linuxCommon

@@ -0,0 +1,11 @@
+# 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,25 +1,17 @@
 # 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
-#VXWORKS_VERSION = 6.9
+VXWORKS_VERSION = 6.9
 
 
 # Sites may override the following path for a particular host
@@ -27,21 +19,7 @@ VXWORKS_VERSION = 5.5
 # 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)
+#WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
+WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
 #WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION)
-
-
-# WorkBench Version number, if you're using vxWorks 6.x
-
-#WORKBENCH_VERSION = 2.6
-#WORKBENCH_VERSION = 3.0
-#WORKBENCH_VERSION = 3.2
-#WORKBENCH_VERSION = 3.3
-
-
-# Utilities Version number, required from vxWorks 6.8 and later
-
-#UTILITIES_VERSION = 1.0

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

@@ -7,8 +7,26 @@
 GNU_TARGET = arm-xilinx-linux-gnueabi
 
 # Set GNU tools install path
-# This is the install path at APS:
-GNU_DIR = /usr/local/vw/zynq-2011.09
+# Examples are installations at the APS:
+#GNU_DIR = /usr/local/vw/zynq-2011.09
+GNU_DIR = /usr/local/vw/zynq-2016.1/gnu/arm/lin
+#GNU_DIR = /usr/local/Xilinx/SDK/2016.3/gnu/arm/lin
+#GNU_DIR = /APSshare/XilinxSDK/2015.4/gnu/arm/lin
+
+# If cross-building shared libraries and the paths on the target machine are
+# different than on the build host, you should uncomment the lines below to
+# disable putting runtime library paths in products and shared libraries.
+# You will also need to provide another way for programs to find their shared
+# libraries at runtime, such as by setting LD_LIBRARY_PATH or by using
+# mechanisms related to /etc/ld.so.conf
+#SHRLIBDIR_RPATH_LDFLAGS_YES_NO =
+#PRODDIR_RPATH_LDFLAGS_YES_NO =
+# Note: It may be simpler to just set STATIC_BUILD=YES here and not
+# try to use shared libraries at all in these circumstances.
+
+# To use libreadline, point this to its install prefix
+#READLINE_DIR = $(GNU_DIR)
+#READLINE_DIR = /tools/cross/linux-x86.linux-arm/readline
+# See CONFIG_SITE.Common.linux-arm for other COMMANDLINE_LIBRARY values
+#COMMANDLINE_LIBRARY = READLINE
 
-# With a Xilinx SDK, it'll be something like
-#GNU_DIR = /usr/local/zynq/Xilinx/SDK/2015.4/gnu/arm/lin

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

@@ -0,0 +1,11 @@
+# CONFIG_SITE.linux-x86.linux-xscale_be
+#
+# Site specific definitions for linux-x86 host - linux-xscale_be targets
+#-------------------------------------------------------
+
+# Set GNU_DIR to point to directory containing the tool-chain
+GNU_DIR = /usr/local/vw/xscale_be
+
+# If readline is available, configure it
+READLINE_DIR = $(GNU_DIR)/target/usr
+COMMANDLINE_LIBRARY = READLINE

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-
 

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

@@ -0,0 +1,7 @@
+# CONFIG_SITE.linux-x86_64.linux-xscale_be
+#
+# Site specific settings for linux-x86_64 host - linux-xscale_be target
+#-------------------------------------------------------
+
+# Inherit setting from linux-x86
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.linux-xscale_be

documentation/KnownProblems.html

@@ -4,25 +4,29 @@
 <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.5</title>
+  <title>Known Problems in EPICS 7.0.3.1</title>
 </head>
 
 <body>
-<h1 style="text-align: center">EPICS Base R3.15.5: Known Problems</h1>
+<h1 style="text-align: center">EPICS 7.0.3.1: Known Problems</h1>
 
 <p>Any patch files linked below should be applied at the root of the
-base-3.15.5 tree. Download them, then use the GNU Patch program as
+base-7.0.3.1 tree. Download them, then use the GNU Patch program as
 follows:</p>
 
-<blockquote><pre>% <b>cd <i>/path/to/</i>base-3.15.5</b>
-% <b>patch -p0 &lt; <i>/path/to/</i>file.patch</b></pre></blockquote>
+<blockquote><pre>% <b>cd <i>/path/to/</i>base-7.0.3.1</b>
+% <b>patch -p1 &lt; <i>/path/to/</i>file.patch</b></pre></blockquote>
 
-<p>The following 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>
+-->
 
 </ul>
 

documentation/README.1st

@@ -1,347 +0,0 @@
-                           Installation Instructions
-
-                           EPICS Base Release 3.15.5
-
-   --------------------------------------------------------------------------
-
-  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 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 or vxWorks 6.x 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
-     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 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.
-
-       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
-       R3.15 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 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 <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

@@ -21,7 +21,7 @@ of my Bash login script (~/.bash_login):
 #
 EPICS_BASE="${HOME}/src/EPICS/base"
 EPICS_EXTENSIONS="${HOME}/src/EPICS/extensions"
-<strong>.</strong> "${EPICS_BASE}"/startup/Site.profile
+<strong>.</strong> "${EPICS_BASE}"/startup/unix.sh
 </pre>
 </li>
 <li>

documentation/README.html

@@ -1,384 +0,0 @@
-<!DOCTYPE HTML>
-<!-- Generate the README.1st file from this file using:
-    elinks -dump -no-numbering -no-references -dump-width 80 README.html
-  -->
-<HTML>
-<HEAD>
-<TITLE>README - EPICS Base Installation Instructions</TITLE>
-</HEAD>
-<BODY>
-<CENTER>
-<H1>Installation Instructions</H1>
-<H2>EPICS Base Release 3.15.5</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 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.</P>
-
-<P>Consult the <a href="http://www.aps.anl.gov/epics/base/tornado.php">vxWorks
- 5.x</a> or <a href="http://www.aps.anl.gov/epics/base/vxWorks6.php">vxWorks
- 6.x</a> EPICS web pages about 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 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. &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>
-
- R3.15 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 3.15 example application
- can be found in the section &quot;Example Application&quot; of Chapter 2,
- &quot;Getting Started&quot;, in the &quot;IOC Application Developer's Guide&quot; for this
- release. The &quot;Example IOC Application&quot; section briefly explains how to
- create and build an example application in a user created &lt;top&gt;
- directory. It also explains how to run the example application on a
- vxWorks ioc or as a process on the host system.
- By running the example application as a host-based IOC, you will be 
- able to quickly implement a complete EPICS system and be able to run channel 
- access clients on the host system.
-
-<P>
- A perl script,
- makeBaseExt.pl, is included in the distribution file. This script will
- create a sample extension that can be built and executed. The
- makeBaseApp.pl and makeBaseExt.pl scripts are installed into the
- install location bin/&lt;hostarch&gt; directory during the base build.
-</BLOCKQUOTE>
-
-<H3><A NAME="0_0_14"> Multiple host platforms</A></H3>
-<BLOCKQUOTE>You can build using a single EPICS directory structure on
- multiple host systems and for multiple cross target systems. The
- intermediate and binary files generated by the build will be created in
- separate subdirectories and installed into the appropriate separate
- host/target install directories. EPICS executables and perl scripts are
- installed into the <TT>$(INSTALL_LOCATION)/bin/&lt;arch&gt;</TT> directories.
- Libraries are installed into $<TT>(INSTALL_LOCATION)/lib/&lt;arch&gt;</TT>.
- The default definition for <TT>$(INSTALL_LOCATION)</TT> is <TT>$(TOP)</TT>
- which is the root directory in the distribution directory structure,
- base. Created object files are stored in O.&lt;arch&gt; source
- subdirectories, This allows objects for multiple cross target
- architectures to be maintained at the same time. To build EPICS base
- for a specific host/target combination you must have the proper
- host/target C/C++ cross compiler and target header files and the
- base/configure/os directory must have the appropriate configure files.
-</BLOCKQUOTE>
-</BODY>
-</HTML>

documentation/README.md

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

documentation/ReleaseChecklist.html

@@ -33,30 +33,39 @@
 <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>
 
+<h4>Full Process</h4>
+
 <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 about weekly intervals during the testing and debugging period, and
-will be designated as either pre-release versions or Release Candidates by the
-Release Manager.  A Release Candidate that has received widespread testing for a
-week without any additional problems being discovered or significant changes
-being committed 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>
+
+<h4>Short Process for Patch Releases</h4>
+
+<p>The Patch Release date and its scope are agreed upon a few weeks ahead of the
+release. If no blocking issues are raised, the release is made by the Release
+Manager on or as soon as possible after that date, following the steps below
+starting at <a href="#ReleaseApproval">Release Approval</a>.</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></dt>
+  <dt><strong>Platform Developers</strong> (optional)</dt>
     <dd>Responsible for individual operating system platforms</dd>
   <dt><strong>Application Developers</strong></dt>
     <dd>Responsible for support modules that depend on EPICS Base.</dd>
@@ -64,6 +73,7 @@ relevent roles unless the Release Manager designates otherwise:</p>
     <dd>Responsible for the EPICS website</dd>
 </dl>
 
+<form>
 <table border="1" width="100%">
   <tbody>
     <tr>
@@ -78,7 +88,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>
@@ -90,7 +100,7 @@ relevent roles unless the Release Manager designates otherwise:</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Set the Feature Freeze date, by which time all Bazaar commits for
+      <td>Set the Feature Freeze date, by which time all Git commits for
         enhancements and new functionality should have been completed. After
         this date, commits should only be made to fix problems that show up
         during testing.</td>
@@ -111,95 +121,92 @@ 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>
       <td>Website Manager</td>
-      <td>Create a release milestone on Launchpad if necessary and set the
-        expected release date. Note that pre-release and release-candidate
-        versions do not appear on Launchpad, only the final release.</td>
+      <td>Create a release milestone on Launchpad. If a target release date is
+        known set "Date Targeted" to the expected release date. Note that
+        pre-release and release-candidate versions should not get Launchpad
+        milestones, only the final release.</td>
       </tr>
     <tr>
       <th colspan="3">Creating pre-release and release-candidate versions</th>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></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><input type="checkbox"></td>
       <td>Release Manager</td>
-      <td>Tag the module in Bazaar, using these tag conventions:
+      <td>Tag the module in Git, using these tag conventions:
         <ul>
           <li>
-            <tt>R3.15.5-pre<i>n</i></tt>
+            <tt>R7.0.3.1-pre<i>n</i></tt>
             &mdash; pre-release tag
             </li>
           <li>
-            <tt>R3.15.5-rc<i>n</i></tt>
-            &mdash; release candidate tag, note the <tt>rc</tt> is now
-            lower-case</li>
-        </ul>
+            <tt>R7.0.3.1-rc<i>n</i></tt>
+            &mdash; release candidate tag
+            </li>
+          </ul>
         <blockquote><tt>
-          cd ~/base/mirror-3.15<br />
-          bzr tag R3.15.5-rc<i>n</i>
+          cd base-7.0<br />
+          git tag -m 'ANJ: Tagged for 7.0.3.1-rc1' R7.0.3.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>
+      <td><input type="checkbox"></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<br />
-          bzr export
-            --root=base-3.15.5-rc<i>n</i>
-            -r tag:R3.15.5-rc<i>n</i>
-            base-3.15.5-rc<i>n</i>.tar.gz
-            mirror-3.15
+          cd base-7.0<br />
+          ./.tools/make-tar.sh R7.0.3.1-rc1 base-7.0.3.1-rc1.tar.gz base-7.0.3.1-rc1/
           </tt></blockquote>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
-          gpg --armor --sign --detach-sig base-3.15.5-rc<i>n</i>.tar.gz
+          gpg --armor --sign --detach-sig base-7.0.3.1-rc1.tar.gz
           </tt></blockquote>
         </td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Release Manager</td>
       <td>Test the tarfile by extracting its contents and building it on at
         least one supported platform.</td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></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>
+      <td><input type="checkbox"></td>
       <td>Website Manager</td>
       <td>Create or update a website subdirectory to hold the release
         documentation, and copy in selected files from the base/documentation
         and base/html directories of the tarfile.</td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Website Manager</td>
       <td>Create or modify the webpage for the new release with links to the
         release documents and tar file. Pre-release and release-candidate
         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>
@@ -235,7 +242,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>
@@ -251,118 +258,249 @@ relevent roles unless the Release Manager designates otherwise:</p>
           </ul>
         </td>
       </tr>
+
     <tr>
-      <th colspan="3">Release Approval</th>
+      <th colspan="3" id="ReleaseApproval">
+        Release Approval</th>
     </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></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>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Release Manager</td>
-      <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 Bazaar:
-        <blockquote><tt>
-          cd ~/base/mirror-3.15<br />
-          bzr tag R3.15.5</i>
-          </tt></blockquote>
+      <td>
+        <p>For each external submodule in turn (assuming it has not been tagged
+          yet):</p>
+        <ol>
+          <li>Check that the module's Release Notes have been updated to cover
+            all changes; add items as necessary, and set the module version
+            number and release date if appropriate. Convert to HTML and view in
+            a browser to check the formatting:
+            <blockquote><tt>
+              cd base-7.0/modules/&lt;module&gt;/documentation<br />
+              pandoc -f gfm -t html -o RELEASE_NOTES.html RELEASE_NOTES.md
+              </tt></blockquote>
+            Commit changes (don't push yet).</li>
+
+          <li>Edit the module's release version file
+            <tt>configure/CONFIG_<i>module</i>_VERSION</tt> and its top-level
+            <tt>Doxyfile</tt>; set the <tt>DEVELOPMENT_FLAG</tt> value to 0 and
+            remove <tt>-dev</tt> from the <tt>PROJECT_NUMBER</tt> string.
+            Commit changes (don't push).</li>
+
+          <li>Tag the module:
+            <blockquote><tt>
+              git tag -m 'ANJ: Tag for EPICS 7.0.3.1' &lt;module-version&gt;
+              </tt></blockquote>
+            </li>
+
+          <li>Update the git submodule on the Base-7.0 branch to the
+            newly-tagged version, but don't commit yet:
+            <blockquote><tt>
+              cd base-7.0/modules<br />
+              git add &lt;module&gt;<br />
+              git submodule status --cached
+              </tt></blockquote>
+            </li>
+
+          <li>Edit the module's release version file
+            <tt>configure/CONFIG_<i>module</i>_VERSION</tt> and its top-level
+            <tt>Doxyfile</tt>; increment the <tt>MAINTENANCE_VERSION</tt>, set
+            the <tt>DEVELOPMENT_FLAG</tt> value to 1, and update the
+            <tt>PROJECT_NUMBER</tt> string, appending <tt>-dev</tt> to the new
+            module version number. Commit changes.</li>
+
+          <li>Push commits and the new tag to the submodule's GitHub repository:
+            <blockquote><tt>
+              cd base-7.0/modules/&lt;module&gt;<br />
+              git push --follow-tags upstream master
+              </tt></blockquote>
+            </li>
+
+          </ol>
+        <p>Commit all the submodule updates to the 7.0 branch.</p>
         </td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></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>Edit the main EPICS Base version file and the built-in module version
+        files:
+        <ul>
+          <li><tt>configure/CONFIG_BASE_VERSION</tt></li>
+          <li><tt>configure/CONFIG_LIBCOM_VERSION</tt></li>
+          <li><tt>configure/CONFIG_CA_VERSION</tt></li>
+          <li><tt>configure/CONFIG_DATABASE_VERSION</tt></li>
+          </ul>
+        <p>Version numbers should be set according to the level of changes made
+          since the last release. Note that the <tt>MAINTENANCE_VERSION</tt> or
+          <tt>PATCH_LEVEL</tt> value should have been incremented after the
+          previous release tag was applied. Set all <tt>DEVELOPMENT_FLAG</tt>
+          values to 0 and <tt>EPICS_DEV_SNAPSHOT</tt> to the empty string.</p>
+        <p>Commit these changes (don't push).</p>
+        </td>
+      </tr>
+    <tr>
+      <td><input type="checkbox"></td>
+      <td>Release Manager</td>
+      <td>Tag the epics-base module in Git:
         <blockquote><tt>
-          cd ~/base<br />
-          bzr export
-            --root=base-3.15.5
-            -r tag:R3.15.5
-            base-3.15.5.tar.gz
-            mirror-3.15
+          cd base-7.0<br />
+          git tag -m 'ANJ: Tagged for 7.0.3.1' R7.0.3.1
+          </tt></blockquote>
+        <p>Don't push these commits or the new tag to the Launchpad repository
+          yet.</p>
+        </td>
+      </tr>
+    <tr>
+      <td><input type="checkbox"></td>
+      <td>Release Manager</td>
+      <td>Edit the main EPICS Base version file and the built-in module version
+        files:
+        <ul>
+          <li><tt>configure/CONFIG_BASE_VERSION</tt></li>
+          <li><tt>configure/CONFIG_LIBCOM_VERSION</tt></li>
+          <li><tt>configure/CONFIG_CA_VERSION</tt></li>
+          <li><tt>configure/CONFIG_DATABASE_VERSION</tt></li>
+          </ul>
+        <p>Version numbers should be set for the next expected patch/maintenance
+          release by incrementing the MAINTENANCE_VERSION or PATCH_LEVEL value
+          in each file. Set all <tt>DEVELOPMENT_FLAG</tt> values to 1 and
+          <tt>EPICS_DEV_SNAPSHOT</tt> to "-DEV".</p>
+        <p>Commit these changes (don't push).</p>
+        </td>
+      </tr>
+    <tr>
+      <td><input type="checkbox"></td>
+      <td>Release Manager</td>
+      <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-7.0<br />
+          ./.tools/make-tar.sh R7.0.3.1 base-7.0.3.1.tar.gz base-7.0.3.1/
           </tt></blockquote>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
-          gpg --armor --sign --detach-sig base-3.15.5.tar.gz
+          gpg --armor --sign --detach-sig base-7.0.3.1.tar.gz
           </tt></blockquote>
         </td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Release Manager</td>
       <td>Test the tar file by extracting its contents and building it on at
-        least one supported platform</td>
+        least one supported platform. When this succeeds the commits and new git
+        tag can be pushed to the Launchpad repository:
+        <blockquote><tt>
+          git push --follow-tags upstream 7.0
+          </tt></blockquote>
+        </td>
       </tr>
     <tr>
-      <th colspan="3">Publish and Announce it</th>
+      <th colspan="3">Publish to epics.anl.gov</th>
       </tr>
     <tr>
-      <td>&nbsp;</td>
-      <td>Website Manager</td>
-      <td>If necessary recreate the tarfile following the instructions above.
-        Copy the tar file and its <tt>.asc</tt> signature file to the Base
-        download area of the website.</td>
+      <td><input type="checkbox"></td>
+      <td>Release Manager</td>
+      <td>Copy the tarfile and its signature to the Base download area of the
+        website.</td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Website Manager</td>
       <td>Update the website subdirectory that holds the release
         documentation, and copy in the files from the base/documentation
         directory of the tarfile.</td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Website Manager</td>
       <td>Update the webpage for the new release with links to the release
         documents and tar file.</td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Website Manager</td>
       <td>Add the new release tar file to the website Base download index
         page.</td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Website Manager</td>
       <td>Link to the release webpage from other relevent areas of the
         website - update front page and sidebars.</td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Website Manager</td>
-      <td>Upload the release tar file to the Launchpad download area.</td>
+      <td>Add an entry to the website News page, linking to the new version
+        webpage.</td>
+      </tr>
+
+    <tr>
+      <th colspan="3">Publish to epics-controls</th>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Website Manager</td>
+      <td>Upload the tar file and its <tt>.asc</tt> signature file to the
+        epics-controls web-server.
+        <blockquote><tt>
+          scp base-7.0.3.1.tar.gz base-7.0.3.1.tar.gz.asc epics-controls:download/base<br />
+          </tt></blockquote>
+        </td>
+      </tr>
+    <tr>
+      <td><input type="checkbox"></td>
+      <td>Website Manager</td>
+      <td>Follow instructions on
+        <a href="https://epics-controls.org/resources-and-support/documents/epics-website-documentation/adding-a-page-for-a-new-release/">
+        Add a page for a new release</a> to create a new release webpage (not
+        required for a patch release, just edit the existing page). Update the
+        TablePress "Point Releases" table and add the new download, and adjust
+        the XYZ Html Snippet for the series download.
+        </td>
+      </tr>
+
+    <tr>
+      <th colspan="3">Publish to Launchpad</th>
+      </tr>
+    <tr>
+      <td><input type="checkbox"></td>
+      <td>Website Manager</td>
+      <td>Go to the Launchpad milestone for this release. Click the Create
+        release button and add the release date. Put a URL for the release page
+        in the Release notes box, and click the Create release button. Upload
+        the tar file and its <tt>.asc</tt> signature file to the new Launchpad
+        release page.</td>
+      </tr>
+    <tr>
+      <td><input type="checkbox"></td>
+      <td>Release Manager</td>
       <td>Find all Launchpad bug reports with the status Fix Committed which
         have been fixed in this release and mark them Fix Released.</td>
       </tr>
+
     <tr>
-      <td>&nbsp;</td>
-      <td>Release Manager</td>
-      <td>Email tech-talk</td>
+      <th colspan="3">Make Announcement</th>
       </tr>
     <tr>
-      <td>&nbsp;</td>
-      <td>Website Manager</td>
-      <td>Add an entry to the website News page, linking to the new version
-      webpage.</td>
+      <td><input type="checkbox"></td>
+      <td>Release Manager</td>
+      <td>Announce the release on the tech-talk mailing list.</td>
       </tr>
     </tbody>
   </table>
+</form>
 </body>
 </html>

modules/CONFIG_SITE.local

@@ -0,0 +1,13 @@
+#*************************************************************************
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
+#*************************************************************************
+
+# The name our submodules know us by:
+PARENT_MODULE = EPICS_BASE
+
+# When building submodules, this should always be true:
+INSTALL_LOCATION := $($(PARENT_MODULE))
+
+# Stop submodules installing their configure/ files into our area
+CONFIG_INSTALLS =

modules/Makefile

@@ -0,0 +1,43 @@
+#*************************************************************************
+# 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
+include CONFIG_SITE.local
+
+DIRS += libcom
+
+DIRS += ca
+ca_DEPEND_DIRS = libcom
+
+DIRS += database
+database_DEPEND_DIRS = ca
+
+# Submodules for bundle build
+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
+
+include $(TOP)/configure/RULES_MODULES

modules/ca/Makefile

@@ -6,19 +6,10 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
-recordtype(state) {
-	include "dbCommon.dbd" 
-	field(VAL,DBF_STRING) {
-		prompt("Value")
-		promptgroup("40 - Input")
-		asl(ASL0)
-		pp(TRUE)
-		size(20)
-	}
-	field(OVAL,DBF_STRING) {
-		prompt("Prev Value")
-		special(SPC_NOMOD)
-		interest(3)
-		size(20)
-	}
-}
+
+TOP = ../..
+include $(TOP)/configure/CONFIG
+
+DIRS += src
+
+include $(TOP)/configure/RULES_TOP