minor

informational, and a hint at what pvt points to

.appveyor.yml

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

.bzrignore

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

.ci-local/travis-fixup.sh

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

.gitattributes

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

.gitignore

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

.gitmodules

@@ -1,28 +0,0 @@
-[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
-[submodule ".ci"]
-    path = .ci
-    url = https://github.com/epics-base/ci-scripts
-    branch = master

.tools/adjustver.py

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

.tools/make-tar.sh

@@ -1,168 +0,0 @@
-#!/bin/bash
-#
-# Make tar for git repo w/ one level of sub modules.
-#
-set -e
-
-die() {
-  echo "$1" >&2
-  exit 1
-}
-
-maybedie() {
-  if [ "$DEVMODE" ]; then
-    echo "Warning: $1" >&2
-  else
-    echo "Error: $1" >&2
-    exit 1
-  fi
-}
-
-usage() {
-   cat <<EOF >&2
-usage: $0 [-v] [-s] <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>/".
-
-  Options:
-
-    -v   Enable verbose prints
-    -d   Enable permissive developer mode
-EOF
-   exit 1
-}
-
-export DEVMODE=
-
-while getopts "vd" OPT
-do
-    case "$OPT" in
-    v) set -x;;
-    d) DEVMODE=1;;
-    ?) echo "Unknown option"
-       usage;;
-    esac
-done
-shift $(($OPTIND - 1))
-
-TOPREV="$1"
-FINALTAR="$2"
-PREFIX="${3:-}"
-
-[ "$TOPREV" ] || usage
-
-case "$FINALTAR" in
-"")
-  TAROPT=-z
-  FINALTAR="base-$TOPREV.tar.gz"
-  ;;
-*.tar)
-  TAROPT=""
-  ;;
-*.tar.gz)
-  TAROPT=-z
-  ;;
-*.tar.bz2)
-  TAROPT=-j
-  ;;
-*)
-  die "outfile must end with '.tar.gz' or '.tar.bz2'"
-  ;;
-esac
-
-case "$PREFIX" in
-"")
-  PREFIX="base-$TOPREV/"
-  ;;
-*/)
-  ;;
-*)
-  die "Prefix must end with '/'"
-  ;;
-esac
-
-# Check for both <tag> and R<tag>
-if ! [ `git tag -l $TOPREV` ]
-then
-  if [ `git tag -l R$TOPREV` ]
-  then
-    TOPREV="R$TOPREV"
-  else
-    maybedie "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 / && $4 != ".ci" {print $3, $4}' | \
-while read HASH MODDIR
-do
-    echo "Visiting $HASH $MODDIR"
-    if [ -e $MODDIR/.git ]
-    then
-        git -C $MODDIR archive --prefix=${PREFIX}${MODDIR}/ $HASH | tar -C "$TDIR"/tar -x
-    else
-        maybedie "  Submodule not checked out."
-    fi
-done
-
-# make a list of files copied and filter out undesirables
-
-(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 '/\/\.ci-local\//d' \
-  -e '/\/\.tools\//d' \
-  -e '/\/jenkins\//d' \
-  -e '/\/\.git/d' \
-  -e '/\/\.hgtags$/d' \
-  -e '/\/\.cproject$/d' \
-  -e '/\/\.project$/d' \
-  -e '/\/\.travis\.yml$/d' \
-  -e '/\/\.appveyor\.yml$/d' \
-  -e '/\/\.readthedocs\.yml$/d' \
-  "$TDIR"/list.1 > "$TDIR"/list.2
-
-if ! diff -U 0 "$TDIR"/list.1 "$TDIR"/list.2
-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
-    die "Oops! Tarfile diff against plan shown above"
-fi

.travis.yml

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

Makefile

@@ -4,8 +4,11 @@
 # 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. 
 #*************************************************************************
+#
+# $Revision-Id$
+#
 
 TOP = .
 include $(TOP)/configure/CONFIG
@@ -14,12 +17,8 @@ include $(TOP)/configure/CONFIG
 TOOLS = $(TOP)/src/tools
 
 DIRS += configure src
+
 src_DEPEND_DIRS = configure
 
-DIRS += test
-test_DEPEND_DIRS = src
-
-DIRS += modules
-modules_DEPEND_DIRS = src
-
 include $(TOP)/configure/RULES_TOP
+

README

@@ -20,8 +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/
 
-$Format:%cD$
-$Format:%H$
-https://code.launchpad.net/epics-base

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

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
 

configure/CONFIG.gnuCommon

@@ -3,10 +3,11 @@
 #     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
+# 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. 
 #*************************************************************************
-
+#--------------------------------------------------
 # GNU compiler defaults
 
 GNU = YES
@@ -23,14 +24,9 @@ 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
@@ -39,14 +35,12 @@ 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,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 file LICENSE that is included with this distribution.
+# in file LICENSE that is included with this distribution. 
 #*************************************************************************
+# $Revision-Id$
 #
 #	check for add-on CFLAGS and CXXFLAGS
 #
@@ -37,6 +38,9 @@
 #    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
@@ -270,6 +274,30 @@ 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
@@ -554,3 +582,4 @@ ifdef LIB_RCS_DEFAULT
 LIB_RCS+=$(LIB_RCS_DEFAULT)
 endif
 endif
+

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
 

configure/CONFIG_BASE

@@ -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. 
 #*************************************************************************
 
 #---------------------------------------------------------------
@@ -17,6 +17,17 @@ 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)
 
@@ -27,24 +38,34 @@ ifdef BASE_TOP
   PROD_VERSION = $(EPICS_VERSION).$(EPICS_REVISION)
 endif # BASE_TOP
 
+#---------------------------------------------------------------
+# Base c preprocessor flags
+
+# osithread default stack
+OSITHREAD_USE_DEFAULT_STACK = NO
+OSITHREAD_DEFAULT_STACK_FLAGS_YES = -DOSITHREAD_USE_DEFAULT_STACK
+
+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 ../
-#   so TOOLS must be an absolute path, although Perl scripts are OK.
-#   FIND_TOOL is for scripts run before the build reaches src/tools.
+#   but the Perl scripts in TOP/src/tools are OK
 
 TOOLS = $(abspath $(EPICS_BASE_HOST_BIN))
-FIND_TOOL = $(firstword $(wildcard $(TOOLS)/$(1) $(EPICS_BASE)/src/tools/$(1)))
+FIND_TOOL = $(firstword $(wildcard $(TOOLS)/$(1) $(TOP)/src/tools/$(1)))
 
 #---------------------------------------------------------------
 # EPICS Base build tools and tool flags
 
-PODTOHTML        = $(PERL) $(TOOLS)/podToHtml.pl
-CONVERTRELEASE   = $(PERL) $(call FIND_TOOL,convertRelease.pl)
-FULLPATHNAME     = $(PERL) $(TOOLS)/fullPathName.pl
-GENVERSIONHEADER = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG) $(QUESTION_FLAG)
-
-MAKERPATH = $(PYTHON) $(TOOLS)/makeRPath.py
+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
+GENVERSIONHEADER           = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG)
 
 #---------------------------------------------------------------
 # tools for installing libraries and products
@@ -53,21 +74,19 @@ INSTALL_PRODUCT = $(INSTALL)
 INSTALL_LIBRARY = $(INSTALL)
 
 #---------------------------------------------------------------
-# tools for making header dependencies and variable replacement
-MKMF       = $(PERL) $(TOOLS)/mkmf.pl
-REPLACEVAR = $(PERL) $(TOOLS)/replaceVAR.pl
+# tools for making header dependancies and variable replacement
+MKMF                       = $(PERL) $(TOOLS)/mkmf.pl
+REPLACEVAR                 = $(PERL) $(TOOLS)/replaceVAR.pl
 
 #---------------------------------------------------------------
-# tools for cleaning out unwanted files
-CVSCLEAN = $(call FIND_TOOL,cvsclean.pl)
-DEPCLEAN = $(call FIND_TOOL,depclean.pl)
+# Our versions of lex (flex) and yacc (antelope)
+EYACC = $(TOOLS)/antelope$(HOSTEXE)
+ELEX = $(TOOLS)/e_flex$(HOSTEXE) -S$(EPICS_BASE)/include/flex.skel.static
+
+YACC  = $(EYACC)
+LEX   = $(ELEX)
 
 #---------------------------------------------------------------
-# Tools for testing
-TAPTOJUNIT                 = $(PERL) $(TOOLS)/tap-to-junit-xml.pl
-PROVE                      = $(PERL) $(TOOLS)/epicsProve.pl
-PROVE.tap                  = $(PROVE) --ext .tap --exec "$(CAT)"
+# The 3.15 version of msi supports new options
 
-TEST_FAILURE_FILENAME      = .tests-failed.log
-TEST_FAILURE_FILE          = $(TOP)/$(TEST_FAILURE_FILENAME)
-PROVE_FAILURE              = echo $(abspath .)>> $(TEST_FAILURE_FILE)
+MSI3_15 = $(EPICS_BASE_HOST_BIN)/msi

configure/CONFIG_BASE_VERSION

@@ -4,9 +4,11 @@
 # 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$
+#
 #  EPICS Version information
 #
 # Only the person making an official EPICS release should make changes in
@@ -15,48 +17,46 @@
 # EPICS_SITE_VERSION is defined in CONFIG_SITE for sites that want a local
 # version number to be included in the reported version string.
 
-# 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:
-#
+# 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
-#   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
+#       true for 3.15 only
 #   ifeq ($(BASE_3_16),YES)
-#       true for 3.16.x only.
-#   ifeq ($(BASE_7_0),YES)
-#       true for 7.0.x only.
+#       true for 3.16 only.
 
 BASE_3_14 = NO
 BASE_3_15 = NO
-BASE_3_16 = NO
-BASE_7_0  = YES
+BASE_3_16 = YES
 
 # EPICS_VERSION must be a number >0 and <256
-EPICS_VERSION = 7
+EPICS_VERSION = 3
 
-# EPICS_REVISION must be a number >=0 and <256
-EPICS_REVISION = 0
+# EPICS_REVISION must be a number >=0 and <256 
+EPICS_REVISION = 16
 
-# EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 4
+# 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 in the official EPICS version number if zero
-EPICS_PATCH_LEVEL = 2
+# Not included if zero
+EPICS_PATCH_LEVEL = 1
 
-# Immediately after an official release the EPICS_PATCH_LEVEL is incremented
-# and the -DEV suffix is added (similar to the Maven -SNAPSHOT versions)
+# This will end in -DEV between official releases
 EPICS_DEV_SNAPSHOT=-DEV
+#EPICS_DEV_SNAPSHOT=-pre1
+#EPICS_DEV_SNAPSHOT=-pre1-DEV
+#EPICS_DEV_SNAPSHOT=-pre2
+#EPICS_DEV_SNAPSHOT=-pre2-DEV
+#EPICS_DEV_SNAPSHOT=-rc1
+#EPICS_DEV_SNAPSHOT=-rc1-DEV
+#EPICS_DEV_SNAPSHOT=-rc2
+#EPICS_DEV_SNAPSHOT=-rc2-DEV
+#EPICS_DEV_SNAPSHOT=
 
 # No changes should be needed below here
 
@@ -72,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$$"

configure/CONFIG_CA_MODULE

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

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

configure/CONFIG_COMMON

@@ -4,9 +4,11 @@
 # 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. 
 #*************************************************************************
 #
+#  $Revision-Id$
+#
 #  CONFIG_COMMON
 #
 #  This file is to be maintained by the community.
@@ -38,8 +40,6 @@ BUILD_ARCHS = $(EPICS_HOST_ARCH) $(CROSS1) $(CROSS2)
 # otherwise override this in os/CONFIG_SITE.<host_arch>.Common
 PERL = perl -CSD
 
-PYTHON = python
-
 #-------------------------------------------------------
 # Check configure/RELEASE file for consistency
 CHECK_RELEASE_YES = checkRelease
@@ -78,14 +78,10 @@ COMMON_DIR = ../O.Common
 IOCS_APPL_TOP               = $(shell $(FULLPATHNAME) $(INSTALL_LOCATION))
 
 #-------------------------------------------------------
-# Silencing the build - suppress messages during 'make -s'
+# Make echo output - suppress echoing if make's '-s' flag is set
 NOP = :
-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,)
+ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
+QUIET_FLAG := $(if $(findstring s,$(MAKEFLAGS)),-q,)
 
 #-------------------------------------------------------
 ifdef T_A
@@ -95,7 +91,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)
 
 #-------------------------------------------------------
@@ -169,13 +165,13 @@ TESTSHRLIBNAME = $(TESTSHRLIBNAME_$(SHARED_LIBRARIES))
 #--------------------------------------------------
 # obj files
 
-TARGET_OBJS =  $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS) $($*_SRCS)))
+TARGET_OBJS =  $($*_OBJLIBS) $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS) $($*_SRCS)))
 
 PRODUCT_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(USR_OBJS) $(PROD_OBJS)))
-PROD_LD_OBJS = $(TARGET_OBJS) $(PRODUCT_OBJS)
+PROD_LD_OBJS = $(USR_OBJLIBS) $(PROD_OBJLIBS) $(TARGET_OBJS) $(PRODUCT_OBJS)
 
 LIBRARY_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(LIB_SRCS) $(LIBSRCS) $(USR_OBJS) $(LIB_OBJS)))
-LIBRARY_LD_OBJS = $(TARGET_OBJS) $(LIBRARY_OBJS)
+LIBRARY_LD_OBJS = $(USR_OBJLIBS) $(LIB_OBJLIBS) $(TARGET_OBJS) $(LIBRARY_OBJS)
 
 #--------------------------------------------------
 # Windows resource files
@@ -267,7 +263,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)
@@ -306,7 +302,7 @@ LDLIBS = $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS)\
 CPPFLAGS = $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS) $(OPT_CPPFLAGS)\
  $(DEBUG_CPPFLAGS) $(WARN_CPPFLAGS) $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS)\
  $(USR_CPPFLAGS) $(CMD_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS)\
- $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS) $(API_CPPFLAGS)
+ $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
 
 #--------------------------------------------------
 # ar definition default
@@ -348,7 +344,7 @@ GENVERSIONDEFAULT =
 
 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)
 
@@ -378,14 +374,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)/%)
 
@@ -465,5 +461,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

@@ -1,28 +0,0 @@
-#*************************************************************************
-# 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
-
-HAS_registerAllRecordDeviceDrivers=YES

configure/CONFIG_DATABASE_VERSION

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

configure/CONFIG_ENV

@@ -3,9 +3,11 @@
 #     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. 
 #*************************************************************************
+#   $Revision-Id$
 #   Author: Andrew Johnson
 #   Date:   20 April 1995
 #
@@ -34,10 +36,8 @@ 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=""
@@ -46,10 +46,12 @@ 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
 
+# Other services:
+
+EPICS_CMD_PROTO_PORT=
+EPICS_AR_PORT=7002
+

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 
 #

configure/CONFIG_LIBCOM_MODULE

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

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

configure/CONFIG_SITE

@@ -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
 #
@@ -22,7 +23,6 @@
 #	darwin-x86             (Intel based Apple running OSX)
 #	freebsd-x86            (GNU compiler used for host builds)
 #	freebsd-x86_64         (GNU compiler used for host builds)
-#	linux-aarch64          (GNU compiler used for host builds)
 #	linux-arm              (GNU compiler used for host builds)
 #	linux-ppc              (GNU compiler used for host builds)
 #	linux-ppc64            (GNU compiler used for host builds)
@@ -52,6 +52,7 @@
 #	windows-x64-debug      (MS Visual C++ compiler with debug option for host builds)
 
 
+#  EPICS_HOST_ARCH is a required environment variable
 #  Do not set EPICS_HOST_ARCH in this file. 
 #  Use base/startup files to set EPICS_HOST_ARCH or 
 #  provide EPICS_HOST_ARCH on the GNU make command line.
@@ -67,7 +68,8 @@
 #       linux-586               (linux-x86 host)
 #       linux-686               (linux-x86 host)
 #       linux-arm               (linux-x86 or -x86_64 host)
-#       linux-aarch64           (linux-x86_64 host)
+#       linux-arm_eb            (linux-x86 host)
+#       linux-arm_el            (linux-x86 host)
 #       linux-athlon            (linux-x86 host)
 #       linux-cris              (Axis GNU crosscompiler on linux-x86 host)
 #       linux-cris_v10          (Axis GNU crosscompiler on linux-x86 host)
@@ -75,6 +77,9 @@
 #       linux-microblaze
 #       linux-xscale_be
 #       vxWorks-486
+#       vxWorks-68040
+#       vxWorks-68040lc
+#       vxWorks-68060
 #       vxWorks-pentium
 #       vxWorks-ppc32           (32-bit PowerPC CPUs with full FPU)
 #       vxWorks-ppc32sf         (32-bit PowerPC CPUs without FPU)
@@ -113,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
@@ -165,18 +164,8 @@ EPICS_SITE_VERSION =
 GCC_PIPE = NO
 
 # Set RPATH when linking executables and libraries.
-#  Must be either YES, NO, or ORIGIN.  If you set this to NO you must also provide a
+#  Must be either YES or NO.  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

@@ -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,44 +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:

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=..
 
@@ -20,14 +23,5 @@ 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,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)

configure/RULES

@@ -1,11 +1,13 @@
 #*************************************************************************
-# Copyright (c) 2006 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. 
 #*************************************************************************
+# $Revision-Id$
 
 ifndef T_A
 

configure/RULES.Db

@@ -4,10 +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 file LICENSE that is included with this distribution. 
 #*************************************************************************
-
-# RULES.Db
+#RULES.Db
 
 # Set db substitutions and template file suffixes
 SUBST_SUFFIX ?= .substitutions
@@ -155,19 +154,19 @@ ACTIONS = inc
 ACTIONS += build
 ACTIONS += install
 ACTIONS += buildInstall
-ACTIONS += runtests tapfiles clean-tests test-results junitfiles
+ACTIONS += runtests tapfiles
 
 actionArchTargets = $(foreach action, $(ACTIONS), \
     $(foreach arch, $(BUILD_ARCHS), $(action)$(DIVIDER)$(arch)))
 cleanArchTargets = $(foreach arch, $(BUILD_ARCHS), clean$(DIVIDER)$(arch))
 
-include $(CONFIG)/CONFIG_APP_INCLUDE
+-include $(TOP)/configure/CONFIG_APP_INCLUDE
 
 all: install
 
 install: buildInstall
 
-buildInstall: build
+buildInstall : build
 
 rebuild: clean install
 
@@ -196,21 +195,21 @@ endif
 #---------------------------------------------------------------
 # build dependancies, clean rule
 
-inc: $(COMMON_INC) $(INSTALL_INC)
+inc : $(COMMON_INC) $(INSTALL_INC)
 
-build: $(COMMON_DBDS) $(COMMON_DBS) $(COMMON_DBDCATS) \
+build : $(COMMON_DBDS) $(COMMON_DBS) $(COMMON_DBDCATS) \
 	$(INSTALL_DBDS) $(INSTALL_DBS) \
 	$(DBDDEPENDS_FILES) $(TARGETS) \
 	$(INSTALL_DB_INSTALLS) $(INSTALL_DBD_INSTALLS)
 
 clean: db_clean
 
-db_clean:
+db_clean : 
 	@$(RM) $(COMMONS) $(DBDDEPENDS_FILES)
 	@$(RM) *_registerRecordDeviceDriver.cpp
 	@$(RM) $(TARGETS)
 
-.PHONY: db_clean
+.PHONY : db_clean
 
 realclean: clean
 
@@ -389,7 +388,7 @@ $(COMMON_DIR)/%.dbd: ../%Include.dbd
 
 # Make DBDCAT file x depend on x_DBD source files
 define  DBDCAT_template
-$$(COMMON_DIR)/$(1).dbd: ../Makefile $$(foreach file, $$($(1)_DBD),$$(DBDCAT_SOURCE) )
+$$(COMMON_DIR)/$(1).dbd : ../Makefile $$(foreach file, $$($(1)_DBD),$$(DBDCAT_SOURCE) )
 endef
 $(foreach name,$(subst .dbd,,$(DBDCAT)), $(eval $(call DBDCAT_template,$(name))))
 
@@ -418,7 +417,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
@@ -429,30 +428,30 @@ $(foreach file, $(DBD_INSTALLS), $(eval $(call DBD_INSTALLS_template, $(file))))
 #---------------------------------------------------------------
 # HTML files
 
-$(COMMON_DIR)/%.html: %.dbd.pod
+$(COMMON_DIR)/%.html: %.dbd.pod $(TOOLS)/dbdToHtml.pl
 	@$(RM) $(notdir $@)
-	$(DBDTOHTML) $(DBDFLAGS) -o $(notdir $@) $<
+	$(PERL) $(TOOLS)/dbdToHtml.pl $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: %.pod
+$(COMMON_DIR)/%.html: %.pod $(TOOLS)/podToHtml.pl
 	@$(RM) $(notdir $@)
-	$(PODTOHTML) -s -s -o $(notdir $@) $<
+	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: %.pm
+$(COMMON_DIR)/%.html: %.pm $(TOOLS)/podToHtml.pl
 	@$(RM) $(notdir $@)
-	$(PODTOHTML) -o $(notdir $@) $<
+	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: ../%.pm
+$(COMMON_DIR)/%.html: ../%.pm $(TOOLS)/podToHtml.pl
 	@$(RM) $(notdir $@)
-	$(PODTOHTML) -s -o $(notdir $@) $<
+	$(PERL) $(TOOLS)/podToHtml.pl -s -o $(notdir $@) $<
 	@$(MKDIR) $(dir $@)
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: ../%.pl
+$(COMMON_DIR)/%.html: ../%.pl $(TOOLS)/podToHtml.pl
 	@$(RM) $(notdir $@)
-	$(PODTOHTML) -s -o $(notdir $@) $<
+	$(PERL) $(TOOLS)/podToHtml.pl -s -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
 .PRECIOUS: $(COMMON_DIR)/%.html %.html
@@ -460,7 +459,7 @@ $(COMMON_DIR)/%.html: ../%.pl
 #---------------------------------------------------------------
 # DB files
 
-$(COMMON_DIR)/%.db: $(COMMON_DIR)/%.edf
+$(COMMON_DIR)/%.db: $(COMMON_DIR)/%.edf 
 	$(E2DB) $(E2DB_SYSFLAGS) $(E2DB_FLAGS) -n $*.VAR $<
 	@$(REPLACEVAR) < $*.VAR > $@
 	@$(RM) $*.VAR
@@ -514,7 +513,7 @@ $(INSTALL_DB)/%.db: $(COMMON_DIR)/%.db
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 define  DB_INSTALLS_template
-$$(INSTALL_DB)/$$(notdir $(1)): $(1)
+$$(INSTALL_DB)/$$(notdir $(1)) : $(1)
 	$(ECHO) "Installing $$@"
 	@$$(INSTALL) -d -m $$(INSTALL_PERMISSIONS) $$^ $$(INSTALL_DB)
 endef
@@ -539,3 +538,4 @@ $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))
 	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ $< $(basename $@) $(IOCS_APPL_TOP)
 
 .PRECIOUS: %_registerRecordDeviceDriver.cpp
+

configure/RULES.ioc

@@ -4,10 +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 file LICENSE that is included with this distribution.
 #*************************************************************************
-
-# RULES.ioc
+#RULES.ioc
 
 include $(CONFIG)/RULES_DIRS
 
@@ -15,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:
@@ -25,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
+

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)))
@@ -90,4 +93,6 @@ realclean:
 .PHONY : $(BUILD_ARCHS) rebuild archsCommonClean
 .PHONY : $(ACTIONS) clean realclean archclean host all
 
-include $(CONFIG)/RULES_COMMON
+#  User specific rules
+#
+-include $(HOME)/configure/RULES_USER

configure/RULES_BUILD

@@ -4,14 +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
+# $Revision-Id$
+#
+#	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
@@ -26,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)
 
 #---------------------------------------------------------------
 
@@ -43,7 +44,6 @@ 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)
@@ -55,7 +55,6 @@ 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)
@@ -75,16 +74,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
@@ -105,24 +104,18 @@ endif
 #   Products and Object libraries
 #
 PRODTARGETS += $(PRODNAME) $(MUNCHNAME) $(CTDT_SRCS) $(CTDT_OBJS) $(NMS)
-TESTPRODTARGETS += $(TESTPRODNAME) $(TESTMUNCHNAME)
 
 #---------------------------------------------------------------
-#   Test result files
+#   Generate a test specification if any tests are defined.
 #
-
-# Enable testing if this host can run tests for the current target
-ifneq (,$(filter $(T_A), $(EPICS_HOST_ARCH) $(CROSS_COMPILER_RUNTEST_ARCHS)))
-RUNTESTS_ENABLED = YES
-TESTSCRIPTS.t = $(filter %.t, $(TESTSCRIPTS))
-TAPFILES.t += $(TESTSCRIPTS.t:.t=.tap)
-JUNITFILES.t += $(TESTSCRIPTS.t:.t=-results.xml)
-TAPFILES += $(TAPFILES.t)
-JUNITFILES += $(JUNITFILES.t)
+ifneq (,$(strip $(TESTS)))
+TARGETS += testspec
 endif
 
+TAPFILES += $(TESTSCRIPTS:.t=.tap)
+
 #---------------------------------------------------------------
-#   Libraries
+#   Libraries 
 #
 
 LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS) $(TESTLIBNAME) \
@@ -133,27 +126,28 @@ 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)
+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)
 
@@ -161,59 +155,45 @@ 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 directories to remove duplicates & make parents first
-$(sort $(DIRECTORY_TARGETS)):
+$(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:
-	+$(CONVERTRELEASE) checkRelease
-warnRelease:
 	$(CONVERTRELEASE) checkRelease
+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
 
-# $(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): | $(INSTALL_LIB)
+$(TESTPRODNAME) $(PRODNAME): %$(EXE):
 	@$(RM) $@
-	$(LINK.cpp)
+	$(DEBUGCMD) $(LINK.cpp)
 	$(MT_EXE_COMMAND)
 
-%_ctdt$(OBJ): %_ctdt.c
+%_ctdt$(OBJ) : %_ctdt.c
 	@$(RM) $@
 	$(COMPILE.ctdt) $<
 
@@ -231,9 +211,9 @@ $(TESTPRODNAME) $(PRODNAME): %$(EXE): | $(INSTALL_LIB)
 
 # Cancel GNUMake's built-in rules, which don't have our _INC
 # dependencies so could get used in some circumstances (gdd)
-%.o: %.c
-%.o: %.cc
-%.o: %.cpp
+%.o : %.c
+%.o : %.cc
+%.o : %.cpp
 
 # Include files are order-only prerequisites for compilation:
 %$(OBJ): %.c | $(COMMON_INC) $(INSTALL_INC)
@@ -265,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
+%.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
@@ -288,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)
@@ -311,10 +289,6 @@ $(LOADABLE_SHRLIBNAME): $(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX):
 	$(LINK.shrlib)
 	$(MT_DLL_COMMAND)
 
-$(LIBNAME) $(SHRLIBNAME) $(LOADABLE_SHRLIBNAME): | $(INSTALL_LIB)
-$(INSTALL_LIB):
-	@$(MKDIR) $@
-
 #---------------------------------------------------------------
 # C++ munching for VxWorks
 
@@ -334,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)
@@ -345,83 +315,38 @@ $(MODNAME): %$(MODEXT): %$(EXE)
 	@$(RM) $@
 	$(LINK.mod)
 
-#---------------------------------------------------------------
-# Generate Perl include path module
-%ModuleDirs.pm: $(wildcard $(TOP)/configure/RELEASE*)
-	@$(MKDIR) $(dir $@)
-	$(CONVERTRELEASE) -T $(TOP) $@
-
 #---------------------------------------------------------------
 # Automated testing
 
-runtests: run-tap-tests
-run-tap-tests: $(TESTSCRIPTS.t)
-ifneq ($(TESTSCRIPTS.t),)
-ifdef RUNTESTS_ENABLED
-	$(PROVE) --failures --color $^ || $(PROVE_FAILURE)
-endif
-endif
+runtests: $(TESTSCRIPTS)
+	-$(PERL) -MTest::Harness -e 'runtests @ARGV if @ARGV;' $^
 
-tapfiles: $(TAPFILES)
-junitfiles: $(JUNITFILES)
+testspec: $(TESTSCRIPTS)
+	@$(RM) $@
+	@echo OS-class: $(OS_CLASS) > $@
+	@echo Target-arch: $(T_A) >> $@
+	$(if $^, @echo Tests: $^ >> $@)
+	$(if $(TESTFILES), @echo Files: $(TESTFILES) >> $@)
+	$(if $(TESTSPEC_$(OS_CLASS)), @echo "Harness: $(TESTSPEC_$(OS_CLASS))" >> $@)
 
-test-results: tap-results
-tap-results: $(TAPFILES)
-ifneq ($(strip $(TAPFILES)),)
-ifdef RUNTESTS_ENABLED
-	$(PROVE.tap) --failures --color $^ || $(PROVE_FAILURE)
-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)
 
 # A .tap file is the output from running the associated test script
-$(TAPFILES.t): %.tap: %.t
-ifdef RUNTESTS_ENABLED
-	$(PERL) $< -tap > $@
-endif
-
-$(JUNITFILES.t): %-results.xml: %.tap
-	$(TAPTOJUNIT) --puretap --output $@ --input $< $*
+%.tap: %.t
+	-$(PERL) $< -tap > $@
 
 # If there's a perl test script (.plt) available, use it
 %.t: ../%.plt
 	@$(RM) $@
-	$(EXPAND_TOOL) -t $(INSTALL_LOCATION) -a $(T_A) $< $@
+	$(CP) $< $@
 
 # 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 $(T_A) $(EPICS_HOST_ARCH) $@ $<
+	$(PERL) $(TOOLS)/makeTestfile.pl $@ $<
 
 #---------------------------------------------------------------
-# Generate $(API_HEADER) files on request (%API.h)
-
-ifdef API_HEADER
-# Install them
-INC += $(API_HEADER)
-
-# Ensure we generate them early enough
-INSTALL_API_HEADERS = $(addprefix $(INSTALL_INCLUDE)/,$(API_HEADER))
-$(filter-out $(INSTALL_API_HEADERS), $(INSTALL_INC)) $(HDEPENDS_FILES): \
-    | $(INSTALL_API_HEADERS)
-
-# How to make one
-$(COMMON_DIR)/%API.h: $(TOOLS)/makeAPIheader.pl
-	@$(RM) $@
-	$(PERL) $(TOOLS)/makeAPIheader.pl -o $@ $(@:$(COMMON_DIR)/%API.h=%)
-endif
-
 # Generate header with version number from VCS
 
 ifneq ($(GENVERSION),)
@@ -433,14 +358,14 @@ endif
 # Install rules for BIN_INSTALLS and LIB_INSTALLS
 
 define  BIN_INSTALLS_template
-$$(INSTALL_BIN)/$$(notdir $(1)): $(1)
+$$(INSTALL_BIN)/$$(notdir $(1)) : $(1)
 	$(ECHO) "Installing $$(<F)"
 	@$$(INSTALL) -d -m $$(BIN_PERMISSIONS) $$^ $$(INSTALL_BIN)
 endef
 $(foreach file, $(BIN_INSTALLS), $(eval $(call BIN_INSTALLS_template, $(file))))
 
 define  LIB_INSTALLS_template
-$$(INSTALL_LIB)/$$(notdir $(1)): $(1)
+$$(INSTALL_LIB)/$$(notdir $(1)) : $(1)
 	$(ECHO) "Installing $$(<F)"
 	@$$(INSTALL) -d -m $$(LIB_PERMISSIONS) $$^ $$(INSTALL_LIB)
 endef
@@ -490,11 +415,9 @@ $(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 $@"
@@ -506,7 +429,6 @@ 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)
@@ -514,21 +436,20 @@ $(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)
 
@@ -560,18 +481,13 @@ $(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 run-tap-tests tapfiles junitfiles test-results tap-results
-.PHONY: clean-tests checkRelease warnRelease noCheckRelease FORCE
+.PHONY: runtests tapfiles 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

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

@@ -4,12 +4,16 @@
 # 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$
+#
+
 
 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), \
@@ -54,7 +58,7 @@ $(foreach dir, $(DIRS), \
 
 define DEP_template2
 $(1)$$(DIVIDER)$(2) : $$(foreach ddir, $$($(1)_DEPEND_DIRS), \
-    $$(addsuffix $$(DIVIDER)$(2),$$(ddir))) | before-$(2)
+    $$(addsuffix $$(DIVIDER)$(2),$$(ddir)))
 endef
 $(foreach action, $(ACTIONS), \
     $(foreach dir, $(DIRS), \
@@ -79,24 +83,20 @@ $(foreach arch, $(ARCHS), \
 
 dirPart = $(join $(dir $@), $(word 1, $(subst $(DIVIDER), ,$(notdir $@))))
 actionArchPart = $(join $(word 2, $(subst $(DIVIDER), ,$(notdir $@))), \
-   $(addprefix $(DIVIDER),$(word 3, $(subst $(DIVIDER), ,$(notdir $@)))))
-
-$(DIRS) $(dirActionTargets) $(dirArchTargets) $(dirActionArchTargets):
+   $(addprefix $(DIVIDER),$(word 3, $(subst $(DIVIDER), ,$(notdir $@))))) 
+$(DIRS) $(dirActionTargets) $(dirArchTargets) $(dirActionArchTargets) :
 	$(MAKE) -C $(dirPart) $(actionArchPart)
 
-# before-action rules are run once prior to recursing through the
-# list of subdirectories and running the action rule in each one.
-# See DEP_template2 above for how that rule ordering is achieved.
-beforeActions = $(addprefix before-,$(ACTIONS))
-$(beforeActions):
-
 $(ARCHS) $(ACTIONS) $(actionArchTargets) :%: \
     $(foreach dir, $(DIRS), $(dir)$(DIVIDER)%)
 
 .PHONY : $(DIRS) all host rebuild
-.PHONY : $(ARCHS) $(ACTIONS) $(beforeActions)
+.PHONY : $(ARCHS) $(ACTIONS)
 .PHONY : $(dirActionTargets) $(dirArchTargets)
 .PHONY : $(dirActionArchTargets)
 .PHONY : $(actionArchTargets)
 
-include $(CONFIG)/RULES_COMMON
+
+#  User specific rules
+#
+-include $(HOME)/configure/RULES_USER

configure/RULES_EXPAND

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

configure/RULES_FILE_TYPE

@@ -6,12 +6,13 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
-
-# Include <top>/configure/RULES_BUILD from tops defined in RELEASE* files,
-# excluding EPICS_BASE
 #
-RELEASE_RULES_BUILDS = $(foreach top, \
-    $(filter-out EPICS_BASE, $(RELEASE_TOPS)), \
+# $Revision-Id$
+#
+
+# Include <top>/configure/RULES_BUILD from tops defined in RELEASE* files
+#
+RELEASE_RULES_BUILDS = $(foreach top, $(RELEASE_TOPS), \
     $(wildcard $($(top))/configure/RULES_BUILD))
 ifneq ($(RELEASE_RULES_BUILDS),)
   include $(RELEASE_RULES_BUILDS)
@@ -25,7 +26,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)
@@ -69,3 +70,7 @@ file_type_clean:
 	@$(RM) $(foreach type, $(FILE_TYPE), $($(type)))
 
 .PHONY : file_type_clean
+
+#  User specific rules
+#
+-include $(HOME)/configure/RULES_USER

configure/RULES_MODULES

@@ -1,60 +0,0 @@
-#*************************************************************************
-# 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
-LIVE_SUBMODULES = $(subst /Makefile,,$(wildcard $(addsuffix /Makefile, $(SUBMODULES))))
-DIRS += $(LIVE_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
-
-# Append all our live submodule failure files
-FAILURE_FILES = $(addsuffix /$(TEST_FAILURE_FILENAME), $(LIVE_SUBMODULES))
-
-define combine_failure_files
-	@$(TOUCH) $(FAILURE_FILES)
-	@$(CAT) $(FAILURE_FILES) >> $(TEST_FAILURE_FILE)
-endef
-runtests: | $(addsuffix $(DIVIDER)runtests, $(LIVE_SUBMODULES))
-	$(if $(FAILURE_FILES), $(combine_failure_files))
-test-results: | $(addsuffix $(DIVIDER)test-results, $(LIVE_SUBMODULES))
-	$(if $(FAILURE_FILES), $(combine_failure_files))

configure/RULES_OCTAVE

@@ -1,12 +1,15 @@
 #*************************************************************************
-# Copyright (c) 2006 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. 
 #*************************************************************************
-
+# $Revision-Id$
+#
+#-------------------------------------------------------
 # Octave definitions and rules
 
 ifeq ($(findstring Host,$(VALID_BUILDS)),Host)

configure/RULES_TARGET

@@ -1,13 +1,20 @@
 #*************************************************************************
-# Copyright (c) 2011 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.
 #*************************************************************************
-
-# RULES_TARGET
+#
+#  $Revision-Id$
+#
+#  RULES_TARGET
+#
+#  This file is to be maintained by the community.
+#
+#-----------------------------------------------------------------------
 
 define TARGET_template
 $(1)_$(2) += $$(if $$(strip $$($(1)_$(2)_$$(OS_CLASS))), \
@@ -15,7 +22,7 @@ $(1)_$(2) += $$(if $$(strip $$($(1)_$(2)_$$(OS_CLASS))), \
              $$($(1)_$(2)_DEFAULT))
 endef
 
-$(foreach type, SRCS RCS OBJS LDFLAGS LDOBJS SYS_LIBS , \
+$(foreach type, SRCS RCS OBJS LDFLAGS OBJLIBS LDOBJS SYS_LIBS , \
 $(foreach target, $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRARY) , \
     $(eval $(call TARGET_template,$(strip $(target)),$(type)))))
 
@@ -33,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))), \
@@ -95,20 +91,12 @@ $(1)_DLL_DEPLIBS=$$(foreach lib, $$($(1)_DLL_LIBS), \
 $$(LIB_PREFIX)$(1)$$(LIB_SUFFIX):$$($(1)_OBJSNAME) $$($(1)_RESS)
 $$(LIB_PREFIX)$(1)$$(LIB_SUFFIX):$$($(1)_DEPLIBS)
 
-ifneq ($$($(1)_API),)
-$$(LIB_PREFIX)$(1)$$(LIB_SUFFIX): API_CPPFLAGS += -DBUILDING_$$($(1)_API)_API
-endif
-
 ifeq ($$(SHARED_LIBRARIES),YES)
 
 ifdef SHRLIB_SUFFIX
 $$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_OBJSNAME) $$($(1)_RESS)
 $$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_DEPLIBS)
 $$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX):$$($(1)_DLL_DEPLIBS)
-
-ifneq ($$($(1)_API),)
-$$(SHRLIB_PREFIX)$(1)$$(SHRLIB_SUFFIX): API_CPPFLAGS += -DBUILDING_$$($(1)_API)_API
-endif
 endif
 
 endif
@@ -137,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),)
 
@@ -149,14 +147,10 @@ $(1)_DLL_DEPLIBS=$$(foreach lib, $$($(1)_DLL_LIBS),\
 $$(LOADABLE_SHRLIB_PREFIX)$(1)$$(LOADABLE_SHRLIB_SUFFIX):$$($(1)_OBJSNAME) $$($(1)_RESS)
 $$(LOADABLE_SHRLIB_PREFIX)$(1)$$(LOADABLE_SHRLIB_SUFFIX):$$($(1)_DEPLIBS)
 $$(LOADABLE_SHRLIB_PREFIX)$(1)$$(LOADABLE_SHRLIB_SUFFIX):$$($(1)_DLL_DEPLIBS)
-
-ifneq ($$($(1)_API),)
-$$(LOADABLE_SHRLIB_PREFIX)$(1)$$(LOADABLE_SHRLIB_SUFFIX): \
-    API_CPPFLAGS += -DBUILDING_$$($(1)_API)_API
-endif
 endef
 
 $(foreach target, $(LOADABLE_LIBRARY), \
     $(eval $(call LOADABLE_LIBRARY_template,$(strip $(target)))))
 
 #-----------------------------------------------------------------------
+

configure/RULES_TOP

@@ -6,67 +6,45 @@
 # 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
 
-# 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
-
-ifndef DISABLE_TOP_RULES
-  #
-  # Rules for a regular application top directory
-  #
-
 distclean: realclean cvsclean realuninstall
 
-realuninstall: uninstallDirs
-	$(RMDIR) $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB)
+CVSCLEAN = $(call FIND_TOOL,cvsclean.pl)
+cvsclean:
+	$(PERL) $(CVSCLEAN)
 
-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: | clean
+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)
+uninstallDirs:
 	$(RMDIR) $(UNINSTALL_DIRS)
 
-  # Remove the bin and lib directories if they have no sub-directories
-  #
-EMPTY_INSTALL_DIRS = \
-    $(if $(wildcard $(INSTALL_LOCATION_BIN)/*),,$(INSTALL_LOCATION_BIN)) \
-    $(if $(wildcard $(INSTALL_LOCATION_LIB)/*),,$(INSTALL_LOCATION_LIB))
-uninstall: archuninstall uninstallDirs | clean
-	$(RMDIR) $(EMPTY_INSTALL_DIRS)
+uninstall: archuninstall uninstallDirs
 
-archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS))
+archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS)) | cleandirs
 
-uninstall$(DIVIDER)%: | clean
-	$(RMDIR) $(addsuffix /$(subst uninstall$(DIVIDER),,$@), \
-	    $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB))
+archPart = $(word 2, $(subst $(DIVIDER), ,$@))
+uninstall$(DIVIDER)%:
+	$(RMDIR) $(INSTALL_LOCATION_BIN)/$(archPart)
+	$(RMDIR) $(INSTALL_LOCATION_LIB)/$(archPart)
 
-runtests test-results:
-	@$(PERL) $(TOOLS)/testFailures.pl $(TEST_FAILURE_FILE)
+cleandirs:
+	@$(NOP)
+ifeq ($(wildcard $(INSTALL_LOCATION_BIN)/*),)
+	$(RMDIR) $(INSTALL_LOCATION_BIN)
+endif
+ifeq ($(wildcard $(INSTALL_LOCATION_LIB)/*),)
+	$(RMDIR) $(INSTALL_LOCATION_LIB)
+endif
 
-else
-  #
-  # Using a disabled rule aborts
-  #
-
-  distclean uninstall realuninstall archuninstall:
-	$(error Target '$@' not available in a submodule)
-
-endif # DISABLE_TOP_RULES
-
-before-runtests before-test-results: rm-failure-file
-rm-failure-file:
-	@$(RM) $(TEST_FAILURE_FILE)
-	@$(TOUCH) $(TEST_FAILURE_FILE)
 
 help:
 	@echo "Usage: gnumake [options] [target] ..."
@@ -82,39 +60,30 @@ 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 "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 "Targets supported by top level Makefile:"
+	@echo "     archuninstall  - Remove bin & lib directories created by this hostarch."
 	@echo "     uninstall      - Remove install directories created by this hostarch."
 	@echo "     realuninstall  - Removes ALL install dirs"
 	@echo "     distclean      - Same as realclean cvsclean realuninstall."
-endif
+	@echo "     cvsclean       - Removes cvs .#* files in all dirs of directory tree"
 	@echo "     help           - Prints this list of valid make targets "
-	@echo "Object targets are supported by the O.<arch> level Makefile .e.g"
+	@echo "Indiv. object targets are supported by O.<arch> level Makefile .e.g"
 	@echo "     xxxRecord.o"
 
-.PHONY: distclean uninstall rm-failure-file help
-.PHONY: realuninstall archuninstall uninstallDirs
+.PHONY: cleandirs distclean cvsclean realuninstall archuninstall uninstallDirs
+.PHONY: uninstall help
 
-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
+# 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

configure/Sample.Makefile

@@ -3,8 +3,8 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# SPDX-License-Identifier: EPICS
-# EPICS Base is distributed subject to a Software License Agreement found
+# 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. 
 #*************************************************************************
 #	Makefile  for  base/src/sample

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
@@ -27,13 +28,9 @@ 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)/$(RTEMS_BSP)/Makefile.inc
+include $(RTEMS_BASE)/$(RTEMS_TARGET_CPU)-rtems$(RTEMS_VERSION)/$(subst RTEMS-,,$(T_A))/Makefile.inc
 include $(RTEMS_CUSTOM)
 include $(CONFIG.CC)
 
@@ -76,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
@@ -140,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

configure/os/CONFIG.Common.RTEMS-at91rm9200ek

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

configure/os/CONFIG.Common.RTEMS-beatnik

@@ -1,11 +1,11 @@
 #
 # CONFIG.Common.RTEMS-beatnik
+# $Revision-Id$
 # Author: Dayle Kotturi <dayle@slac.stanford.edu>
 #
 # 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
@@ -16,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

configure/os/CONFIG.Common.RTEMS-gen68360

@@ -1,10 +1,10 @@
 #
+# $Revision-Id$
 # Author: W. Eric Norum
 #         Canadian Light Source
 #         eric@cls.usask.ca
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_BSP = gen68360
-RTEMS_TARGET_CPU = m68k
+RTEMS_TARGET_CPU=m68k
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-mcp750

@@ -1,10 +1,10 @@
 #
+# $Revision-Id$
 # Author: W. Eric Norum
 #         Canadian Light Source
 #         eric@cls.usask.ca
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_BSP = mcp750
-RTEMS_TARGET_CPU = ppc
+RTEMS_TARGET_CPU=ppc
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-mvme167

@@ -1,10 +1,10 @@
 #
+# $Revision-Id$
 # Author: W. Eric Norum
 #         Canadian Light Source
 #         eric@cls.usask.ca
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_BSP = mvme167
-RTEMS_TARGET_CPU = m68k
+RTEMS_TARGET_CPU=m68k
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-mvme2100

@@ -1,11 +1,11 @@
 #
 # CONFIG.Common.RTEMS-mvme2100
+# $Revision-Id$
 # Author: W. Eric Norum <wenorum@lbl.gov>
 #
 # 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
@@ -14,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

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

@@ -1,11 +1,11 @@
 #
 # CONFIG.Common.RTEMS-mvme3100
+# $Revision-Id$
 # Author: W. Eric Norum <wenorum@lbl.gov>
 #
 # 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
@@ -16,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

configure/os/CONFIG.Common.RTEMS-mvme5500

@@ -1,11 +1,11 @@
 #
 # CONFIG.Common.RTEMS-mvme5500
+# $Revision-Id$
 # Author: W. Eric Norum <wenorum@lbl.gov>
 #
 # 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
@@ -17,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

configure/os/CONFIG.Common.RTEMS-pc386

@@ -1,19 +1,20 @@
 #
+# $Revision-Id$
 # Author: W. Eric Norum
 #         Canadian Light Source
 #         eric@cls.usask.ca
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_BSP = pc386
-RTEMS_TARGET_CPU = i386
+RTEMS_TARGET_CPU=i386
 
 MUNCH_SUFFIX = .boot
+MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
-	$(RM) $*.bin
-	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< $*.bin
+	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< temp.bin
 	$(BIN2BOOT) $@ 0x00097E00 \
-	    $(PROJECT_RELEASE)/lib/start16.bin 0x00097C00 0 $*.bin 0x00100000 0
+		$(PROJECT_RELEASE)/lib/start16.bin 0x00097C00 0 temp.bin 0x00100000 0
+	rm -f temp.bin
 endef
 
 include $(CONFIG)/os/CONFIG.Common.RTEMS

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

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

@@ -1,10 +1,10 @@
 #
+# $Revision-Id$
 # Author: W. Eric Norum
 #         University of Saskatchewan
 #         eric.norum@usask.ca
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_BSP = psim
-RTEMS_TARGET_CPU = ppc
+RTEMS_TARGET_CPU=ppc
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-uC5282

@@ -1,15 +1,16 @@
 #
+# $Revision-Id$
 # Author: W. Eric Norum
 #         Canadian Light Source
 #         eric@cls.usask.ca
 #
 # 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.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%)

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

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
+

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

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

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

configure/os/CONFIG.Common.freebsd-x86

@@ -1,3 +1,4 @@
+# $Revision-Id$
 #
 # This file is maintained by the build community.
 #

configure/os/CONFIG.Common.freebsd-x86_64

@@ -1,3 +1,4 @@
+# $Revision-Id$
 #
 # This file is maintained by the build community.
 #

configure/os/CONFIG.Common.freebsdCommon

@@ -1,3 +1,4 @@
+# $Revision-Id$
 #
 # This file is maintained by the build community.
 #

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

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

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

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

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
 #-------------------------------------------------------

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
 #-------------------------------------------------------

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
 #-------------------------------------------------------

configure/os/CONFIG.Common.linux-aarch64

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

configure/os/CONFIG.Common.linux-arm-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
 #-------------------------------------------------------

configure/os/CONFIG.Common.linux-arm_eb

@@ -0,0 +1,11 @@
+# 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
+#-------------------------------------------------------
+
+# Include definitions common to all Linux-arm targets
+include $(CONFIG)/os/CONFIG.Common.linux-arm
+

configure/os/CONFIG.Common.linux-arm_el

@@ -0,0 +1,11 @@
+# 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
+#-------------------------------------------------------
+
+# Include definitions common to all linux-arm targets
+include $(CONFIG)/os/CONFIG.Common.linux-arm
+

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
 #-------------------------------------------------------

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
 #-------------------------------------------------------

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
 #-------------------------------------------------------

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
 #-------------------------------------------------------

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
 #-------------------------------------------------------

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
 #-------------------------------------------------------

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
 #-------------------------------------------------------

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

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,17 +26,13 @@ STATIC_LDFLAGS_YES= -Wl,-Bstatic
 STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic
 
-# 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 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 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))
+# 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

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
 #-------------------------------------------------------

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
 #-------------------------------------------------------

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
 #-------------------------------------------------------

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
 #-------------------------------------------------------

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
 #-------------------------------------------------------

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
 #-------------------------------------------------------

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
 #-------------------------------------------------------

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
 #-------------------------------------------------------

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
 #-------------------------------------------------------

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
 #-------------------------------------------------------

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
 #-------------------------------------------------------