minor

dbCa: make private all functions which assume CA_LINK is really dbCa
add broken lset
2016-03-24 14:41:43 -04:00 · 2016-03-24 14:41:43 -04:00 · 2016-03-24 14:41:43 -04:00 · 2016-03-24 14:41:43 -04:00 · 2016-03-24 14:41:43 -04:00 · 2016-03-24 14:41:43 -04:00
1154 changed files with 28306 additions and 29016 deletions
--- a/.bzrignore
+++ b/.bzrignore
@@ -0,0 +1,9 @@
+./bin
+./lib
+./db
+./dbd
+./html
+./include
+./templates
+**/O.*
+./QtC-*
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +0,0 @@
-/cfg/
-/bin/
-/lib/
-/db/
-/dbd/
-/html/
-/include/
-/templates/
-/configure/*.local
-O.*/
-/QtC-*
-*.orig
-*.log
-.*.swp
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,32 +0,0 @@
-sudo: false
-dist: trusty
-language: c
-compiler:
-  - gcc
-env:
-  - CMPLR=gcc
-  - CMPLR=gcc EXTRA=CMD_CXXFLAGS=-std=c++11
-  - CMPLR=gcc STATIC=YES
-  - CMPLR=clang
-  - CMPLR=clang STATIC=YES
-  - WINE=32 TEST=NO STATIC=YES
-  - WINE=32 TEST=NO STATIC=NO
-  - RTEMS=4.10 TEST=NO
-  - RTEMS=4.9 TEST=NO
-addons:
-  apt:
-    packages:
-    - libreadline6-dev
-    - libncurses5-dev
-    - perl
-    - clang
-    - g++-mingw-w64-i686
-    - bison
-    - flex
-    - texinfo
-    - install-info
-cache:
-  directories:
-   - $HOME/.cache
-install: sh ci/travis-prepare.sh </dev/null
-script: sh ci/travis-build.sh </dev/null
--- a/3
+++ b/3
@@ -6,6 +6,9 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
+#
+# $Revision-Id$
+#

 TOP = .
 include $(TOP)/configure/CONFIG
--- a/12
+++ b/12
@@ -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,5 @@ Additional information about EPICS including mailing list
 archives and subscription instructions, documentation and
 training materials, additional components, links to other
 websites etc. is available on the EPICS home page at
-	https://epics.anl.gov/
+	http://www.aps.anl.gov/epics/

--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,89 +0,0 @@
-# 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: 2
-
-# Skipping commits affecting only specific files
-skip_commits:
-  files:
-    - 'documentation/*'
-    - 'templates/*'
-    - '**/*.html'
-    - '**/*.md'
-
-#---------------------------------#
-#   build matrix configuration    #
-#---------------------------------#
-
-# Build Configurations: dll/static, regular/debug
-configuration:
-  - dynamic
-  - static
-  - dynamic-debug
-  - static-debug
-
-# Environment variables: compiler toolchain
-environment:
-  matrix:
-  - TOOLCHAIN: 10.0
-  - TOOLCHAIN: 11.0
-  - TOOLCHAIN: 12.0
-  - TOOLCHAIN: 14.0
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    TOOLCHAIN: 2017
-  - TOOLCHAIN: mingw
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-
-# Platform: architecture
-platform:
-  - x86
-  - x64
-
-# Matrix configuration: allow specific failing jobs
-matrix:
-  exclude:
-  # VS Express installs don't have the 64 bit compiler
-  - platform: x64
-    TOOLCHAIN: 10.0
-
-
-#---------------------------------#
-#     building & testing          #
-#---------------------------------#
-
-install:
-  - cmd: ci/appveyor-prepare.bat
-
-build_script:
-  - cmd: ci/appveyor-make.bat
-
-test_script:
-  - cmd: ci/appveyor-make.bat runtests
-
-#---------------------------------#
-#         notifications           #
-#---------------------------------#
-
-notifications:
-
-  - provider: Email
-    to:
-      - core-talk@aps.anl.gov
-    on_build_success: false
-
-  - provider: GitHubPullRequest
--- a/ci/appveyor-make.bat
+++ b/ci/appveyor-make.bat
@@ -1,119 +0,0 @@
-:: Universal build script for AppVeyor (https://ci.appveyor.com/)
-:: Environment:
-::     TOOLCHAIN      -  toolchain version   [10.0/11.0/12.0/14.0/2017/mingw]
-::     CONFIGURATION  -  determines EPICS build   [dynamic/static]
-::     PLATFORM       -  architecture   [x86/x64]
-::
-:: All command line args are passed to make
-
-Setlocal EnableDelayedExpansion
-
-set "ST="
-if /i "%CONFIGURATION%"=="static" set ST=-static
-
-set OS=64BIT
-if "%PLATFORM%"=="x86" set OS=32BIT
-
-echo [INFO] Platform: %OS%
-
-:: Use parallel make, except for 3.14
-set "MAKEARGS=-j2 -Otarget"
-if "%APPVEYOR_REPO_BRANCH%"=="3.14" set MAKEARGS=
-
-if "%TOOLCHAIN%"=="mingw" (
-    set "MAKE=mingw32-make"
-    if "%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
-)
-
-set "VSINSTALL=C:\Program Files (x86)\Microsoft Visual Studio %TOOLCHAIN%"
-if not exist "%VSINSTALL%\" set "VSINSTALL=C:\Program Files (x86)\Microsoft Visual Studio\%TOOLCHAIN%\Community"
-if not exist "%VSINSTALL%\" goto MSMissing
-
-set "MAKE=C:\tools\make"
-
-echo [INFO] APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE%
-
-if "%OS%"=="64BIT" (
-    set EPICS_HOST_ARCH=windows-x64%ST%
-    :: VS 2017
-    if exist "%VSINSTALL%\VC\Auxiliary\Build\vcvars64.bat" (
-        call "%VSINSTALL%\VC\Auxiliary\Build\vcvars64.bat"
-        where cl
-        if !ERRORLEVEL! NEQ 0 goto MSMissing
-        goto MSFound
-    )
-    if exist "%VSINSTALL%\VC\vcvarsall.bat" (
-        call "%VSINSTALL%\VC\vcvarsall.bat" amd64
-        where cl
-        if !ERRORLEVEL! NEQ 0 (
-            call "%VSINSTALL%\VC\vcvarsall.bat" x86_amd64
-            where cl
-            if !ERRORLEVEL! NEQ 0 goto MSMissing
-        )
-        goto MSFound
-    )
-    if exist "%VSINSTALL%\VC\bin\amd64\vcvars64.bat" (
-        call "%VSINSTALL%\VC\bin\amd64\vcvars64.bat"
-        where cl
-        if !ERRORLEVEL! NEQ 0 goto MSMissing
-        goto MSFound
-    )
-) else (
-    set EPICS_HOST_ARCH=win32-x86%ST%
-    :: VS 2017
-    if exist "%VSINSTALL%\VC\Auxiliary\Build\vcvars32.bat" (
-        call "%VSINSTALL%\VC\Auxiliary\Build\vcvars32.bat"
-        where cl
-        if !ERRORLEVEL! NEQ 0 goto MSMissing
-        goto MSFound
-    )
-    if exist "%VSINSTALL%\VC\vcvarsall.bat" (
-        call "%VSINSTALL%\VC\vcvarsall.bat" x86
-        where cl
-        if !ERRORLEVEL! NEQ 0 goto MSMissing
-        goto MSFound
-    )
-    if exist "%VSINSTALL%\VC\bin\vcvars32.bat" (
-        call "%VSINSTALL%\VC\bin\vcvars32.bat"
-        where cl
-        if !ERRORLEVEL! NEQ 0 goto MSMissing
-        goto MSFound
-    )
-    if exist "%VSINSTALL%\Common7\Tools\vsvars32.bat" (
-        call "%VSINSTALL%\Common7\Tools\vsvars32.bat"
-        where cl
-        if !ERRORLEVEL! NEQ 0 goto MSMissing
-        goto MSFound
-    )
-)
-
-:MSMissing
-echo [INFO] Installation for MSVC Toolchain %TOOLCHAIN% / %OS% seems to be missing
-exit 1
-
-:MSFound
-echo [INFO] Microsoft Visual Studio Toolchain %TOOLCHAIN%
-echo [INFO] Compiler Version
-cl
-
-:Finish
-echo [INFO] EPICS_HOST_ARCH: %EPICS_HOST_ARCH%
-echo [INFO] Make version
-%MAKE% --version
-echo [INFO] Perl version
-perl --version
-
-%MAKE% %MAKEARGS% %*
--- a/ci/appveyor-prepare.bat
+++ b/ci/appveyor-prepare.bat
@@ -1,38 +0,0 @@
-:: 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 OS=64BIT
-if "%PLATFORM%"=="x86" set OS=32BIT
-
-echo [INFO] Platform: %OS%
-
-if "%TOOLCHAIN%"=="mingw" (
-    echo.%CONFIGURATION% | findstr /C:"static">nul && (
-        echo SHARED_LIBRARIES=NO>> configure\CONFIG_SITE
-        echo STATIC_BUILD=YES>> configure\CONFIG_SITE
-        echo [INFO] EPICS set up for static build
-    ) || (
-        echo [INFO] EPICS set up for dynamic build
-    )
-    echo.%CONFIGURATION% | findstr /C:"debug">nul && (
-        echo HOST_OPT=NO>> configure\CONFIG_SITE
-        echo [INFO] EPICS set up for debug build
-    ) || (
-        echo [INFO] EPICS set up for optimized build
-    )
-)
-
-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
--- a/ci/travis-build.sh
+++ b/ci/travis-build.sh
@@ -1,90 +0,0 @@
-#!/bin/sh
-set -e -x
-
-die() {
-  echo "$1" >&2
-  exit 1
-}
-
-ticker() {
-  while true
-  do
-    sleep 60
-    date -R
-    [ -r "$1" ] && tail -n10 "$1"
-  done
-}
-
-CACHEKEY=1
-
-EPICS_HOST_ARCH=`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"
-# requires qemu, bison, flex, texinfo, install-info
-if [ -n "$RTEMS" ]
-then
-  echo "Cross RTEMS${RTEMS} for pc386"
-  install -d /home/travis/.cache
-  curl -L "https://github.com/mdavidsaver/rsb/releases/download/travis-20160306-2/rtems${RTEMS}-i386-trusty-20190306-2.tar.gz" \
-  | tar -C /home/travis/.cache -xj
-
-  sed -i -e '/^RTEMS_VERSION/d' -e '/^RTEMS_BASE/d' configure/os/CONFIG_SITE.Common.RTEMS
-  cat << EOF >> configure/os/CONFIG_SITE.Common.RTEMS
-RTEMS_VERSION=$RTEMS
-RTEMS_BASE=/home/travis/.cache/rtems${RTEMS}-i386
-EOF
-  cat << EOF >> configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS+=RTEMS-pc386
-EOF
-
-  # find local qemu-system-i386
-  export PATH="$HOME/.cache/qemu/usr/bin:$PATH"
-  echo -n "Using QEMU: "
-  type qemu-system-i386 || echo "Missing qemu"
-  EXTRA=RTEMS_QEMU_FIXUPS=YES
-fi
-
-make -j2 $EXTRA
-
-if [ "$TEST" != "NO" ]
-then
-   make tapfiles
-   make -s test-results
-fi
--- a/ci/travis-prepare.sh
+++ b/ci/travis-prepare.sh
@@ -1,40 +0,0 @@
-#!/bin/sh
-set -e -x
-
-die() {
-  echo "$1" >&2
-  exit 1
-}
-
-CURDIR="$PWD"
-
-QDIR="$HOME/.cache/qemu"
-
-if [ -n "$RTEMS" -a "$TEST" = "YES" ]
-then
-  git clone --quiet --branch vme --depth 10 https://github.com/mdavidsaver/qemu.git "$HOME/.build/qemu"
-  cd "$HOME/.build/qemu"
-
-  HEAD=`git log -n1 --pretty=format:%H`
-  echo "HEAD revision $HEAD"
-
-  [ -e "$HOME/.cache/qemu/built" ] && BUILT=`cat "$HOME/.cache/qemu/built"`
-  echo "Cached revision $BUILT"
-
-  if [ "$HEAD" != "$BUILT" ]
-  then
-    echo "Building QEMU"
-    git submodule --quiet update --init
-
-    install -d "$HOME/.build/qemu/build"
-    cd         "$HOME/.build/qemu/build"
-
-    "$HOME/.build/qemu/configure" --prefix="$HOME/.cache/qemu/usr" --target-list=i386-softmmu --disable-werror
-    make -j2
-    make install
-
-    echo "$HEAD" > "$HOME/.cache/qemu/built"
-  fi
-fi
-
-cd "$CURDIR"
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -6,6 +6,8 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
+#
+#  $Revision-Id$

 #
 #  Common build definitions
@@ -20,15 +22,11 @@ else
 endif

 # Provide a default if the user hasn't set EPICS_HOST_ARCH
-#
 ifeq ($(origin EPICS_HOST_ARCH), undefined)
-  # Bootstrapping ...
-  EHA := $(firstword $(wildcard $(EPICS_BASE)/lib/perl/EpicsHostArch.pl \
-        $(TOP)/src/tools/EpicsHostArch.pl))
  # NB: We use a simply expanded variable here for performance:
-  export EPICS_HOST_ARCH := $(shell perl $(EHA))
-  EHA :=
+  EPICS_HOST_ARCH := $(shell $(CONFIG)/../startup/EpicsHostArch.pl)
 endif
+#

 -include $(CONFIG)/RELEASE
 -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH)
@@ -77,17 +75,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


--- a/configure/CONFIG.CrossCommon
+++ b/configure/CONFIG.CrossCommon
@@ -3,8 +3,9 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution.
+# 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. 
 #*************************************************************************
 # Cross compiler default definitions

@@ -17,15 +18,15 @@ BUILD_CLASS = CROSS
 #   ifdef CROSS    looks better than  ifeq ($(BUILD_CLASS),CROSS)
 CROSS = YES

-GNU_TARGET_INCLUDE_DIR = $(wildcard $(GNU_TARGET:%=$(GNU_DIR)/%/include))
-GNU_TARGET_LIB_DIR = $(wildcard $(GNU_TARGET:%=$(GNU_DIR)/%/lib))
+GNU_TARGET_INCLUDE_DIR = $(GNU_TARGET:%= $(GNU_DIR)/%/include)
+GNU_TARGET_LIB_DIR = $(GNU_TARGET:%= $(GNU_DIR)/%/lib)

-CROSS_INCLUDES = $(GNU_TARGET_INCLUDE_DIR:%=-I%)
-CROSS_LDFLAGS = $(GNU_TARGET_LIB_DIR:%=-L%)
+CROSS_INCLUDES = $(addprefix -I,$(GNU_TARGET_INCLUDE_DIR))
+CROSS_LDFLAGS = $(addprefix -L,$(GNU_TARGET_LIB_DIR))

-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
+# All cross builds use the gnu compiler
 include $(CONFIG)/CONFIG.gnuCommon

--- a/configure/CONFIG.gnuCommon
+++ b/configure/CONFIG.gnuCommon
@@ -7,7 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-
+#--------------------------------------------------
 # GNU compiler defaults

 GNU = YES
--- a/configure/CONFIG_ADDONS
+++ b/configure/CONFIG_ADDONS
@@ -6,6 +6,7 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
+# $Revision-Id$
 #
 #	check for add-on CFLAGS and CXXFLAGS
 #
--- a/configure/CONFIG_APP_INCLUDE
+++ b/configure/CONFIG_APP_INCLUDE
@@ -6,6 +6,9 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
+#
+#  $Revision-Id$
+#

 export TOP

--- a/configure/CONFIG_BASE
+++ b/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
+# 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)
@@ -19,12 +18,12 @@ ifdef T_A
 endif

 #---------------------------------------------------------------
-# Epics base Ioc libraries 
+# EPICS Base Ioc libraries 

 EPICS_BASE_IOC_LIBS += dbRecStd dbCore ca Com 

 #---------------------------------------------------------------
-# Epics base Host libraries 
+# EPICS Base Host libraries 

 EPICS_BASE_HOST_LIBS += cas gdd
 EPICS_BASE_HOST_LIBS += ca Com
@@ -42,13 +41,11 @@ 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))
+
+BASE_CPPFLAGS = $(OSITHREAD_DEFAULT_STACK_FLAGS_$(OSITHREAD_USE_DEFAULT_STACK))

 #---------------------------------------------------------------
 # Where to find the installed build tools
@@ -59,7 +56,7 @@ TOOLS = $(abspath $(EPICS_BASE_HOST_BIN))
 FIND_TOOL = $(firstword $(wildcard $(TOOLS)/$(1) $(TOP)/src/tools/$(1)))

 #---------------------------------------------------------------
-# Epics base build tools and tool flags
+# EPICS Base build tools and tool flags

 MAKEBPT                    = $(TOOLS)/makeBpt$(HOSTEXE)
 DBEXPAND                   = $(PERL) $(TOOLS)/dbdExpand.pl
@@ -68,13 +65,11 @@ DBTOMENUH                  = $(PERL) $(TOOLS)/dbdToMenuH.pl
 REGISTERRECORDDEVICEDRIVER = $(PERL) $(TOOLS)/registerRecordDeviceDriver.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)

-#-------------------------------------------------------
+#---------------------------------------------------------------
 # tools for installing libraries and products
-INSTALL_QUIETLY := $(if $(findstring s,$(MFLAGS)),-q,)
-INSTALL = $(PERL) $(TOOLS)/installEpics.pl $(INSTALL_QUIETLY)
+INSTALL = $(PERL) $(TOOLS)/installEpics.pl $(QUIET_FLAG)
 INSTALL_PRODUCT = $(INSTALL)
 INSTALL_LIBRARY = $(INSTALL)

@@ -84,7 +79,7 @@ MKMF                       = $(PERL) $(TOOLS)/mkmf.pl
 REPLACEVAR                 = $(PERL) $(TOOLS)/replaceVAR.pl

 #---------------------------------------------------------------
-# private versions of lex/yacc from EPICS
+# Our versions of lex (flex) and yacc (antelope)
 EYACC = $(TOOLS)/antelope$(HOSTEXE)
 ELEX = $(TOOLS)/e_flex$(HOSTEXE) -S$(EPICS_BASE)/include/flex.skel.static

@@ -92,28 +87,6 @@ YACC  = $(EYACC)
 LEX   = $(ELEX)

 #---------------------------------------------------------------
-# Our use of msi is incompatible with older versions
+# The 3.15 version of msi supports new options

 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
-
-
-
--- a/configure/CONFIG_BASE_VERSION
+++ b/configure/CONFIG_BASE_VERSION
@@ -7,6 +7,8 @@
 # in the file LICENSE that is included with this distribution. 
 #*************************************************************************
 #
+#  $Revision-Id$
+#
 #  EPICS Version information
 #
 # Only the person making an official EPICS release should make changes in
@@ -15,26 +17,37 @@
 # EPICS_SITE_VERSION is defined in CONFIG_SITE for sites that want a local
 # version number to be included in the reported version string.

-# In 3.15 we still define BASE_3_14 so "ifdef BASE_3_14" means
-# 3.14 or later, but "ifeq ($(BASE_3_14),YES)" means 3.14 only.
+# We define BASE_3_14 and BASE_3_15 as NO and BASE_3_16 as YES, so
+#   ifdef BASE_3_14
+#       true for 3.14 or later
+#   ifdef BASE_3_15
+#       true for 3.15 or later
+#   ifeq ($(BASE_3_14),YES)
+#       true for 3.14.x only
+#   ifeq ($(BASE_3_15),YES)
+#       true for 3.15 only
+#   ifeq ($(BASE_3_16),YES)
+#       true for 3.16 only.
+
 BASE_3_14 = NO
-BASE_3_15 = YES
+BASE_3_15 = NO
+BASE_3_16 = YES

 # EPICS_VERSION must be a number >0 and <256
 EPICS_VERSION = 3

-# EPICS_REVISION must be a number >=0 and <256
-EPICS_REVISION = 15
+# EPICS_REVISION must be a number >=0 and <256 
+EPICS_REVISION = 16

-# EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 7
+# EPICS_MODIFICATION must be a number >=0 and <256 
+EPICS_MODIFICATION = 0

 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included if zero
-EPICS_PATCH_LEVEL = 0
+EPICS_PATCH_LEVEL = 1

 # This will end in -DEV between official releases
-#EPICS_DEV_SNAPSHOT=-DEV
+EPICS_DEV_SNAPSHOT=-DEV
 #EPICS_DEV_SNAPSHOT=-pre1
 #EPICS_DEV_SNAPSHOT=-pre1-DEV
 #EPICS_DEV_SNAPSHOT=-pre2
@@ -43,7 +56,7 @@ EPICS_PATCH_LEVEL = 0
 #EPICS_DEV_SNAPSHOT=-rc1-DEV
 #EPICS_DEV_SNAPSHOT=-rc2
 #EPICS_DEV_SNAPSHOT=-rc2-DEV
-EPICS_DEV_SNAPSHOT=
+#EPICS_DEV_SNAPSHOT=

 # No changes should be needed below here

@@ -59,5 +72,4 @@ EPICS_SHORT_VERSION=$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)$(EP
 EPICS_VERSION_NUMBER=$(EPICS_SHORT_VERSION)$(EPICS_DEV_SNAPSHOT)$(EPICS_SITE_VSTRING)
 EPICS_VERSION_STRING="EPICS Version $(EPICS_VERSION_NUMBER)"

-# Provide this in case anyone is still using the old name
-COMMIT_DATE="-no-date-"
+COMMIT_DATE="\$$Date$$"
--- a/configure/CONFIG_COMMON
+++ b/configure/CONFIG_COMMON
@@ -7,6 +7,8 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #
+#  $Revision-Id$
+#
 #  CONFIG_COMMON
 #
 #  This file is to be maintained by the community.
@@ -38,10 +40,6 @@ BUILD_ARCHS = $(EPICS_HOST_ARCH) $(CROSS1) $(CROSS2)
 # otherwise override this in os/CONFIG_SITE.<host_arch>.Common
 PERL = perl -CSD

-#-------------------------------------------------------
-# dbst based database optimization default
-DB_OPT = NO
-
 #-------------------------------------------------------
 # Check configure/RELEASE file for consistency
 CHECK_RELEASE_YES = checkRelease
@@ -82,7 +80,8 @@ IOCS_APPL_TOP               = $(shell $(FULLPATHNAME) $(INSTALL_LOCATION))
 #-------------------------------------------------------
 # Make echo output - suppress echoing if make's '-s' flag is set
 NOP = :
-ECHO = @$(if $(findstring s,$(MFLAGS)),$(NOP),echo)
+ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
+QUIET_FLAG := $(if $(findstring s,$(MAKEFLAGS)),-q,)

 #-------------------------------------------------------
 ifdef T_A
@@ -332,12 +331,20 @@ 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

 HDEPENDS_METHOD = MKMF

-HDEPENDS_MKMFFLAGS = -m $@ $(INCLUDES) $*$(OBJ)
+HDEPENDS_MKMFFLAGS = -m $*$(DEP) $(INCLUDES) $@
 HDEPENDS_MKMF.c   = $(MKMF) $(HDEPENDS_FLAGS) $(HDEPENDS_MKMFFLAGS)
 HDEPENDS_MKMF.cpp = $(MKMF) $(HDEPENDS_FLAGS) $(HDEPENDS_MKMFFLAGS)

--- a/configure/CONFIG_ENV
+++ b/configure/CONFIG_ENV
@@ -7,6 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
+#   $Revision-Id$
 #   Author: Andrew Johnson
 #   Date:   20 April 1995
 #
--- a/configure/CONFIG_FILE_TYPE
+++ b/configure/CONFIG_FILE_TYPE
@@ -6,6 +6,7 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
+# $Revision-Id$
 #
 # Macros and rules to create a new installation file type 
 #
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -6,7 +6,8 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
-
+#
+#  $Revision-Id$
 #
 #  CONFIG_SITE  - Global site configuration file
 #
@@ -117,12 +118,6 @@ CROSS_COMPILER_TARGET_ARCHS=
 #  configure/os/CONFIG_SITE.<host>.Common files instead.
 CROSS_COMPILER_HOST_ARCHS=

-#  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 must be named in this variable:
-CROSS_COMPILER_RUNTEST_ARCHS=
-
 # Build shared libraries (DLLs on Windows).
 #  Must be either YES or NO.  Definitions in the target-specific
 #  os/CONFIG.Common.<target> and os/CONFIG_SITE.Common.<target> files may
@@ -174,5 +169,3 @@ GCC_PIPE = NO
 #  run at build-time, e.g. set the LD_LIBRARY_PATH environment variable.
 LINKER_USE_RPATH = YES

-# Overrides for the settings above may appear in a CONFIG_SITE.local file
-include $(CONFIG)/CONFIG_SITE.local
--- a/configure/CONFIG_SITE_ENV
+++ b/configure/CONFIG_SITE_ENV
@@ -6,6 +6,7 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
+#	$Revision-Id$
 #	Author:	Andrew Johnson
 #	Date:	1 May 1995
 #
@@ -13,7 +14,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,45 +25,31 @@

 #  Site-specific environment settings

-## Time service:
-# EPICS_TZ
-#       Local timezone rules for vxWorks and RTEMS. The value follows the Posix
-#       TZ environment variable's Mm.n.d/h format (see the IBM link below for
-#       details). If TZ hasn't already been set when the osdTime timeRegister()
-#       C++ static constructor runs, this parameter will be copied into the TZ
-#       environment variable. Once the OS clock has been synchronized to NTP the
-#       routine tz2timezone() will be run to convert TZ into the TIMEZONE
-#       variable format that VxWorks needs.
-#               https://developer.ibm.com/articles/au-aix-posix/
-
-# Japan Standard Time, no DST:
-#EPICS_TZ = "JST-9"
-
-# Central European (Summer) Time:
-#EPICS_TZ = "CET-1CEST,M3.5.0/2,M10.5.0/3"
-
-# Greenwich Mean/British Summer Time:
-#EPICS_TZ = "GMT0BST,M3.5.0/1,M10.5.0/2"
-
-# US Eastern Standard/Daylight Time:
-#EPICS_TZ = "EST5EDT,M3.2.0/2,M11.1.0/2"
-
-# US Central Standard/Daylight Time:
-EPICS_TZ = "CST6CDT,M3.2.0/2,M11.1.0/2"
-
-# US Mountain Standard/Daylight Time:
-#EPICS_TZ = "MST7MDT,M3.2.0/2,M11.1.0/2"
-
-# US Pacific Standard/Daylight Time:
-#EPICS_TZ = "PST8PDT,M3.2.0/2,M11.1.0/2"
-
-# US Hawaiian Standard Time, no DST:
-#EPICS_TZ = "HST10"
-
+# Time service:
+# EPICS_TIMEZONE
+#	local timezone info for vxWorks and RTEMS 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 2015: EPICS_TIMEZONE=CST/CDT::360:030802:110102
+#
+#	DST for 2015  US: Mar 08 - Nov 01
+#	              EU: Mar 29 - Oct 25
+#	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
+#	(see: http://www.timeanddate.com/time/map/)
+#
+# These values are for 2015:
+EPICS_TIMEZONE=CST/CDT::360:030802:110102
+#EPICS_TIMEZONE=CET/CEST::-60:032902:102502

 # EPICS_TS_NTP_INET
-#	NTP time server ip address for VxWorks and RTEMS.
-#	IOC will use its boot host if this is not set.
+#	NTP time server ip address.  Uses boot host if not set.
 EPICS_TS_NTP_INET=

 # IOC Shell:
@@ -70,8 +57,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 
--- a/configure/Makefile
+++ b/configure/Makefile
@@ -6,6 +6,9 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
+#
+# $Revision-Id$
+#

 TOP=..

--- a/configure/RELEASE
+++ b/configure/RELEASE
@@ -1,20 +1,19 @@
 #*************************************************************************
-# Copyright (c) 2012 UChicago Argonne LLC, as Operator of Argonne
+# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE is distributed subject to a Software License Agreement found
-# in the file LICENSE that is included with this distribution.
+# 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. 
 #*************************************************************************
+# 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)
--- a/configure/RULES
+++ b/configure/RULES
@@ -7,6 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
+# $Revision-Id$

 ifndef T_A

--- a/configure/RULES.Db
+++ b/configure/RULES.Db
@@ -8,10 +8,12 @@
 #*************************************************************************
 #RULES.Db

-# Set db substitutions file suffix
+# Set db substitutions and template file suffixes
 SUBST_SUFFIX ?= .substitutions
+TEMPL_SUFFIX ?= .template

-#####################################################  vpath
+#---------------------------------------------------------------
+# vpath

 vpath %.pm $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
 vpath %.pod $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
@@ -19,12 +21,13 @@ vpath %.dbd $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
 vpath %.db $(USR_VPATH) $(SRC_DIRS) $(dir $(DB))
 vpath %.vdb $(USR_VPATH) $(SRC_DIRS) $(dir $(DB))
 vpath %$(SUBST_SUFFIX) $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
-vpath %.template $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
+vpath %$(TEMPL_SUFFIX) $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
 vpath bpt%.data $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
 vpath %.acf $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
 vpath %.acs $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)

-##################################################### dbflags dbdflags
+#---------------------------------------------------------------
+# dbflags dbdflags

 DBD_SEARCH_DIRS = . .. $(COMMON_DIR) $(SRC_DIRS) $(INSTALL_DBD) $(RELEASE_DBD_DIRS)
 DB_SEARCH_DIRS = . .. $(COMMON_DIR) $(SRC_DIRS) $(INSTALL_DB) $(RELEASE_DB_DIRS)
@@ -33,13 +36,15 @@ DBDFLAGS = $(USR_DBDFLAGS) $(CMD_DBDFLAGS) $(addprefix -I,$(DBD_SEARCH_DIRS))
 DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) $(CMD_DBFLAGS) $(addprefix -I,$(DB_SEARCH_DIRS))
 REGRDDFLAGS = $(DBDFLAGS) $($*_REGRDDFLAGS) $(USR_REGRDDFLAGS) $(CMD_REGRDDFLAGS)

-##################################################### Targets
+#---------------------------------------------------------------
+# Targets

 # ---------------------------------------------------
 # To allow os specific dbd files AND have the -j option work properly,

-CROSS_TARGET_OS_TYPES = $(sort $(foreach target,  \
-    $(EPICS_HOST_ARCH) $(CROSS_COMPILER_TARGET_ARCHS),$(firstword $(subst -, ,$(target)))))
+CROSS_TARGET_OS_TYPES = $(sort $(foreach target, \
+    $(EPICS_HOST_ARCH) $(CROSS_COMPILER_TARGET_ARCHS), \
+    $(firstword $(subst -, ,$(target)))))
 DBD += $(foreach type, $(CROSS_TARGET_OS_TYPES), $(DBD_$(type)))

 # Users add os specific dbd files to a Makefile as follows
@@ -86,31 +91,28 @@ SOURCE_DB_bbb = $(foreach dir, $(GENERIC_SRC_DIRS), $(SOURCE_DB_aaa)  )
 SOURCE_DB_aaa = $(addsuffix /$(file), $(dir) )

 COMMONS = $(COMMON_DIR)/*.dbd $(COMMON_DIR)/*.db $(COMMON_DIR)/*.h \
-          $(COMMON_DIR)/*$(SUBST_SUFFIX) $(COMMON_DIR)/*.template
+          $(COMMON_DIR)/*$(SUBST_SUFFIX) $(COMMON_DIR)/*$(TEMPL_SUFFIX)

 # Remove trailing numbers (to 99) on stem
-TEMPLATE1=$(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%,$(patsubst %4,%, \
-          $(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%,$(patsubst %8,%,$(patsubst %9,%, \
-          $*))))))))))
-TEMPLATE2=$(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%,$(patsubst %4,%, \
-          $(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%,$(patsubst %8,%,$(patsubst %9,%, \
-          $(TEMPLATE1)))))))))))
-TEMPLATE3=$(addsuffix .template,$(addprefix ../,$(TEMPLATE2)))
-TEMPLATE_FILENAME=$(firstword $(wildcard $($*_TEMPLATE) $(addprefix ../,$($*_TEMPLATE)) ../$*.template $(TEMPLATE3) ../template))
-
-# dbst based database optimization
-ifeq '$(DB_OPT)' 'YES'
-RAW=.raw
-DBS = $(filter %.db,$(DB)) $(addsuffix $(RAW),$(filter %.db,$(DB)))
-COMMON_DBS = $(addprefix $(COMMON_DIR)/,$(DBS))
-endif
+TEMPLATE1 = $(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%, \
+            $(patsubst %4,%,$(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%, \
+            $(patsubst %8,%,$(patsubst %9,%,$*))))))))))
+TEMPLATE2 = $(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%, \
+            $(patsubst %4,%,$(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%, \
+            $(patsubst %8,%,$(patsubst %9,%,$(TEMPLATE1)))))))))))
+TEMPLATE3 = $(addsuffix $(TEMPL_SUFFIX),$(addprefix ../,$(TEMPLATE2)))
+TEMPLATE_FILENAME = $(firstword $(wildcard $($*_TEMPLATE) \
+            $(addprefix ../,$($*_TEMPLATE)) ../$*$(TEMPL_SUFFIX) $(TEMPLATE3) \
+            ../template))

 INSTALL_DB_INSTALLS = $(addprefix $(INSTALL_DB)/,$(notdir $(DB_INSTALLS)))
 INSTALL_DBD_INSTALLS = $(addprefix $(INSTALL_DBD)/,$(notdir $(DBD_INSTALLS)))

 COMMONDEP_TARGET = $(COMMON_DIR)/$(basename $@)

-#####################################################  acf files
+#---------------------------------------------------------------
+# acf files
+
 # An access security configuration file, *.acf, can be created from
 # an *.acs file (has format of acf file plus #include "filename" lines)

@@ -123,7 +125,8 @@ ACF_INCLUDES = -I. $(TARGET_INCLUDES) $(USR_INCLUDES)\
 ACFDEPENDS_CMD = $(MKMF) -m $@ $(ACF_INCLUDES) $(COMMONDEP_TARGET) $<
 ACF_CMD = $(CPP) $(ACF_CPPFLAGS) $(ACF_INCLUDES) $< > $@

-#####################################################  dependancies
+#---------------------------------------------------------------
+# dependencies

 HINC += $(addsuffix .h,$(DBDINC_NAME))
 COMMON_DBDINC += $(addprefix $(COMMON_DIR)/,$(HINC))
@@ -133,12 +136,12 @@ DBDDEPENDS_FILES += $(addsuffix $(DEP),$(HINC) \
                    $(patsubst $(COMMON_DIR)/%,%, \
                    $(filter-out $(COMMON_DIR)/bpt%.dbd,$(COMMON_DBDS))))

-##################################################### 
+#---------------------------------------------------------------

 ifndef T_A

 DEP = .d
-TEMPLATE3+=$(addsuffix .template, $(TEMPLATE2))
+TEMPLATE3 += $(addsuffix $(TEMPL_SUFFIX), $(TEMPLATE2))

 COMMON_DIR = .
 INSTALL_DBDS =
@@ -151,20 +154,15 @@ ACTIONS = inc
 ACTIONS += build
 ACTIONS += install
 ACTIONS += buildInstall
-ACTIONS += runtests tapfiles clean-tests test-results junitfiles
+ACTIONS += runtests tapfiles

-actionArchTargets = $(foreach x, $(ACTIONS),\ $(foreach arch,$(BUILD_ARCHS), $(x)$(DIVIDER)$(arch)))
+actionArchTargets = $(foreach action, $(ACTIONS), \
+    $(foreach arch, $(BUILD_ARCHS), $(action)$(DIVIDER)$(arch)))
+cleanArchTargets = $(foreach arch, $(BUILD_ARCHS), clean$(DIVIDER)$(arch))

-cleanArchTargets = $(foreach arch,$(BUILD_ARCHS), clean$(DIVIDER)$(arch))
 -include $(TOP)/configure/CONFIG_APP_INCLUDE

 all: install
-ifeq ($(EPICS_HOST_ARCH),$T_A)
-host: install
-else
-# Do nothing
-host:
-endif

 install: buildInstall

@@ -172,20 +170,30 @@ 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)

@@ -205,7 +213,8 @@ db_clean :

 realclean: clean

-##################################################### Dependency files
+#---------------------------------------------------------------
+# Dependency files

 %Record.h$(DEP): $(COMMON_DIR)/%Record.dbd
 	@$(RM) $@
@@ -256,19 +265,19 @@ menu%.h$(DEP): ../menu%.dbd
 	@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $($*_DBD) > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@

-%.db$(RAW)$(DEP): %$(SUBST_SUFFIX)
+%.db$(DEP): %$(SUBST_SUFFIX)
 	@$(RM) $@
 	$(MSI3_15) -D $(DBFLAGS) -o $(COMMONDEP_TARGET) -S$< $(TEMPLATE_FILENAME) > $@

-%.db$(RAW)$(DEP): ../%$(SUBST_SUFFIX)
+%.db$(DEP): ../%$(SUBST_SUFFIX)
 	@$(RM) $@
 	$(MSI3_15) -D $(DBFLAGS) -o $(COMMONDEP_TARGET) -S$< $(TEMPLATE_FILENAME) > $@

-%.db$(RAW)$(DEP): %.template
+%.db$(DEP): %$(TEMPL_SUFFIX)
 	@$(RM) $@
 	$(MSI3_15) -D $(DBFLAGS) -o $(COMMONDEP_TARGET) $< > $@

-%.db$(RAW)$(DEP): ../%.template
+%.db$(DEP): ../%$(TEMPL_SUFFIX)
 	@$(RM) $@
 	$(MSI3_15) -D $(DBFLAGS) -o $(COMMONDEP_TARGET) $< > $@

@@ -282,14 +291,8 @@ menu%.h$(DEP): ../menu%.dbd

 .PRECIOUS: %$(DEP)

-##################################################### CapFast filter
-
-$(COMMON_DIR)/%.edf: ../%.sch $(DEPSCHS) 
-	@$(RM) $@
-	@if [ ! -f cad.rc -a -r ../cad.rc ] ; then ln -s ../cad.rc ; fi
-	$(SCH2EDIF) $(SCH2EDIF_SYSFLAGS) $(SCH2EDIF_FLAGS) -o $@  $<
-
-##################################################### Substitution files
+#---------------------------------------------------------------
+# Substitution files

 #  WARNING: CREATESUBSTITUTIONS script needs output dir on command line

@@ -310,25 +313,21 @@ $(INSTALL_DB)/%$(SUBST_SUFFIX): ../%$(SUBST_SUFFIX)

 .PRECIOUS: $(COMMON_DIR)/%$(SUBST_SUFFIX)

-##################################################### Template files
+#---------------------------------------------------------------
+# Template files

-$(COMMON_DIR)/%.template: $(COMMON_DIR)/%.edf 
-	@$(RM) $@
-	$(E2DB) $(E2DB_SYSFLAGS) $(E2DB_FLAGS) -n $@.VAR $<
-	@$(REPLACEVAR) < $@.VAR > $@
-	@$(RM) $@.VAR
-
-$(INSTALL_DB)/%.template: %.template
+$(INSTALL_DB)/%$(TEMPL_SUFFIX): %$(TEMPL_SUFFIX)
 	$(ECHO) "Installing template file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)

-$(INSTALL_DB)/%.template: ../%.template
+$(INSTALL_DB)/%$(TEMPL_SUFFIX): ../%$(TEMPL_SUFFIX)
 	$(ECHO) "Installing template file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)

-.PRECIOUS: $(COMMON_DIR)/%.template
+.PRECIOUS: $(COMMON_DIR)/%$(TEMPL_SUFFIX)

-##################################################### INC files
+#---------------------------------------------------------------
+# INC files

 $(COMMON_DIR)/%Record.h: $(COMMON_DIR)/%Record.dbd
 	@$(RM) $(notdir $@)
@@ -362,7 +361,8 @@ $(COMMON_DIR)/menu%.h: ../menu%.dbd

 .PRECIOUS: $(COMMON_DIR)/%.h

-##################################################### DBD files
+#---------------------------------------------------------------
+# DBD files

 $(COMMON_DIR)/bpt%.dbd: bpt%.data
 	@$(RM) $(notdir $@)
@@ -425,7 +425,8 @@ $(foreach file, $(DBD_INSTALLS), $(eval $(call DBD_INSTALLS_template, $(file))))

 .PRECIOUS: $(COMMON_DBDS) $(COMMON_DIR)/%.dbd

-##################################################### HTML files
+#---------------------------------------------------------------
+# HTML files

 $(COMMON_DIR)/%.html: %.dbd.pod $(TOOLS)/dbdToHtml.pl
 	@$(RM) $(notdir $@)
@@ -444,37 +445,44 @@ $(COMMON_DIR)/%.html: %.pm $(TOOLS)/podToHtml.pl

 $(COMMON_DIR)/%.html: ../%.pm $(TOOLS)/podToHtml.pl
 	@$(RM) $(notdir $@)
-	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
+	$(PERL) $(TOOLS)/podToHtml.pl -s -o $(notdir $@) $<
+	@$(MKDIR) $(dir $@)
+	@$(MV) $(notdir $@) $@
+
+$(COMMON_DIR)/%.html: ../%.pl $(TOOLS)/podToHtml.pl
+	@$(RM) $(notdir $@)
+	$(PERL) $(TOOLS)/podToHtml.pl -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 +500,6 @@ $(COMMON_DIR)/%.acf: ../%.acs

 .PRECIOUS: $(COMMON_DIR)/%.acf

-# dbst based database optimization
-ifeq '$(DB_OPT)' 'YES'
-
-$(COMMON_DIR)/%.db$(RAW): ../%.db
-	@$(RM) $@
-	$(CP) $< $@
-
-$(COMMON_DIR)/%.db: $(COMMON_DIR)/%.db$(RAW)
-	$(ECHO) "Optimizing database $@"
-	@$(RM) $@
-	$(DBST) . $< -d > $@
-
-.PRECIOUS: $(COMMON_DIR)/%.db
-.PRECIOUS: $(DB:%=$(COMMON_DIR)/%$(RAW))
-else
-
 $(INSTALL_DB)/%: %
 	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
@@ -515,7 +507,6 @@ $(INSTALL_DB)/%: %
 $(INSTALL_DB)/%: ../%
 	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
-endif

 $(INSTALL_DB)/%.db: $(COMMON_DIR)/%.db
 	$(ECHO) "Installing created db file $@"
@@ -531,8 +522,8 @@ $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))
 .PRECIOUS: $(COMMON_DIR)/%.edf
 .PRECIOUS: $(COMMON_DBS)

-##################################################### register record,device,driver support
-
+#---------------------------------------------------------------
+# register record,device,driver support

 %_registerRecordDeviceDriver.cpp: $(COMMON_DIR)/%.dbd
 	@$(RM) $@
@@ -548,4 +539,3 @@ $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))

 .PRECIOUS: %_registerRecordDeviceDriver.cpp

-##################################################### END OF FILE
--- a/configure/RULES.ioc
+++ b/configure/RULES.ioc
@@ -14,7 +14,7 @@ build$(DIVIDER)$(ARCH) build: buildInstall
 install$(DIVIDER)$(ARCH) install: buildInstall
 $(ARCH): buildInstall

-ifeq ($(filter $(ARCH),$(BUILD_ARCHS)),$(strip $(ARCH)))
+ifeq ($(filter $(ARCH),$(BUILD_ARCHS)),$(ARCH))
    buildInstall$(DIVIDER)$(ARCH) buildInstall: $(TARGETS)

    clean$(DIVIDER)$(ARCH) clean:
@@ -24,14 +24,11 @@ else
    clean$(DIVIDER)$(ARCH) clean:
 endif

-cdCommands dllPath.bat relPaths.sh: \
+cdCommands envPaths dllPath.bat relPaths.sh: \
    $(wildcard $(TOP)/configure/RELEASE*) \
-    $(wildcard $(TOP)/configure/CONFIG_SITE*) | $(INSTALL_BIN)
+    $(wildcard $(TOP)/configure/CONFIG_SITE*) $(INSTALL_BIN)
 	$(CONVERTRELEASE) -a $(ARCH) -t $(IOCS_APPL_TOP) $@

-envPaths: $(wildcard $(TOP)/configure/RELEASE*) \
-    $(wildcard $(TOP)/configure/CONFIG_SITE*) | $(INSTALL_BIN)
-	$(CONVERTRELEASE) -t $(IOCS_APPL_TOP) $@
-
 realclean:
 	$(RM) cdCommands envPaths dllPath.bat relPaths.sh
+
--- a/configure/RULES_ARCHS
+++ b/configure/RULES_ARCHS
@@ -6,6 +6,9 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution. 
 #*************************************************************************
+#
+# $Revision-Id$
+#

 all: install
 host: install$(DIVIDER)$(EPICS_HOST_ARCH)
@@ -14,7 +17,7 @@ ACTIONS = inc
 ACTIONS += build
 ACTIONS += install
 ACTIONS += buildInstall
-ACTIONS += runtests tapfiles clean-tests test-results junitfiles
+ACTIONS += runtests tapfiles

 actionArchTargets = $(foreach action, $(ACTIONS), \
    $(addprefix $(action)$(DIVIDER), $(BUILD_ARCHS)))
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -4,8 +4,9 @@
 # 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. 
 #*************************************************************************
+# $Revision-Id$
 #
 #	Rules for making things specified in Makefile
 #
@@ -25,6 +26,7 @@ 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)

 #---------------------------------------------------------------

@@ -102,24 +104,18 @@ endif
 #   Products and Object libraries
 #
 PRODTARGETS += $(PRODNAME) $(MUNCHNAME) $(CTDT_SRCS) $(CTDT_OBJS) $(NMS)
-TESTPRODTARGETS += $(TESTPRODNAME) $(TESTMUNCHNAME)

 #---------------------------------------------------------------
-#   Test specifications and test result files
+#   Generate a test specification if any tests are defined.
 #
 ifneq (,$(strip $(TESTS)))
 TARGETS += testspec
 endif

-# Enable testing if this host can run tests on the current target
-ifneq (,$(findstring $(T_A),$(EPICS_HOST_ARCH) $(CROSS_COMPILER_RUNTEST_ARCHS)))
-RUNTESTS_ENABLED = YES
 TAPFILES += $(TESTSCRIPTS:.t=.tap)
-JUNITFILES += $(TAPFILES:.tap=.xml)
-endif

 #---------------------------------------------------------------
-#   Libraries
+#   Libraries 
 #

 LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS) $(TESTLIBNAME) \
@@ -130,18 +126,18 @@ 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) $(TESTPRODTARGETS) \
+build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODNAME) \
 	$(TARGETS) $(TESTSCRIPTS) $(INSTALL_LIB_INSTALLS)

 inc : $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS)
@@ -159,29 +155,22 @@ clean: build_clean

 build_clean:
 	$(ECHO) "Cleaning"
-	@$(RM) *.i *$(OBJ) *.a \
+	@$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) \
 	$(LIBNAME) $(TESTLIBNAME) $(SHRLIBNAME) $(TESTSHRLIBNAME) \
 	$(DLLSTUB_LIBNAME) $(TESTDLLSTUB_LIBNAME) \
 	$(LOADABLE_SHRLIBNAME) \
 	$(INC) $(TARGETS) $(TDS) $(CLEANS) \
 	*.out MakefileInclude *.manifest *.exp \
-	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) $(TESTPRODTARGETS) \
-	$(TESTSCRIPTS) $(TAPFILES) $(JUNITFILES)
+	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) \
+	$(TESTSCRIPTS) $(TAPFILES)
 ifdef RES
 	@$(RM) *$(RES)
 endif

-# Sort mkdir targets to remove duplicates & make parents first
-$(DIRECTORY_TARGETS):
-	$(MKDIR) $(sort $@)
+$(DIRECTORY_TARGETS) :
+	$(MKDIR) $@

-# Install LIB_INSTALLS libraries before linking executables
-$(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIB_INSTALLS)
-
-# Install built libraries too, unless Makefile says to wait
-ifneq ($(DELAY_INSTALL_LIBS),YES)
-$(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIBS) $(INSTALL_DLLSTUB_LIBS)
-endif
+$(PRODNAME): $(INSTALL_LIB_INSTALLS)

 # RELEASE file consistency checking
 checkRelease:
@@ -190,7 +179,7 @@ warnRelease:
 	-$(CONVERTRELEASE) checkRelease
 noCheckRelease:
 ifeq ($(EPICS_HOST_ARCH),$(T_A))
-	$(info Warning: RELEASE file consistency checks have been disabled)
+	@echo "Warning: RELEASE file consistency checks have been disabled"
 endif

 #---------------------------------------------------------------
@@ -256,13 +245,15 @@ YACCOPT ?= $($*_YACCOPT)
 	$(MV) $*.tab.c $*.c
 	$(if $(findstring -d, $(YACCOPT)),$(MV) $*.tab.h $*.h,)

-# must be a separate rule since when not using '-d' the
+# must be a seperate rule since when not using '-d' the
 # prefix for .h will be different then .c
 %.h : %.c %.y

 %.c: %.l
+	@$(RM) $*.yy.c
+	$(LEX) $(LEXOPT) -t $< > $*.yy.c
 	@$(RM) $@
-	$(LEX) $(LEXOPT) -o$@ $<
+	$(MV) $*.yy.c $@

 #---------------------------------------------------------------
 # Libraries, shared/DLL and stubs
@@ -279,17 +270,13 @@ endif # RANLIB
 $(SHRLIBNAME) $(DLLSTUB_LIBNAME) $(TESTSHRLIBNAME) $(TESTDLLSTUB_LIBNAME): \
    $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)

-# 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);
+$(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)
@@ -321,10 +308,6 @@ $(MUNCHNAME): %$(MUNCH_SUFFIX): $(MUNCH_DEPENDS) %$(EXE)
 	@$(RM) $@
 	$(MUNCH_CMD)

-$(TESTMUNCHNAME): %$(MUNCH_SUFFIX): $(MUNCH_DEPENDS) %$(EXE)
-	@$(RM) $@
-	$(MUNCH_CMD)
-
 #---------------------------------------------------------------
 # GeSys modules for RTEMS
 $(MODNAME): %$(MODEXT): %$(EXE)
@@ -336,9 +319,7 @@ $(MODNAME): %$(MODEXT): %$(EXE)
 # Automated testing

 runtests: $(TESTSCRIPTS)
-ifdef RUNTESTS_ENABLED
 	-$(PERL) -MTest::Harness -e 'runtests @ARGV if @ARGV;' $^
-endif

 testspec: $(TESTSCRIPTS)
 	@$(RM) $@
@@ -348,35 +329,11 @@ 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 > $@
-endif
-
-%.xml: %.tap
-	$(TAPTOJUNIT) --puretap --output $@ --input $< $*

 # If there's a perl test script (.plt) available, use it
 %.t: ../%.plt
@@ -389,6 +346,14 @@ endif
 	@$(RM) $@
 	$(PERL) $(TOOLS)/makeTestfile.pl $@ $<

+#---------------------------------------------------------------
+# Generate header with version number from VCS
+
+ifneq ($(GENVERSION),)
+$(COMMON_DIR)/$(GENVERSION): FORCE
+	$(GENVERSIONHEADER) -t $(TOP) -N $(GENVERSIONMACRO) -V "$(GENVERSIONDEFAULT)" $@
+endif
+
 #---------------------------------------------------------------
 # Install rules for BIN_INSTALLS and LIB_INSTALLS

@@ -522,8 +487,7 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
 .PRECIOUS: $(COMMON_INC)

 .PHONY: all host inc build install clean rebuild buildInstall build_clean
-.PHONY: runtests tapfiles clean-tests test-results junitfiles
-.PHONY: checkRelease warnRelease noCheckRelease
+.PHONY: runtests tapfiles checkRelease warnRelease noCheckRelease FORCE

 endif # BASE_RULES_BUILD
 #	EOF RULES_BUILD
--- a/configure/RULES_DIRS
+++ b/configure/RULES_DIRS
@@ -6,10 +6,14 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution. 
 #*************************************************************************
+#
+#  $Revision-Id$
+#
+

 ARCHS += $(BUILD_ARCHS)
 ACTIONS += inc build install buildInstall clean realclean archclean
-ACTIONS += runtests tapfiles clean-tests test-results junitfiles
+ACTIONS += runtests tapfiles

 dirActionArchTargets = $(foreach dir, $(DIRS), \
    $(foreach action, $(ACTIONS), \
--- a/configure/RULES_EXPAND
+++ b/configure/RULES_EXPAND
@@ -14,6 +14,8 @@ EXPANDFLAGS += $(addprefix -D ,$(EXPAND_VARS))
 # The names of files to be expanded must end with '@'
 EXPANDED = $(EXPAND:%@=%)

+buildInstall: $(EXPANDED)
+
 $(EXPANDED): %: %@
 	$(ECHO) "Expanding $< to $@"
 	@$(RM) $@
@@ -24,8 +26,7 @@ clean: expand_clean
 expand_clean:
 	@$(RM) $(EXPANDED)

-.PRECIOUS: $(EXPANDED)
-.PHONY: expand_clean
+.PHONY : expand_clean

 #---------------------------------------------------------------
 # Assemblies (files assembled from snippets)
--- a/configure/RULES_FILE_TYPE
+++ b/configure/RULES_FILE_TYPE
@@ -6,6 +6,9 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
+#
+# $Revision-Id$
+#

 # Include <top>/configure/RULES_BUILD from tops defined in RELEASE* files
 #
--- a/configure/RULES_OCTAVE
+++ b/configure/RULES_OCTAVE
@@ -7,7 +7,9 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-
+# $Revision-Id$
+#
+#-------------------------------------------------------
 # Octave definitions and rules

 ifeq ($(findstring Host,$(VALID_BUILDS)),Host)
--- a/configure/RULES_TARGET
+++ b/configure/RULES_TARGET
@@ -8,6 +8,8 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 #
+#  $Revision-Id$
+#
 #  RULES_TARGET
 #
 #  This file is to be maintained by the community.
@@ -38,17 +40,6 @@ $(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))), \
@@ -134,6 +125,16 @@ $(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),)

--- a/configure/RULES_TOP
+++ b/configure/RULES_TOP
@@ -6,6 +6,9 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
+#
+# $Revision-Id$
+#

 include $(CONFIG)/RULES_DIRS

@@ -57,7 +60,6 @@ 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 "     runtests       - Run self-tests, summarize results"
 	@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."
--- a/configure/os/CONFIG.Common.RTEMS
+++ b/configure/os/CONFIG.Common.RTEMS
@@ -1,6 +1,7 @@
 #
 # This file contains definitions for RTEMS builds
 #
+# $Revision-Id$
 # Author: W. Eric Norum
 #         University of Saskatchewan
 #         eric.norum@usask.ca
@@ -72,7 +73,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,$(MFLAGS)),$(NOP),echo)
+ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)

 #--------------------------------------------------
 # Although RTEMS uses gcc, it wants to use gcc its own way
@@ -136,13 +137,6 @@ MOD_LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(POSIX_LDFLAGS) \
 LINK.mod = $(CCC) -o $@ $(PRODDIR_LDFLAGS) $(MOD_LDFLAGS)
 LINK.mod += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(MOD_LDLIBS)

-#--------------------------------------------------
-# Here munching means creating a bootable object binary
-ifdef MUNCH_SUFFIX
-  MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
-  TESTMUNCHNAME = $(TESTPRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
-endif
-
 #--------------------------------------------------
 # RTEMS has neither shared libraries nor dynamic loading
 STATIC_BUILD=YES
--- a/configure/os/CONFIG.Common.RTEMS-beatnik
+++ b/configure/os/CONFIG.Common.RTEMS-beatnik
@@ -1,5 +1,6 @@
 #
 # CONFIG.Common.RTEMS-beatnik
+# $Revision-Id$
 # Author: Dayle Kotturi <dayle@slac.stanford.edu>
 #
 # All RTEMS targets use the same Makefile fragment
@@ -15,6 +16,7 @@ ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_CLUSTER_SPACE=5120
 OP_SYS_LDLIBS += -lbspExt

 MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef
--- a/configure/os/CONFIG.Common.RTEMS-gen68360
+++ b/configure/os/CONFIG.Common.RTEMS-gen68360
@@ -1,4 +1,5 @@
 #
+# $Revision-Id$
 # Author: W. Eric Norum
 #         Canadian Light Source
 #         eric@cls.usask.ca
--- a/configure/os/CONFIG.Common.RTEMS-mcp750
+++ b/configure/os/CONFIG.Common.RTEMS-mcp750
@@ -1,4 +1,5 @@
 #
+# $Revision-Id$
 # Author: W. Eric Norum
 #         Canadian Light Source
 #         eric@cls.usask.ca
--- a/configure/os/CONFIG.Common.RTEMS-mvme167
+++ b/configure/os/CONFIG.Common.RTEMS-mvme167
@@ -1,4 +1,5 @@
 #
+# $Revision-Id$
 # Author: W. Eric Norum
 #         Canadian Light Source
 #         eric@cls.usask.ca
--- a/configure/os/CONFIG.Common.RTEMS-mvme2100
+++ b/configure/os/CONFIG.Common.RTEMS-mvme2100
@@ -1,5 +1,6 @@
 #
 # CONFIG.Common.RTEMS-mvme2100
+# $Revision-Id$
 # Author: W. Eric Norum <wenorum@lbl.gov>
 #
 # All RTEMS targets use the same Makefile fragment
@@ -13,6 +14,7 @@ ARCH_DEP_CFLAGS += -DHAVE_PPCBUG
 OP_SYS_LDLIBS += -lbspExt

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

 MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems
 	gzip -f9 rtems
--- a/configure/os/CONFIG.Common.RTEMS-mvme3100
+++ b/configure/os/CONFIG.Common.RTEMS-mvme3100
@@ -1,5 +1,6 @@
 #
 # CONFIG.Common.RTEMS-mvme3100
+# $Revision-Id$
 # Author: W. Eric Norum <wenorum@lbl.gov>
 #
 # All RTEMS targets use the same Makefile fragment
@@ -15,6 +16,7 @@ ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_CLUSTER_SPACE=5120
 OP_SYS_LDLIBS += -lbspExt

 MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef
--- a/configure/os/CONFIG.Common.RTEMS-mvme5500
+++ b/configure/os/CONFIG.Common.RTEMS-mvme5500
@@ -1,5 +1,6 @@
 #
 # CONFIG.Common.RTEMS-mvme5500
+# $Revision-Id$
 # Author: W. Eric Norum <wenorum@lbl.gov>
 #
 # All RTEMS targets use the same Makefile fragment
@@ -16,6 +17,7 @@ ARCH_DEP_CFLAGS += -DBSP_NVRAM_BASE_ADDR=0xf1110000
 OP_SYS_LDLIBS += -lbspExt

 MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef
--- a/configure/os/CONFIG.Common.RTEMS-pc386
+++ b/configure/os/CONFIG.Common.RTEMS-pc386
@@ -1,4 +1,5 @@
 #
+# $Revision-Id$
 # Author: W. Eric Norum
 #         Canadian Light Source
 #         eric@cls.usask.ca
@@ -8,6 +9,7 @@
 RTEMS_TARGET_CPU=i386

 MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< temp.bin
 	$(BIN2BOOT) $@ 0x00097E00 \
--- a/configure/os/CONFIG.Common.RTEMS-psim
+++ b/configure/os/CONFIG.Common.RTEMS-psim
@@ -1,4 +1,5 @@
 #
+# $Revision-Id$
 # Author: W. Eric Norum
 #         University of Saskatchewan
 #         eric.norum@usask.ca
--- a/configure/os/CONFIG.Common.RTEMS-uC5282
+++ b/configure/os/CONFIG.Common.RTEMS-uC5282
@@ -1,4 +1,5 @@
 #
+# $Revision-Id$
 # Author: W. Eric Norum
 #         Canadian Light Source
 #         eric@cls.usask.ca
@@ -9,6 +10,7 @@ RTEMS_TARGET_CPU = m68k
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL

 MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< $@
 endef
--- a/configure/os/CONFIG.Common.UnixCommon
+++ b/configure/os/CONFIG.Common.UnixCommon
@@ -1,5 +1,7 @@
 # CONFIG.Common.UnixCommon
 #
+# $Revision-Id$
+#
 #  Contains definitions common to all Unix target archs
 #
 #  This file is maintained by the build community.
@@ -55,7 +57,7 @@ SHRLIB_LDLIBS = $(addprefix -l, $($*_LDLIBS) $(LIB_LIBS) $(USR_LIBS)) \
    $(LDLIBS)

 SHRLIB_DEPLIB_DIRS = $(foreach word, \
-    $(sort $(INSTALL_LIB)/ $(dir $($*_DEPLIBS) $(SHRLIB_DEPLIBS))), \
+    $(sort $(dir $($*_DEPLIBS) $(SHRLIB_DEPLIBS))), \
    $(shell $(FULLPATHNAME) $(word)))

 SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-L%)
@@ -84,7 +86,7 @@ PROD_LDLIBS += $($(firstword $(LDLIBS_STATIC_$(STATIC_BUILD)) \
               $(LDLIBS_SHARED_$(SHARED_LIBRARIES))))

 PROD_DEPLIB_DIRS = $(foreach word, \
-    $(sort $(INSTALL_LIB)/ $(dir $($*_DEPLIBS) $(PROD_DEPLIBS))), \
+    $(sort $(dir $($*_DEPLIBS) $(PROD_DEPLIBS))), \
    $(shell $(FULLPATHNAME) $(word)))

 PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-L%)
--- a/configure/os/CONFIG.Common.cygwin-x86
+++ b/configure/os/CONFIG.Common.cygwin-x86
@@ -1,5 +1,6 @@
 # CONFIG.Common.cygwin-x86
 #
+# $Revision-Id$
 # This file is maintained by the build community.
 #
 # Definitions for cygwin-x86 target builds
--- a/configure/os/CONFIG.Common.cygwin-x86_64
+++ b/configure/os/CONFIG.Common.cygwin-x86_64
@@ -1,13 +1,14 @@
-# CONFIG.Common.cygwin-x86_64
-#
-# This file is maintained by the build community.
-#
-# Definitions for cygwin-x86_64 target builds
-# Sites may override these definitions in CONFIG_SITE.Common.cygwin-x86_64
-#-------------------------------------------------------
-
-include $(CONFIG)/os/CONFIG.Common.cygwin-x86
-
-ARCH_DEP_CFLAGS = -m64
-ARCH_DEP_LDFLAGS = -m64
-
+# CONFIG.Common.cygwin-x86_64
+#
+# $Revision-Id$
+# This file is maintained by the build community.
+#
+# Definitions for cygwin-x86_64 target builds
+# Sites may override these definitions in CONFIG_SITE.Common.cygwin-x86_64
+#-------------------------------------------------------
+
+include $(CONFIG)/os/CONFIG.Common.cygwin-x86
+
+ARCH_DEP_CFLAGS = -m64
+ARCH_DEP_LDFLAGS = -m64
+
--- a/configure/os/CONFIG.Common.darwin-ppc
+++ b/configure/os/CONFIG.Common.darwin-ppc
@@ -1,5 +1,6 @@
 # CONFIG.Common.darwin-ppc
 #
+# $Revision-Id$
 # This file is maintained by the build community.
 #
 # Definitions for darwin-ppc target builds
--- a/configure/os/CONFIG.Common.darwin-ppcx86
+++ b/configure/os/CONFIG.Common.darwin-ppcx86
@@ -1,5 +1,6 @@
 # CONFIG.Common.darwin-ppcx86
 #
+# $Revision-Id$
 # This file is maintained by the build community.
 #
 # Definitions for Darwin universal PowerPC + x86 target builds
--- a/configure/os/CONFIG.Common.darwin-x86
+++ b/configure/os/CONFIG.Common.darwin-x86
@@ -1,5 +1,6 @@
 # CONFIG.Common.darwin-x86
 #
+# $Revision-Id$
 # This file is maintained by the build community.
 #
 # Definitions for darwin-x86 target builds
--- a/configure/os/CONFIG.Common.freebsd-x86
+++ b/configure/os/CONFIG.Common.freebsd-x86
@@ -1,3 +1,4 @@
+# $Revision-Id$
 #
 # This file is maintained by the build community.
 #
--- a/configure/os/CONFIG.Common.freebsd-x86_64
+++ b/configure/os/CONFIG.Common.freebsd-x86_64
@@ -1,3 +1,4 @@
+# $Revision-Id$
 #
 # This file is maintained by the build community.
 #
--- a/configure/os/CONFIG.Common.freebsdCommon
+++ b/configure/os/CONFIG.Common.freebsdCommon
@@ -1,3 +1,4 @@
+# $Revision-Id$
 #
 # This file is maintained by the build community.
 #
--- a/configure/os/CONFIG.Common.ios-arm
+++ b/configure/os/CONFIG.Common.ios-arm
@@ -1,5 +1,6 @@
 # CONFIG.Common.ios-arm
 #
+# $Revision-Id$
 # This file is maintained by the build community.
 #
 # Definitions for ios-arm target builds
--- a/configure/os/CONFIG.Common.ios-x86
+++ b/configure/os/CONFIG.Common.ios-x86
@@ -1,5 +1,6 @@
 # CONFIG.Common.ios-x86
 #
+# $Revision-Id$
 # This file is maintained by the build community.
 #
 # Definitions for ios-x86 target builds
--- a/configure/os/CONFIG.Common.iosCommon
+++ b/configure/os/CONFIG.Common.iosCommon
@@ -1,5 +1,6 @@
 # CONFIG.Common.iosCommon
 #
+# $Revision-Id$
 # This file is maintained by the build community.
 #
 # Definitions for all Apple iOS builds
--- a/configure/os/CONFIG.Common.linux-386
+++ b/configure/os/CONFIG.Common.linux-386
@@ -1,5 +1,6 @@
 # CONFIG.Common.linux-386
 #
+# $Revision-Id$
 # This file is maintained by the build community.
 #
 # Definitions for linux-386 target builds
--- a/configure/os/CONFIG.Common.linux-486
+++ b/configure/os/CONFIG.Common.linux-486
@@ -1,5 +1,8 @@
 # CONFIG.Common.linux-486
 #
+# $Id
+# This file is maintained by the build community.
+#
 # Definitions for linux-486 target builds
 # Sites may override these definitions in CONFIG_SITE.Common.linux-486
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.linux-586
+++ b/configure/os/CONFIG.Common.linux-586
@@ -1,5 +1,8 @@
 # CONFIG.Common.linux-586
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for linux-586 target builds
 # Sites may override these definitions in CONFIG_SITE.Common.linux-586
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.linux-686
+++ b/configure/os/CONFIG.Common.linux-686
@@ -1,5 +1,8 @@
 # CONFIG.Common.linux-686
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for linux-686 target builds
 # Sites may override these definitions in CONFIG_SITE.Common.linux-686
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.linux-arm-debug
+++ b/configure/os/CONFIG.Common.linux-arm-debug
@@ -1,5 +1,8 @@
 # CONFIG.Common.linux-arm-debug
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for linux-arm with debug compiler flags
 # Override these settings in CONFIG_SITE.Common.linux-arm-debug
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.linux-arm_eb
+++ b/configure/os/CONFIG.Common.linux-arm_eb
@@ -1,5 +1,7 @@
 # CONFIG.Common.linux-arm_eb
 #
+# This file is maintained by the build community.
+#
 # Definitions for linux-arm_eb (big endian) target builds
 # Sites may override these definitions in CONFIG_SITE.Common.linux-arm_eb
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.linux-arm_el
+++ b/configure/os/CONFIG.Common.linux-arm_el
@@ -1,5 +1,7 @@
 # CONFIG.Common.linux-arm_el
 #
+# This file is maintained by the build community.
+#
 # Definitions for linux-arm_el (little endian) target builds
 # Sites may override these definitions in CONFIG_SITE.Common.linux-arm_el
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.linux-athlon
+++ b/configure/os/CONFIG.Common.linux-athlon
@@ -1,5 +1,8 @@
 # CONFIG.Common.linux-athlon
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for linux-athlon target builds
 # Sites may override these definitions in CONFIG_SITE.Common.linux-athlon
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.linux-ppc
+++ b/configure/os/CONFIG.Common.linux-ppc
@@ -1,5 +1,7 @@
 # CONFIG.Common.linux-ppc
 #
+# This file is maintained by the build community.
+#
 # Definitions for linux-ppc target builds
 # Sites may override these definitions in CONFIG_SITE.Common.linux-ppc
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.linux-ppc64
+++ b/configure/os/CONFIG.Common.linux-ppc64
@@ -1,5 +1,8 @@
 # CONFIG.Common.linux-ppc64
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for linux-ppc64 target builds
 # Sites may override these definitions in CONFIG_SITE.Common.linux-ppc64
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.linux-x86
+++ b/configure/os/CONFIG.Common.linux-x86
@@ -1,5 +1,8 @@
 # CONFIG.Common.linux-x86
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for linux-x86 target builds
 # Sites may override these definitions in CONFIG_SITE.Common.linux-x86
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.linux-x86-debug
+++ b/configure/os/CONFIG.Common.linux-x86-debug
@@ -1,5 +1,8 @@
 # CONFIG.Common.linux-x86-debug
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for linux-x86 with debug compiler flags
 # Sites may override these definitions in CONFIG_SITE.Common.linux-x86-debug
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.linux-x86_64
+++ b/configure/os/CONFIG.Common.linux-x86_64
@@ -1,5 +1,8 @@
 # CONFIG.Common.linux-x86_64
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for linux-x86_64 target builds
 # Sites may override these definitions in CONFIG_SITE.Common.linux-x86_64
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.linux-x86_64-debug
+++ b/configure/os/CONFIG.Common.linux-x86_64-debug
@@ -1,5 +1,8 @@
 # CONFIG.Common.linux-x86_64-debug
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for linux-x86_64 with debug compiler flags
 # Sites may override these definitions in CONFIG_SITE.Common.linux-x86_64-debug
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.linux-xscale_be
+++ b/configure/os/CONFIG.Common.linux-xscale_be
@@ -1,5 +1,7 @@
 # CONFIG.Common.linux-xscale_be
 #
+# This file is maintained by the build community.
+#
 # Definitions for linux-xscale_be (big-endian) target builds.
 # This target has been tested with the MOXA UC-7408-LX Plus.

@@ -15,14 +17,5 @@ ARCH_CLASS = xscale
 ifeq ($(BUILD_CLASS),CROSS)
    VALID_BUILDS = Ioc
    GNU_TARGET = xscale_be
-    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)
+    CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
 endif
--- a/configure/os/CONFIG.Common.linuxCommon
+++ b/configure/os/CONFIG.Common.linuxCommon
@@ -1,5 +1,8 @@
 # CONFIG.Common.linuxCommon
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for linux target builds
 # Sites may override these definitions in CONFIG_SITE.Common.linuxCommon
 #-------------------------------------------------------
@@ -23,15 +26,13 @@ STATIC_LDFLAGS_YES= -Wl,-Bstatic
 STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic

-# Set runtime path for shared libraries if USE_RPATH=YES and STATIC_BUILD=NO
-SHRLIBDIR_RPATH_LDFLAGS_YES_NO = $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
-SHRLIBDIR_LDFLAGS += \
-    $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
+# 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 products if USE_RPATH=YES and STATIC_BUILD=NO
-PRODDIR_RPATH_LDFLAGS_YES_NO = $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
-PRODDIR_LDFLAGS += \
-    $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
+# Set runtime path for products
+PRODDIR_RPATH_LDFLAGS_YES += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
+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
--- a/configure/os/CONFIG.Common.solaris-sparc
+++ b/configure/os/CONFIG.Common.solaris-sparc
@@ -1,5 +1,8 @@
 # CONFIG.Common.solaris-sparc
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for solaris-sparc target archs
 # Sites may override these definitions in CONFIG_SITE.Common.solaris-sparc
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.solaris-sparc-debug
+++ b/configure/os/CONFIG.Common.solaris-sparc-debug
@@ -1,5 +1,8 @@
 # CONFIG.Common.solaris-sparc-debug
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for solaris-sparc with debug compiler flags
 # Sites may override these definitions in CONFIG_SITE.Common.solaris-sparc-debug
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.solaris-sparc-gnu
+++ b/configure/os/CONFIG.Common.solaris-sparc-gnu
@@ -1,5 +1,8 @@
 # CONFIG.Common.solaris-sparc-gnu
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for solaris-sparc gnu compiler target archs
 # Sites may override these definitions in CONFIG_SITE.Common.solaris-sparc-gnu
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.solaris-sparc64
+++ b/configure/os/CONFIG.Common.solaris-sparc64
@@ -1,5 +1,8 @@
 # CONFIG.Common.solaris-sparc64
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for solaris-sparc64 compiler target archs
 # Sites may override these definitions in CONFIG_SITE.Common.solaris-sparc64
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.solaris-sparc64-gnu
+++ b/configure/os/CONFIG.Common.solaris-sparc64-gnu
@@ -1,5 +1,8 @@
 # CONFIG.Common.solaris-sparc64-gnu
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for solaris-sparc64 gnu compiler target archs
 # Sites may override these definitions in CONFIG_SITE.Common.solaris-sparc64-gnu
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.solaris-x86
+++ b/configure/os/CONFIG.Common.solaris-x86
@@ -1,5 +1,8 @@
 # CONFIG.Common.solaris-x86
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for solaris-x86 target archs
 # Sites may override these definitions in CONFIG_SITE.Common.solaris-x86
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.solaris-x86-gnu
+++ b/configure/os/CONFIG.Common.solaris-x86-gnu
@@ -1,5 +1,8 @@
 # CONFIG.Common.solaris-x86-gnu
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for solaris-x86 gnu compiler target archs
 # Sites may override these definitions in CONFIG_SITE.Common.solaris-x86-gnu
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.solaris-x86_64
+++ b/configure/os/CONFIG.Common.solaris-x86_64
@@ -1,5 +1,8 @@
 # CONFIG.Common.solaris-x86_64
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for solaris-x86_64 compiler target archs
 # Sites may override these definitions in CONFIG_SITE.Common.solaris-x86_64
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.solaris-x86_64-gnu
+++ b/configure/os/CONFIG.Common.solaris-x86_64-gnu
@@ -1,5 +1,8 @@
 # CONFIG.Common.solaris-x86_64-gnu
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for solaris-x86_64 gnu compiler target archs
 # Sites may override these definitions in CONFIG_SITE.Common.solaris-x86_64-gnu
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.vxWorks-486
+++ b/configure/os/CONFIG.Common.vxWorks-486
@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-486
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-486 target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-486
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.vxWorks-486-debug
+++ b/configure/os/CONFIG.Common.vxWorks-486-debug
@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-486-debug
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-486-debug target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-486-debug
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.vxWorks-68040
+++ b/configure/os/CONFIG.Common.vxWorks-68040
@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-68040
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-68040 target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-68040
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.vxWorks-68040-debug
+++ b/configure/os/CONFIG.Common.vxWorks-68040-debug
@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-68040-debug
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-68040-debug target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-68040-debug
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.vxWorks-68040lc
+++ b/configure/os/CONFIG.Common.vxWorks-68040lc
@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-68040lc
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-68040lc target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-68040lc
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.vxWorks-68040lc-debug
+++ b/configure/os/CONFIG.Common.vxWorks-68040lc-debug
@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-68040lc-debug
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-68040lc-debug target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-68040lc-debug
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.vxWorks-68060
+++ b/configure/os/CONFIG.Common.vxWorks-68060
@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-68060
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-68060 target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-68060
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.vxWorks-68060-debug
+++ b/configure/os/CONFIG.Common.vxWorks-68060-debug
@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-68060-debug
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-68060-debug target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-68060-debug
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.vxWorks-mpc8540
+++ b/configure/os/CONFIG.Common.vxWorks-mpc8540
@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-mpc8540
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-mpc8540 target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-mpc8540
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.vxWorks-mpc8540-debug
+++ b/configure/os/CONFIG.Common.vxWorks-mpc8540-debug
@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-mpc8540-debug
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-mpc8540-debug target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-mpc8540-debug
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.vxWorks-mpc8548
+++ b/configure/os/CONFIG.Common.vxWorks-mpc8548
@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-mpc8548
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-mpc8548 target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-mpc8548
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.vxWorks-mpc8548-debug
+++ b/configure/os/CONFIG.Common.vxWorks-mpc8548-debug
@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-mpc8548-debug
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-mpc8548-debug targets.
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-mpc8548-debug
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.vxWorks-pentium
+++ b/configure/os/CONFIG.Common.vxWorks-pentium
@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-pentium
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-pentium target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-pentium
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.vxWorks-pentium-debug
+++ b/configure/os/CONFIG.Common.vxWorks-pentium-debug
@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-pentium-debug
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-pentium-debug target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-pentium-debug
 #-------------------------------------------------------
--- a/configure/os/CONFIG.Common.vxWorks-ppc32
+++ b/configure/os/CONFIG.Common.vxWorks-ppc32
@@ -1,7 +1,9 @@
+# $Revision-Id$
 #
 # Definitions for vxWorks-ppc603 targets with >32MB of RAM
 # Site-specific overrides go in CONFIG_SITE.Common.vxWorks-ppc603_long
 #
+# This file is maintained by the EPICS build community.
 #-------------------------------------------------------

 # Include definitions common to all vxWorks target archs
--- a/configure/os/CONFIG.Common.vxWorks-ppc32-debug
+++ b/configure/os/CONFIG.Common.vxWorks-ppc32-debug
@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-ppc32-debug
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-ppc32-debug target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-ppc32-debug
 #-------------------------------------------------------
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Michael Davidsaver	46e74328dc	minor	2016-03-24 14:41:43 -04:00
Michael Davidsaver	cb35889a20	dbCa: make private all functions which assume CA_LINK is really dbCa	2016-03-24 14:41:43 -04:00
Michael Davidsaver	29afb88006	add broken lset	2016-03-24 14:41:43 -04:00
Michael Davidsaver	bd8977c51d	more stats	2016-03-24 14:41:43 -04:00
Michael Davidsaver	32c3231f5d	link: not pv_link backend type informational, and a hint at what pvt points to	2016-03-24 14:41:43 -04:00
Michael Davidsaver	33033e6027	more close CA_LINK	2016-03-24 14:41:43 -04:00
Michael Davidsaver	905c5e3336	lset version and report	2016-03-24 14:41:43 -04:00
Michael Davidsaver	47b3c68af1	dbLink: dbAddLinkHook hack Add a hook for outside code the hijack CA_LINKs	2016-03-24 14:41:43 -04:00
Michael Davidsaver	4b3bdf31c2	iocInit: close CA_LINKs through lset	2016-03-24 14:41:43 -04:00
Michael Davidsaver	3740082b61	iocInit: announce "init" hooks during iocShutdown	2016-03-24 14:41:43 -04:00