minor

informational, and a hint at what pvt points to

.bzrignore

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

.gitignore

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

.travis.yml

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

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 = .
 include $(TOP)/configure/CONFIG

README

@@ -20,5 +20,5 @@ Additional information about EPICS including mailing list
 archives and subscription instructions, documentation and
 training materials, additional components, links to other
 websites etc. is available on the EPICS home page at
-	https://epics.anl.gov/
+	http://www.aps.anl.gov/epics/
 

appveyor.yml

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

ci/appveyor-make.bat

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

ci/appveyor-prepare.bat

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

ci/travis-build.sh

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

configure/CONFIG

@@ -6,6 +6,8 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
+#
+#  $Revision-Id$
 
 #
 #  Common build definitions
@@ -20,15 +22,11 @@ else
 endif
 
 # Provide a default if the user hasn't set EPICS_HOST_ARCH
-#
 ifeq ($(origin EPICS_HOST_ARCH), undefined)
-  # Bootstrapping ...
-  EHA := $(firstword $(wildcard $(EPICS_BASE)/lib/perl/EpicsHostArch.pl \
-        $(TOP)/src/tools/EpicsHostArch.pl))
   # NB: We use a simply expanded variable here for performance:
-  export EPICS_HOST_ARCH := $(shell perl $(EHA))
-  EHA :=
+  EPICS_HOST_ARCH := $(shell $(CONFIG)/../startup/EpicsHostArch.pl)
 endif
+#
 
 -include $(CONFIG)/RELEASE
 -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH)
@@ -77,17 +75,17 @@ ifdef T_A
   #
   -include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).$(T_A)
 
-  #  Site specific target and host-target definitions and overrides
-  #
-  -include $(CONFIG)/os/CONFIG_SITE.Common.$(T_A)
-  -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
-
   #  RELEASE file specific definitions
   #
   ifneq ($(CONFIG),$(TOP)/configure)
     -include $(CONFIG)/CONFIG_APP_INCLUDE
   endif
 
+  #  Site specific target and host-target definitions
+  #
+  -include $(CONFIG)/os/CONFIG_SITE.Common.$(T_A)
+  -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+
 endif # ifdef T_A
 
 

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

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

configure/CONFIG_ADDONS

@@ -6,6 +6,7 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
+# $Revision-Id$
 #
 #	check for add-on CFLAGS and CXXFLAGS
 #

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

@@ -36,7 +36,6 @@ ifdef BASE_TOP
   SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
   # Windows only allows 2 levels of version numbering
   PROD_VERSION = $(EPICS_VERSION).$(EPICS_REVISION)
-  BASE_CPPFLAGS += -DUSE_TYPED_RSET
 endif # BASE_TOP
 
 #---------------------------------------------------------------
@@ -46,7 +45,7 @@ endif # BASE_TOP
 OSITHREAD_USE_DEFAULT_STACK = NO
 OSITHREAD_DEFAULT_STACK_FLAGS_YES = -DOSITHREAD_USE_DEFAULT_STACK
 
-BASE_CPPFLAGS += $(OSITHREAD_DEFAULT_STACK_FLAGS_$(OSITHREAD_USE_DEFAULT_STACK))
+BASE_CPPFLAGS = $(OSITHREAD_DEFAULT_STACK_FLAGS_$(OSITHREAD_USE_DEFAULT_STACK))
 
 #---------------------------------------------------------------
 # Where to find the installed build tools
@@ -66,8 +65,7 @@ DBTOMENUH                  = $(PERL) $(TOOLS)/dbdToMenuH.pl
 REGISTERRECORDDEVICEDRIVER = $(PERL) $(TOOLS)/registerRecordDeviceDriver.pl
 CONVERTRELEASE             = $(PERL) $(call FIND_TOOL,convertRelease.pl)
 FULLPATHNAME               = $(PERL) $(TOOLS)/fullPathName.pl
-TAPTOJUNIT                 = $(PERL) $(TOOLS)/tap-to-junit-xml.pl
-GENVERSIONHEADER           = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG) $(QUESTION_FLAG)
+GENVERSIONHEADER           = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG)
 
 #---------------------------------------------------------------
 # tools for installing libraries and products

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
@@ -34,18 +36,18 @@ BASE_3_16 = YES
 # EPICS_VERSION must be a number >0 and <256
 EPICS_VERSION = 3
 
-# EPICS_REVISION must be a number >=0 and <256
+# EPICS_REVISION must be a number >=0 and <256 
 EPICS_REVISION = 16
 
-# EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 2
+# EPICS_MODIFICATION must be a number >=0 and <256 
+EPICS_MODIFICATION = 0
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included if zero
-EPICS_PATCH_LEVEL = 0
+EPICS_PATCH_LEVEL = 1
 
 # This will end in -DEV between official releases
-#EPICS_DEV_SNAPSHOT=-DEV
+EPICS_DEV_SNAPSHOT=-DEV
 #EPICS_DEV_SNAPSHOT=-pre1
 #EPICS_DEV_SNAPSHOT=-pre1-DEV
 #EPICS_DEV_SNAPSHOT=-pre2
@@ -54,7 +56,7 @@ EPICS_PATCH_LEVEL = 0
 #EPICS_DEV_SNAPSHOT=-rc1-DEV
 #EPICS_DEV_SNAPSHOT=-rc2
 #EPICS_DEV_SNAPSHOT=-rc2-DEV
-EPICS_DEV_SNAPSHOT=
+#EPICS_DEV_SNAPSHOT=
 
 # No changes should be needed below here
 
@@ -70,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_COMMON

@@ -7,6 +7,8 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #
+#  $Revision-Id$
+#
 #  CONFIG_COMMON
 #
 #  This file is to be maintained by the community.
@@ -76,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
@@ -93,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)
 
 #-------------------------------------------------------
@@ -346,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)
 

configure/CONFIG_ENV

@@ -7,6 +7,7 @@
 # and higher are distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
+#   $Revision-Id$
 #   Author: Andrew Johnson
 #   Date:   20 April 1995
 #
@@ -35,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=""

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_SITE

@@ -6,7 +6,8 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
-
+#
+#  $Revision-Id$
 #
 #  CONFIG_SITE  - Global site configuration file
 #
@@ -117,12 +118,6 @@ CROSS_COMPILER_TARGET_ARCHS=
 #  configure/os/CONFIG_SITE.<host>.Common files instead.
 CROSS_COMPILER_HOST_ARCHS=
 
-#  The 'runtests', 'tapfiles' and 'junitfiles' make targets normally only run
-#  self-tests for the EPICS_HOST_ARCH architecture. If the host can execute
-#  the self-test programs for any other cross-built architectures such as
-#  a -debug architecture, those architectures must be named in this variable:
-CROSS_COMPILER_RUNTEST_ARCHS=
-
 # Build shared libraries (DLLs on Windows).
 #  Must be either YES or NO.  Definitions in the target-specific
 #  os/CONFIG.Common.<target> and os/CONFIG_SITE.Common.<target> files may
@@ -174,5 +169,3 @@ GCC_PIPE = NO
 #  run at build-time, e.g. set the LD_LIBRARY_PATH environment variable.
 LINKER_USE_RPATH = YES
 
-# Overrides for the settings above may appear in a CONFIG_SITE.local file
--include $(CONFIG)/CONFIG_SITE.local

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
@@ -26,42 +27,29 @@
 
 # Time service:
 # EPICS_TIMEZONE
-#	Local timezone info for vxWorks and RTEMS.  The format is
-#	    <name>::<minutesWest>:<startDST>:<endDST>
-#	where <name> is only used by strftime() for %Z conversions,
-#	and <startDST> and <endDST> are mmddhh - that is month,day,hour
-#	e.g. for ANL in 2018: EPICS_TIMEZONE=CUS::360:031102:110402
-#	The future dates below assume the rules don't get changed;
-#	see http://www.timeanddate.com/time/dst/2018.html to check.
+#	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
-EPICS_TIMEZONE = CUS::360:031102:110402
-#EPICS_TIMEZONE = MET::-60:032502:102803
-#
 #	DST for 2019  US: Mar 10 - Nov 03
 #	              EU: Mar 31 - Oct 27
-#EPICS_TIMEZONE = CUS::360:031002:110302
-#EPICS_TIMEZONE = MET::-60:033102:102703
+#	(see: http://www.timeanddate.com/time/map/)
 #
-#	DST for 2020  US: Mar 08 - Nov 01
-#	              EU: Mar 29 - Oct 25
-#EPICS_TIMEZONE = CUS::360:030802:110102
-#EPICS_TIMEZONE = MET::-60:032902:102503
-#
-#	DST for 2021  US: Mar 14 - Nov 07
-#	              EU: Mar 28 - Oct 31
-#EPICS_TIMEZONE = CUS::360:031402:110702
-#EPICS_TIMEZONE = MET::-60:032802:103103
-#
-#	DST for 2022  US: Mar 13 - Nov 06
-#	              EU: Mar 27 - Oct 30
-#EPICS_TIMEZONE = CUS::360:031302:110602
-#EPICS_TIMEZONE = MET::-60:032702:103003
+# 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=..
 

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,7 +154,7 @@ 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)))

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)
@@ -82,9 +81,9 @@ else
 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 specifications and test result files
+#   Generate a test specification if any tests are defined.
 #
 ifneq (,$(strip $(TESTS)))
 TARGETS += testspec
 endif
 
-# Enable testing if this host can run tests on the current target
-ifneq (,$(findstring $(T_A),$(EPICS_HOST_ARCH) $(CROSS_COMPILER_RUNTEST_ARCHS)))
-RUNTESTS_ENABLED = YES
 TAPFILES += $(TESTSCRIPTS:.t=.tap)
-JUNITFILES += $(TAPFILES:.tap=.xml)
-endif
 
 #---------------------------------------------------------------
-#   Libraries
+#   Libraries 
 #
 
 LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS) $(TESTLIBNAME) \
@@ -133,18 +126,18 @@ LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS) $(TESTLIBNAME) \
 
 #	Main targets
 
-install: buildInstall
+install: buildInstall 
 
-buildInstall: build
+buildInstall : build 
 
 # Allows rebuild to work with parallel builds option, -j.
 install: $(patsubst rebuild,clean,$(filter rebuild,$(MAKECMDGOALS)))
 
 rebuild: clean install
 
-build: inc
+build : inc 
 
-build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODTARGETS) \
+build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODNAME) \
 	$(TARGETS) $(TESTSCRIPTS) $(INSTALL_LIB_INSTALLS)
 
 inc : $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS)
@@ -162,38 +155,31 @@ clean: build_clean
 
 build_clean:
 	$(ECHO) "Cleaning"
-	@$(RM) *.i *$(OBJ) *.a \
+	@$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) \
 	$(LIBNAME) $(TESTLIBNAME) $(SHRLIBNAME) $(TESTSHRLIBNAME) \
 	$(DLLSTUB_LIBNAME) $(TESTDLLSTUB_LIBNAME) \
 	$(LOADABLE_SHRLIBNAME) \
 	$(INC) $(TARGETS) $(TDS) $(CLEANS) \
 	*.out MakefileInclude *.manifest *.exp \
-	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) $(TESTPRODTARGETS) \
-	$(TESTSCRIPTS) $(TAPFILES) $(JUNITFILES)
+	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) \
+	$(TESTSCRIPTS) $(TAPFILES)
 ifdef RES
 	@$(RM) *$(RES)
 endif
 
-# Sort mkdir targets to remove duplicates & make parents first
-$(DIRECTORY_TARGETS):
-	$(MKDIR) $(sort $@)
+$(DIRECTORY_TARGETS) :
+	$(MKDIR) $@
 
-# Install LIB_INSTALLS libraries before linking executables
-$(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIB_INSTALLS)
-
-# Install built libraries too, unless Makefile says to wait
-ifneq ($(DELAY_INSTALL_LIBS),YES)
-$(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIBS) $(INSTALL_DLLSTUB_LIBS)
-endif
+$(PRODNAME): $(INSTALL_LIB_INSTALLS)
 
 # RELEASE file consistency checking
 checkRelease:
-	+$(CONVERTRELEASE) checkRelease
+	$(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
 
 #---------------------------------------------------------------
@@ -259,13 +245,15 @@ YACCOPT ?= $($*_YACCOPT)
 	$(MV) $*.tab.c $*.c
 	$(if $(findstring -d, $(YACCOPT)),$(MV) $*.tab.h $*.h,)
 
-# must be a separate rule since when not using '-d' the
+# must be a seperate rule since when not using '-d' the
 # prefix for .h will be different then .c
 %.h : %.c %.y
 
 %.c: %.l
+	@$(RM) $*.yy.c
+	$(LEX) $(LEXOPT) -t $< > $*.yy.c
 	@$(RM) $@
-	$(LEX) $(LEXOPT) -o$@ $<
+	$(MV) $*.yy.c $@
 
 #---------------------------------------------------------------
 # Libraries, shared/DLL and stubs
@@ -282,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)
@@ -324,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)
@@ -339,9 +319,7 @@ $(MODNAME): %$(MODEXT): %$(EXE)
 # Automated testing
 
 runtests: $(TESTSCRIPTS)
-ifdef RUNTESTS_ENABLED
 	-$(PERL) -MTest::Harness -e 'runtests @ARGV if @ARGV;' $^
-endif
 
 testspec: $(TESTSCRIPTS)
 	@$(RM) $@
@@ -351,35 +329,11 @@ testspec: $(TESTSCRIPTS)
 	$(if $(TESTFILES), @echo Files: $(TESTFILES) >> $@)
 	$(if $(TESTSPEC_$(OS_CLASS)), @echo "Harness: $(TESTSPEC_$(OS_CLASS))" >> $@)
 
-test-results: tapfiles
-ifneq ($(TAPFILES),)
-ifdef RUNTESTS_ENABLED
-	prove --failures --ext .tap --exec "$(CAT)" --color $(TAPFILES)
-endif
-
-CURRENT_TAPFILES := $(wildcard $(TAPFILES))
-CURRENT_JUNITFILES := $(wildcard $(JUNITFILES))
-endif
-
-clean-tests:
-ifneq ($(CURRENT_TAPFILES),)
-	$(RM) $(CURRENT_TAPFILES)
-endif
-ifneq ($(CURRENT_JUNITFILES),)
-	$(RM) $(CURRENT_JUNITFILES)
-endif
-
 tapfiles: $(TESTSCRIPTS) $(TAPFILES)
-junitfiles: $(JUNITFILES)
 
 # A .tap file is the output from running the associated test script
 %.tap: %.t
-ifdef RUNTESTS_ENABLED
 	-$(PERL) $< -tap > $@
-endif
-
-%.xml: %.tap
-	$(TAPTOJUNIT) --puretap --output $@ --input $< $*
 
 # If there's a perl test script (.plt) available, use it
 %.t: ../%.plt
@@ -390,7 +344,7 @@ endif
 # 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 header with version number from VCS
@@ -527,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 tapfiles clean-tests test-results junitfiles
-.PHONY: checkRelease warnRelease noCheckRelease FORCE
+.PHONY: runtests tapfiles checkRelease warnRelease noCheckRelease FORCE
 
-include $(CONFIG)/RULES_COMMON
-
-else
-    $(warning RULES_BUILD included more than once. \
-        Use 'make show-makefiles' to work out why.)
 endif # BASE_RULES_BUILD
+#	EOF RULES_BUILD

configure/RULES_COMMON

@@ -1,35 +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.
-
-# Protect against filenames containing colons (Windows)
-SAFE_MAKEFILES = $(subst :,__colon__,$(MAKEFILE_LIST))
-SHOW_MAKEFILES = $(SAFE_MAKEFILES:%=show-makefile.%)
-show-makefiles: $(SHOW_MAKEFILES)
-
-# The sort prevents warnings about duplicate targets:
-$(sort $(SHOW_MAKEFILES)): show-makefile.%:
-	@echo "    $(subst __colon__,:,$(@:show-makefile.%=%))"
-
-.PHONY: show-makefiles show-makefile.%
-
-# 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.%
-
-
-#  User specific rules
-#
--include $(HOME)/configure/RULES_USER

configure/RULES_DIRS

@@ -6,10 +6,14 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution. 
 #*************************************************************************
+#
+#  $Revision-Id$
+#
+
 
 ARCHS += $(BUILD_ARCHS)
 ACTIONS += inc build install buildInstall clean realclean archclean
-ACTIONS += runtests tapfiles clean-tests test-results junitfiles
+ACTIONS += runtests tapfiles
 
 dirActionArchTargets = $(foreach dir, $(DIRS), \
     $(foreach action, $(ACTIONS), \
@@ -92,4 +96,7 @@ $(ARCHS) $(ACTIONS) $(actionArchTargets) :%: \
 .PHONY : $(dirActionArchTargets)
 .PHONY : $(actionArchTargets)
 
-include $(CONFIG)/RULES_COMMON
+
+#  User specific rules
+#
+-include $(HOME)/configure/RULES_USER

configure/RULES_EXPAND

@@ -1,13 +1,4 @@
-#*************************************************************************
-# 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)
 
@@ -23,6 +14,8 @@ EXPANDFLAGS += $(addprefix -D ,$(EXPAND_VARS))
 # The names of files to be expanded must end with '@'
 EXPANDED = $(EXPAND:%@=%)
 
+buildInstall: $(EXPANDED)
+
 $(EXPANDED): %: %@
 	$(ECHO) "Expanding $< to $@"
 	@$(RM) $@
@@ -33,8 +26,7 @@ clean: expand_clean
 expand_clean:
 	@$(RM) $(EXPANDED)
 
-.PRECIOUS: $(EXPANDED)
-.PHONY: expand_clean
+.PHONY : expand_clean
 
 #---------------------------------------------------------------
 # Assemblies (files assembled from snippets)

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_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))), \
@@ -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))), \
@@ -129,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),)
 

configure/RULES_TOP

@@ -6,6 +6,9 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
+#
+# $Revision-Id$
+#
 
 include $(CONFIG)/RULES_DIRS
 
@@ -57,7 +60,6 @@ help:
 	@echo "                      Cannot be used within an O.<arch> dir"
 	@echo "     rebuild        - Same as clean install"
 	@echo "     archclean      - Removes O.<arch> dirs but not O.Common dir"
-	@echo "     runtests       - Run self-tests, summarize results"
 	@echo "\"Partial\" build targets supported by Makefiles:"
 	@echo "     host           - Builds and installs $(EPICS_HOST_ARCH) only."
 	@echo "     inc$(DIVIDER)<arch>     - Installs <arch> only header files."

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

@@ -1,5 +1,7 @@
 # CONFIG.Common.linux-arm_eb
 #
+# This file is maintained by the build community.
+#
 # Definitions for linux-arm_eb (big endian) target builds
 # Sites may override these definitions in CONFIG_SITE.Common.linux-arm_eb
 #-------------------------------------------------------

configure/os/CONFIG.Common.linux-arm_el

@@ -1,5 +1,7 @@
 # CONFIG.Common.linux-arm_el
 #
+# This file is maintained by the build community.
+#
 # Definitions for linux-arm_el (little endian) target builds
 # Sites may override these definitions in CONFIG_SITE.Common.linux-arm_el
 #-------------------------------------------------------

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,15 +26,13 @@ STATIC_LDFLAGS_YES= -Wl,-Bstatic
 STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic
 
-# Set runtime path for shared libraries if USE_RPATH=YES and STATIC_BUILD=NO
-SHRLIBDIR_RPATH_LDFLAGS_YES_NO = $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
-SHRLIBDIR_LDFLAGS += \
-    $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
+# Set runtime path for shared libraries
+SHRLIBDIR_RPATH_LDFLAGS_YES += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
+SHRLIBDIR_LDFLAGS += $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
 
-# Set runtime path for products if USE_RPATH=YES and STATIC_BUILD=NO
-PRODDIR_RPATH_LDFLAGS_YES_NO = $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
-PRODDIR_LDFLAGS += \
-    $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
+# Set runtime path for products
+PRODDIR_RPATH_LDFLAGS_YES += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
+PRODDIR_LDFLAGS += $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
 
 # Link libraries controlled by COMMANDLINE_LIBRARY
 # The newest Linux versions only need readline, older ones need both

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

configure/os/CONFIG.Common.vxWorks-68040

@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-68040
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-68040 target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-68040
 #-------------------------------------------------------

configure/os/CONFIG.Common.vxWorks-68040-debug

@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-68040-debug
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-68040-debug target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-68040-debug
 #-------------------------------------------------------

configure/os/CONFIG.Common.vxWorks-68040lc

@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-68040lc
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-68040lc target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-68040lc
 #-------------------------------------------------------

configure/os/CONFIG.Common.vxWorks-68040lc-debug

@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-68040lc-debug
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-68040lc-debug target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-68040lc-debug
 #-------------------------------------------------------

configure/os/CONFIG.Common.vxWorks-68060

@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-68060
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-68060 target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-68060
 #-------------------------------------------------------

configure/os/CONFIG.Common.vxWorks-68060-debug

@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-68060-debug
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-68060-debug target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-68060-debug
 #-------------------------------------------------------

configure/os/CONFIG.Common.vxWorks-mpc8540

@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-mpc8540
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-mpc8540 target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-mpc8540
 #-------------------------------------------------------

configure/os/CONFIG.Common.vxWorks-mpc8540-debug

@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-mpc8540-debug
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-mpc8540-debug target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-mpc8540-debug
 #-------------------------------------------------------

configure/os/CONFIG.Common.vxWorks-mpc8548

@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-mpc8548
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-mpc8548 target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-mpc8548
 #-------------------------------------------------------

configure/os/CONFIG.Common.vxWorks-mpc8548-debug

@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-mpc8548-debug
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-mpc8548-debug targets.
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-mpc8548-debug
 #-------------------------------------------------------

configure/os/CONFIG.Common.vxWorks-pentium

@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-pentium
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-pentium target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-pentium
 #-------------------------------------------------------

configure/os/CONFIG.Common.vxWorks-pentium-debug

@@ -1,5 +1,8 @@
 # CONFIG.Common.vxWorks-pentium-debug
 #
+# $Revision-Id$
+# This file is maintained by the build community.
+#
 # Definitions for vxWorks-pentium-debug target archs
 # Sites may override these definitions in CONFIG_SITE.Common.vxWorks-pentium-debug
 #-------------------------------------------------------