allow to add new error symbols from dynamicly loaded modules

.appveyor.yml

@@ -1,18 +1,11 @@
-# Appveyor configuration file for EPICS Base 7 builds
-# (see also https://github.com/epics-base/ci-scripts)
+# AppVeyor configuration for EPICS Base
+
+# Ralph Lange <ralph.lange@gmx.de>
+# Copyright (c) 2016-2017 ITER Organization
 
 # 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        #
 #---------------------------------#
@@ -23,16 +16,13 @@ init:
   - git config --global core.autocrlf true
 
 # Set clone depth (do not fetch complete history)
-clone_depth: 5
+clone_depth: 50
 
 # Skipping commits affecting only specific files
 skip_commits:
   files:
     - 'documentation/*'
-    - 'startup/*'
-    - '.github/*'
-    - '.tools/*'
-    - '.gitattributes'
+    - 'templates/*'
     - '**/*.html'
     - '**/*.md'
 
@@ -40,8 +30,6 @@ skip_commits:
 #   build matrix configuration    #
 #---------------------------------#
 
-image: Visual Studio 2015
-
 # Build Configurations: dll/static, regular/debug
 configuration:
   - dynamic
@@ -49,49 +37,34 @@ configuration:
   - dynamic-debug
   - static-debug
 
-# Environment variables: compiler toolchain, base version, setup file, ...
+# Environment variables: compiler toolchain
 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
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+  - 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
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
-# Platform: processor architecture
+# Platform: architecture
 platform:
   - x86
   - x64
 
-# Matrix configuration: exclude sets of jobs
+# Matrix configuration: allow specific failing jobs
 matrix:
   exclude:
-  # VS2012 and older installs don't have the 64 bit compiler
+  # VS Express installs don't have the 64 bit compiler
   - platform: x64
-    CMP: vs2012
-  - platform: x64
-    CMP: vs2010
-  # Exclude more jobs to reduce build time
-  # Skip 32-bit for "middle-aged" compilers
-  - platform: x86
-    CMP: vs2017
-  - platform: x86
-    CMP: vs2015
-  # MinGW debug builds use the same libraries, unlike VS
-  - configuration: dynamic-debug
-    CMP: gcc
+    TOOLCHAIN: 10.0
+  # Cygwin static-debug has compiler problems
   - configuration: static-debug
-    CMP: gcc
+    TOOLCHAIN: cygwin
+
 
 #---------------------------------#
 #     building & testing          #
@@ -99,38 +72,13 @@ matrix:
 
 install:
   - cmd: git submodule update --init --recursive
-  - cmd: pip install git+https://github.com/mdavidsaver/ci-core-dumper#egg=ci-core-dumper
-  - cmd: python .ci/cue.py prepare
+  - cmd: .ci/appveyor-prepare.bat
 
 build_script:
-  - cmd: python .ci/cue.py build
+  - cmd: .ci/appveyor-make.bat
 
 test_script:
-  - cmd: python -m ci_core_dumper install
-  - cmd: python .ci/cue.py -T 20M test
-
-on_finish:
-  - ps: Get-ChildItem *.tap -Recurse -Force | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
-  - cmd: python .ci/cue.py build test-results -s
-
-on_failure:
-  - cmd: python -m ci_core_dumper report
-
-#---------------------------------#
-#         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'))
+  - cmd: .ci/appveyor-make.bat runtests
 
 #---------------------------------#
 #         notifications           #

.appveyor/epics-base-7.yml

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

.ci/appveyor-make.bat

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

.ci/appveyor-prepare.bat

@@ -0,0 +1,63 @@
+:: 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
+    )
+)
+
+echo [INFO] Installing Make 4.2.1 from ANL web site
+curl -fsS --retry 3 -o C:\tools\make-4.2.1.zip https://epics.anl.gov/download/tools/make-4.2.1-win64.zip
+cd \tools
+"C:\Program Files\7-Zip\7z" e make-4.2.1.zip

.ci/checkout-modules.sh

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

.ci/travis-build.sh

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

.gitattributes

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

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

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

.gitignore

@@ -11,8 +11,6 @@
 /modules/Makefile.local
 O.*/
 /QtC-*
-/.vscode/
 *.orig
 *.log
 .*.swp
-.DS_Store

.gitmodules

@@ -22,10 +22,6 @@
     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
 [submodule "modules/pcas"]
-    path = modules/pcas
-    url = https://github.com/epics-modules/pcas
+	path = modules/pcas
+	url = https://github.com/epics-modules/pcas

.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,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # Make tar for git repo w/ one level of sub modules.
 #
@@ -9,18 +9,14 @@ die() {
   exit 1
 }
 
-maybedie() {
-  if [ "$DEVMODE" ]; then
-    echo "Warning: $1" >&2
-  else
-    echo "Error: $1" >&2
-    exit 1
-  fi
-}
+TOPREV="$1"
+FINALTAR="$2"
+PREFIX="$3"
 
-usage() {
+if ! [ "$TOPREV" ]
+then
    cat <<EOF >&2
-usage: $0 [-v] [-s] <rev> [<outfile> [<prefix>]]
+usage: $0 <rev> [<outfile> [<prefix>]]
 
   <rev> may be any git revision spec. (tag, branch, or commit id).
 
@@ -28,33 +24,9 @@ usage: $0 [-v] [-s] <rev> [<outfile> [<prefix>]]
   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
+fi
 
 case "$FINALTAR" in
 "")
@@ -87,13 +59,16 @@ case "$PREFIX" in
 esac
 
 # Check for both <tag> and R<tag>
-if ! [ `git tag -l $TOPREV` ]
+if [ "$TOPREV" = "HEAD" ]
+then
+  true
+elif ! [ `git tag -l $TOPREV` ]
 then
   if [ `git tag -l R$TOPREV` ]
   then
     TOPREV="R$TOPREV"
   else
-    maybedie "No tags exist '$TOPREV' or 'R$TOPREV'"
+    die "No tags exist '$TOPREV' or 'R$TOPREV'"
   fi
 fi
 
@@ -114,17 +89,11 @@ git archive --prefix=$PREFIX $TOPREV | tar -C "$TDIR"/tar -x
 #
 # 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}' | \
+git ls-tree -r $TOPREV | awk '/^[0-9]+ commit / {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
+    git -C $MODDIR archive --prefix=${PREFIX}${MODDIR}/ $HASH | tar -C "$TDIR"/tar -x
 done
 
 # make a list of files copied and filter out undesirables
@@ -136,17 +105,13 @@ sed -i -e 's|^\./||' "$TDIR"/list.1
 
 # Exclude files
 sed \
-  -e '/\/\.ci\//d' \
-  -e '/\/\.ci-local\//d' \
+  -e '/\/\.\?ci\//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
@@ -164,5 +129,5 @@ 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"
+    echo "Oops! Tarfile diff against plan shown above"
 fi

.travis.yml

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

configure/CONFIG

@@ -58,9 +58,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

configure/CONFIG.gnuCommon

@@ -3,7 +3,8 @@
 #     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. 
 #*************************************************************************
 
@@ -31,7 +32,7 @@ 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 -Werror-implicit-function-declaration
+WARN_CFLAGS_YES = -Wall
 WARN_CFLAGS_NO = -w
 OPT_CFLAGS_YES = -O3 -g
 OPT_CFLAGS_NO = -g

configure/CONFIG_BASE

@@ -42,10 +42,9 @@ FIND_TOOL = $(firstword $(wildcard $(TOOLS)/$(1) $(EPICS_BASE)/src/tools/$(1)))
 PODTOHTML        = $(PERL) $(TOOLS)/podToHtml.pl
 CONVERTRELEASE   = $(PERL) $(call FIND_TOOL,convertRelease.pl)
 FULLPATHNAME     = $(PERL) $(TOOLS)/fullPathName.pl
+TAPTOJUNIT       = $(PERL) $(TOOLS)/tap-to-junit-xml.pl
 GENVERSIONHEADER = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG) $(QUESTION_FLAG)
 
-MAKERPATH = $(PYTHON) $(TOOLS)/makeRPath.py
-
 #---------------------------------------------------------------
 # tools for installing libraries and products
 INSTALL = $(PERL) $(TOOLS)/installEpics.pl $(QUIET_FLAG)
@@ -61,18 +60,3 @@ REPLACEVAR = $(PERL) $(TOOLS)/replaceVAR.pl
 # tools for cleaning out unwanted files
 CVSCLEAN = $(call FIND_TOOL,cvsclean.pl)
 DEPCLEAN = $(call FIND_TOOL,depclean.pl)
-
-#---------------------------------------------------------------
-# Tools for testing
-TAPS_FAILED_LOG       = .taps-failed.log
-TESTS_FAILED_LOG      = .tests-failed.log
-TESTS_FAILED_PATH     = $(abspath $(TOP)/$(TESTS_FAILED_LOG))
-
-TAPTOJUNIT            = $(PERL) $(TOOLS)/tap-to-junit-xml.pl
-PROVE                 = $(PERL) $(TOOLS)/epicsProve.pl --failures --color
-PROVE.tap             = $(PROVE) --ext .tap --exec "$(CAT)"
-TESTFAILURES          = $(PERL) $(TOOLS)/testFailures.pl
-SHOWTESTFAILURES      = $(TESTFAILURES) $(TESTS_FAILED_PATH) $(TAPS_FAILED_LOG)
-
-PROVE_FAILURE         = echo $(abspath .)>> $(TESTS_FAILED_PATH)
-TAPFILE_FAILURE       = echo $@>> $(TAPS_FAILED_LOG)

configure/CONFIG_BASE_VERSION

@@ -48,7 +48,7 @@ EPICS_VERSION = 7
 EPICS_REVISION = 0
 
 # EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 5
+EPICS_MODIFICATION = 3
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included in the official EPICS version number if zero
@@ -56,7 +56,16 @@ 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)
+#EPICS_DEV_SNAPSHOT=
 EPICS_DEV_SNAPSHOT=-DEV
+#EPICS_DEV_SNAPSHOT=-pre1
+#EPICS_DEV_SNAPSHOT=-pre1-DEV
+#EPICS_DEV_SNAPSHOT=-pre2
+#EPICS_DEV_SNAPSHOT=-pre2-DEV
+#EPICS_DEV_SNAPSHOT=-rc1
+#EPICS_DEV_SNAPSHOT=-rc1-DEV
+#EPICS_DEV_SNAPSHOT=-rc2
+#EPICS_DEV_SNAPSHOT=-rc2-DEV
 
 # No changes should be needed below here
 

configure/CONFIG_COMMON

@@ -38,8 +38,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
@@ -80,12 +78,12 @@ IOCS_APPL_TOP               = $(shell $(FULLPATHNAME) $(INSTALL_LOCATION))
 #-------------------------------------------------------
 # Silencing the build - suppress messages during 'make -s'
 NOP = :
-ECHO = @$(if $(filter -s,$(MFLAGS)),$(NOP),echo)
-QUIET_FLAG := $(if $(filter -s,$(MFLAGS)),-q,)
+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 $(filter -q,$(MFLAGS)),-i,)
+QUESTION_FLAG := $(if $(findstring q,$(MFLAGS)),-i,)
 
 #-------------------------------------------------------
 ifdef T_A
@@ -306,7 +304,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
@@ -378,14 +376,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)/%)
 

configure/CONFIG_ENV

@@ -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. 
 #*************************************************************************
 #   Author: Andrew Johnson
 #   Date:   20 April 1995
@@ -53,3 +54,8 @@ EPICS_IOC_IGNORE_SERVERS=""
 # 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_SITE

@@ -22,7 +22,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 +51,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 +67,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 +76,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)
@@ -157,9 +161,7 @@ USE_POSIX_THREAD_PRIORITY_SCHEDULING = YES
 
 # Site version number, if set will append '-' and this string to the
 #  EPICS version number string that is reported by many tools.
-ifeq ($(INSTALL_LOCATION),$(EPICS_BASE))
-EPICS_SITE_VERSION=$(shell $(PERL) -MPOSIX -e 'print strftime "%Y-%m-%d", localtime')
-endif
+EPICS_SITE_VERSION=$(shell $(PERL) -MPOSIX -e 'print strftime "%Y-%m-%d $(shell git describe --tags --dirty)", localtime')
 
 # For GNU compiler, use pipes rather than temporary files for
 #  communication between the various stages of compilation.
@@ -167,18 +169,10 @@ endif
 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

@@ -24,40 +24,40 @@
 
 #  Site-specific environment settings
 
-## Time service:
-# EPICS_TZ
-#       Local timezone rules for vxWorks and RTEMS. The value follows the Posix
-#       TZ environment variable's Mm.n.d/h format (see the IBM link below for
-#       details). If TZ hasn't already been set when the osdTime timeRegister()
-#       C++ static constructor runs, this parameter will be copied into the TZ
-#       environment variable. Once the OS clock has been synchronized to NTP the
-#       routine tz2timezone() will be run to convert TZ into the TIMEZONE
-#       variable format that VxWorks needs.
-#               https://developer.ibm.com/articles/au-aix-posix/
-
-# Japan Standard Time, no DST:
-#EPICS_TZ = "JST-9"
-
-# Central European (Summer) Time:
-#EPICS_TZ = "CET-1CEST,M3.5.0/2,M10.5.0/3"
-
-# Greenwich Mean/British Summer Time:
-#EPICS_TZ = "GMT0BST,M3.5.0/1,M10.5.0/2"
-
-# US Eastern Standard/Daylight Time:
-#EPICS_TZ = "EST5EDT,M3.2.0/2,M11.1.0/2"
-
-# US Central Standard/Daylight Time:
-EPICS_TZ = "CST6CDT,M3.2.0/2,M11.1.0/2"
-
-# US Mountain Standard/Daylight Time:
-#EPICS_TZ = "MST7MDT,M3.2.0/2,M11.1.0/2"
-
-# US Pacific Standard/Daylight Time:
-#EPICS_TZ = "PST8PDT,M3.2.0/2,M11.1.0/2"
-
-# US Hawaiian Standard Time, no DST:
-#EPICS_TZ = "HST10"
+# Time service:
+# EPICS_TIMEZONE
+#	Local timezone info for vxWorks and RTEMS.  The format is
+#	    <name>::<minutesWest>:<startDST>:<endDST>
+#	where <name> is only used by strftime() for %Z conversions,
+#	and <startDST> and <endDST> are mmddhh - that is month,day,hour
+#	e.g. for ANL in 2018: EPICS_TIMEZONE=CUS::360:031102:110402
+#	The future dates below assume the rules don't get changed;
+#	see http://www.timeanddate.com/time/dst/2018.html to check.
+#
+#	DST for 2019  US: Mar 10 - Nov 03
+#	              EU: Mar 31 - Oct 27
+EPICS_TIMEZONE = CUS::360:031002:110302
+#EPICS_TIMEZONE = MET::-60:033102:102703
+#
+#	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
+#
+#	DST for 2023  US: Mar 13 - Nov 06
+#	              EU: Mar 27 - Oct 30
+#EPICS_TIMEZONE = CUS::360:031202:110502
+#EPICS_TIMEZONE = MET::-60:032602:102903
 
 # EPICS_TS_NTP_INET
 #	NTP time server ip address for VxWorks and RTEMS.

configure/Makefile

@@ -20,14 +20,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/RULES.Db

@@ -161,13 +161,13 @@ 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 +196,21 @@ endif
 #---------------------------------------------------------------
 # build dependancies, clean rule
 
-inc: $(COMMON_INC) $(INSTALL_INC) $(COMMON_DBDS) $(COMMON_DBDCATS) \
-	$(INSTALL_DBDS) $(INSTALL_DBD_INSTALLS)
+inc : $(COMMON_INC) $(INSTALL_INC)
 
-build: $(COMMON_DBS) $(INSTALL_DBS) \
+build : $(COMMON_DBDS) $(COMMON_DBS) $(COMMON_DBDCATS) \
+	$(INSTALL_DBDS) $(INSTALL_DBS) \
 	$(DBDDEPENDS_FILES) $(TARGETS) \
-	$(INSTALL_DB_INSTALLS)
+	$(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 +389,7 @@ $(COMMON_DIR)/%.dbd: ../%Include.dbd
 
 # Make DBDCAT file x depend on x_DBD source files
 define  DBDCAT_template
-$$(COMMON_DIR)/$(1).dbd: ../Makefile $$(foreach file, $$($(1)_DBD),$$(DBDCAT_SOURCE) )
+$$(COMMON_DIR)/$(1).dbd : ../Makefile $$(foreach file, $$($(1)_DBD),$$(DBDCAT_SOURCE) )
 endef
 $(foreach name,$(subst .dbd,,$(DBDCAT)), $(eval $(call DBDCAT_template,$(name))))
 
@@ -418,7 +418,7 @@ $(INSTALL_DBD)/%: ../%
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 define  DBD_INSTALLS_template
-$$(INSTALL_DBD)/$$(notdir $(1)): $(1)
+$$(INSTALL_DBD)/$$(notdir $(1)) : $(1)
 	$(ECHO) "Installing $$@"
 	@$$(INSTALL) -d -m $$(INSTALL_PERMISSIONS) $$^ $$(INSTALL_DBD)
 endef
@@ -436,7 +436,7 @@ $(COMMON_DIR)/%.html: %.dbd.pod
 
 $(COMMON_DIR)/%.html: %.pod
 	@$(RM) $(notdir $@)
-	$(PODTOHTML) -s -s -o $(notdir $@) $<
+	$(PODTOHTML) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
 $(COMMON_DIR)/%.html: %.pm
@@ -460,7 +460,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 +514,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 +539,4 @@ $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))
 	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ $< $(basename $@) $(IOCS_APPL_TOP)
 
 .PRECIOUS: %_registerRecordDeviceDriver.cpp
+

configure/RULES_BUILD

@@ -32,12 +32,12 @@ vpath %.l $(USR_VPATH) $(ALL_SRC_DIRS)
 include $(CONFIG)/CONFIG_ADDONS
 
 #---------------------------------------------------------------
+# Set PROD, TESTPROD, OBJS, and LIBRARY
 
 SCRIPTS_HOST += $(PERL_SCRIPTS)
 # PERL_SCRIPTS are installed into existing $(INSTALL_BIN) for Host systems
 
-# Host targets can compile and run programs
-ifneq (,$(findstring Host,$(VALID_BUILDS)))
+ifeq ($(findstring Host,$(VALID_BUILDS)),Host)
 LIBRARY += $(LIBRARY_HOST)
 LOADABLE_LIBRARY += $(LOADABLE_LIBRARY_HOST)
 OBJS += $(OBJS_HOST)
@@ -49,21 +49,7 @@ TESTSCRIPTS += $(TESTSCRIPTS_HOST)
 TESTPROD += $(TESTPROD_HOST)
 endif
 
-# Command targets have a command line and support main()
-ifneq (,$(findstring Command,$(VALID_BUILDS)))
-LIBRARY += $(LIBRARY_CMD)
-LOADABLE_LIBRARY += $(LOADABLE_LIBRARY_CMD)
-OBJS += $(OBJS_CMD)
-PROD += $(PROD_CMD)
-SCRIPTS += $(SCRIPTS_CMD)
-TARGETS += $(TARGETS_CMD)
-TESTLIBRARY += $(TESTLIBRARY_CMD)
-TESTSCRIPTS += $(TESTSCRIPTS_CMD)
-TESTPROD += $(TESTPROD_CMD)
-endif
-
-# Ioc targets can run IOCs
-ifneq (,$(findstring Ioc,$(VALID_BUILDS)))
+ifeq ($(findstring Ioc,$(VALID_BUILDS)),Ioc)
 LIBRARY += $(LIBRARY_IOC)
 LOADABLE_LIBRARY += $(LOADABLE_LIBRARY_IOC)
 OBJS += $(OBJS_IOC)
@@ -89,7 +75,7 @@ HTMLS_DIR ?= .
 #	First target
 
 all: install
-ifeq ($(EPICS_HOST_ARCH),$(T_A))
+ifeq ($(EPICS_HOST_ARCH),$T_A)
 host: install
 else
 # Do nothing
@@ -120,20 +106,17 @@ endif
 #---------------------------------------------------------------
 # Include defines and rules for prod, library and test* targets
 
-ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) \
-        $(LOADABLE_LIBRARY)))
+#ifneq (,$(strip $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRARY) ))
 include $(CONFIG)/RULES_TARGET
-endif
+#endif
 
 #---------------------------------------------------------------
 # Read dependency files
 
-ifneq (inc,$(strip $(MAKECMDGOALS)))
 ifneq (,$(strip $(HDEPENDS_FILES)))
 $(filter-out $(wildcard *$(DEP)), $(HDEPENDS_FILES)): | $(COMMON_INC)
 -include $(HDEPENDS_FILES)
 endif
-endif
 
 #---------------------------------------------------------------
 #   Products and Object libraries
@@ -142,17 +125,17 @@ PRODTARGETS += $(PRODNAME) $(MUNCHNAME) $(CTDT_SRCS) $(CTDT_OBJS) $(NMS)
 TESTPRODTARGETS += $(TESTPRODNAME) $(TESTMUNCHNAME)
 
 #---------------------------------------------------------------
-#   Test result files
+#   Test specifications and test result files
 #
+ifneq (,$(strip $(TESTS)))
+TARGETS += testspec
+endif
 
-# Enable testing if this host can run tests for the current target
-ifneq (,$(filter $(T_A), $(EPICS_HOST_ARCH) $(CROSS_COMPILER_RUNTEST_ARCHS)))
+# Enable testing if this host can run tests on the current target
+ifneq (,$(findstring $(T_A),$(EPICS_HOST_ARCH) $(CROSS_COMPILER_RUNTEST_ARCHS)))
 RUNTESTS_ENABLED = YES
-TESTSCRIPTS.t = $(filter %.t, $(TESTSCRIPTS))
-TAPFILES.t += $(TESTSCRIPTS.t:.t=.tap)
-JUNITFILES.t += $(TESTSCRIPTS.t:.t=-results.xml)
-TAPFILES += $(TAPFILES.t)
-JUNITFILES += $(JUNITFILES.t)
+TAPFILES += $(TESTSCRIPTS:.t=.tap)
+JUNITFILES += $(TAPFILES:.tap=.xml)
 endif
 
 #---------------------------------------------------------------
@@ -181,14 +164,14 @@ build: inc
 build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODTARGETS) \
 	$(TARGETS) $(TESTSCRIPTS) $(INSTALL_LIB_INSTALLS)
 
-inc: $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS) $(INSTALLS_CFG) \
-	$(INSTALL_HTMLS) $(INSTALLS_PERL_MODULES) $(INSTALL_SCRIPTS)
+inc : $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS)
 
-buildInstall: \
-	$(INSTALL_PROD) $(INSTALL_MUNCHS) \
+buildInstall : \
+	$(INSTALL_SCRIPTS) $(INSTALL_PROD) $(INSTALL_MUNCHS) \
 	$(INSTALL_TCLLIBS) $(INSTALL_TCLINDEX) \
-	$(INSTALL_DOCS) \
 	$(INSTALL_OBJS) \
+	$(INSTALL_DOCS) \
+	$(INSTALL_HTMLS) \
 	$(INSTALL_TEMPLATE) \
 	$(INSTALL_BIN_INSTALLS)
 
@@ -208,9 +191,9 @@ ifdef RES
 	@$(RM) *$(RES)
 endif
 
-# Sort directories to remove duplicates & make parents first
-$(sort $(DIRECTORY_TARGETS)):
-	$(MKDIR) $@
+# Sort mkdir targets to remove duplicates & make parents first
+$(DIRECTORY_TARGETS):
+	$(MKDIR) $(sort $@)
 
 # Install LIB_INSTALLS libraries before linking executables
 $(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIB_INSTALLS)
@@ -224,19 +207,12 @@ endif
 checkRelease:
 	+$(CONVERTRELEASE) checkRelease
 warnRelease:
-	$(CONVERTRELEASE) checkRelease
+	-$(CONVERTRELEASE) checkRelease
 noCheckRelease:
 ifeq ($(EPICS_HOST_ARCH),$(T_A))
 	$(info Warning: RELEASE file consistency checks have been disabled)
 endif
 
-# $(FINAL_DIR) signals eventual install locations to makeRPath script
-$(TESTPRODNAME): FINAL_DIR=.
-$(PRODNAME): FINAL_DIR=$(INSTALL_BIN)
-$(TESTSHRLIBNAME): FINAL_DIR=.
-$(SHRLIBNAME): FINAL_DIR=$(INSTALL_SHRLIB)
-$(LOADABLE_SHRLIBNAME): FINAL_DIR=$(INSTALL_SHRLIB)
-
 #---------------------------------------------------------------
 #  The order of the following rules is
 #  VERY IMPORTANT !!!!
@@ -248,7 +224,7 @@ $(TESTPRODNAME) $(PRODNAME): %$(EXE):
 	$(DEBUGCMD) $(LINK.cpp)
 	$(MT_EXE_COMMAND)
 
-%_ctdt$(OBJ): %_ctdt.c
+%_ctdt$(OBJ) : %_ctdt.c
 	@$(RM) $@
 	$(COMPILE.ctdt) $<
 
@@ -266,9 +242,9 @@ $(TESTPRODNAME) $(PRODNAME): %$(EXE):
 
 # Cancel GNUMake's built-in rules, which don't have our _INC
 # dependencies so could get used in some circumstances (gdd)
-%.o: %.c
-%.o: %.cc
-%.o: %.cpp
+%.o : %.c
+%.o : %.cc
+%.o : %.cpp
 
 # Include files are order-only prerequisites for compilation:
 %$(OBJ): %.c | $(COMMON_INC) $(INSTALL_INC)
@@ -302,7 +278,7 @@ YACCOPT ?= $($*_YACCOPT)
 
 # must be a separate rule since when not using '-d' the
 # prefix for .h will be different then .c
-%.h: %.c %.y
+%.h : %.c %.y
 
 %.c: %.l
 	@$(RM) $@
@@ -385,24 +361,23 @@ $(MODNAME): %$(MODEXT): %$(EXE)
 #---------------------------------------------------------------
 # Automated testing
 
-runtests: run-tap-tests
-run-tap-tests: $(TESTSCRIPTS.t)
-ifneq ($(TESTSCRIPTS.t),)
+runtests: $(TESTSCRIPTS)
 ifdef RUNTESTS_ENABLED
-	$(ECHO) "$(PROVE) $^"
-	@$(PROVE) $^ || $(PROVE_FAILURE)
-endif
+	-$(PERL) -MTest::Harness -e 'runtests @ARGV if @ARGV;' $^
 endif
 
-tapfiles: $(TAPFILES)
-junitfiles: $(JUNITFILES)
+testspec: $(TESTSCRIPTS)
+	@$(RM) $@
+	@echo OS-class: $(OS_CLASS) > $@
+	@echo Target-arch: $(T_A) >> $@
+	$(if $^, @echo Tests: $^ >> $@)
+	$(if $(TESTFILES), @echo Files: $(TESTFILES) >> $@)
+	$(if $(TESTSPEC_$(OS_CLASS)), @echo "Harness: $(TESTSPEC_$(OS_CLASS))" >> $@)
 
-test-results: tap-results
-tap-results: $(TAPFILES)
-ifneq ($(strip $(TAPFILES)),)
+test-results: tapfiles
+ifneq ($(TAPFILES),)
 ifdef RUNTESTS_ENABLED
-	$(ECHO) "$(PROVE.tap) $^"
-	@$(PROVE.tap) $^ || $(PROVE_FAILURE)
+	prove --failures --ext .tap --exec "$(CAT)" --color $(TAPFILES)
 endif
 
 CURRENT_TAPFILES := $(wildcard $(TAPFILES))
@@ -410,21 +385,23 @@ CURRENT_JUNITFILES := $(wildcard $(JUNITFILES))
 endif
 
 clean-tests:
-ifneq ($(CURRENT_TAPFILES)$(TAPS_FAILED_LOG),)
-	$(RM) $(CURRENT_TAPFILES) $(TAPS_FAILED_LOG)
+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
-$(TAPFILES.t): %.tap: %.t
+%.tap: %.t
 ifdef RUNTESTS_ENABLED
-	$(ECHO) "$(PERL) $< -tap > $@"
-	@$(PERL) $< -tap > $@ || $(TAPFILE_FAILURE)
+	-$(PERL) $< -tap > $@
 endif
 
-$(JUNITFILES.t): %-results.xml: %.tap
+%.xml: %.tap
 	$(TAPTOJUNIT) --puretap --output $@ --input $< $*
 
 # If there's a perl test script (.plt) available, use it
@@ -439,23 +416,6 @@ $(JUNITFILES.t): %-results.xml: %.tap
 	$(PERL) $(TOOLS)/makeTestfile.pl $(T_A) $(EPICS_HOST_ARCH) $@ $<
 
 #---------------------------------------------------------------
-# 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),)
@@ -467,14 +427,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
@@ -548,19 +508,19 @@ $(INSTALL_CONFIG)/%: ../%
 	@$(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)
 
@@ -598,8 +558,8 @@ include $(CONFIG)/RULES_EXPAND
 .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 clean-tests test-results junitfiles
+.PHONY: checkRelease warnRelease noCheckRelease FORCE
 
 include $(CONFIG)/RULES_COMMON
 

configure/RULES_DIRS

@@ -4,7 +4,7 @@
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
-# in the file LICENSE that is included with this distribution.
+# in the file LICENSE that is included with this distribution. 
 #*************************************************************************
 
 ARCHS += $(BUILD_ARCHS)
@@ -54,7 +54,7 @@ $(foreach dir, $(DIRS), \
 
 define DEP_template2
 $(1)$$(DIVIDER)$(2) : $$(foreach ddir, $$($(1)_DEPEND_DIRS), \
-    $$(addsuffix $$(DIVIDER)$(2),$$(ddir))) | before-$(2)
+    $$(addsuffix $$(DIVIDER)$(2),$$(ddir)))
 endef
 $(foreach action, $(ACTIONS), \
     $(foreach dir, $(DIRS), \
@@ -79,24 +79,18 @@ $(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 : $(dirActionTargets) $(dirArchTargets)
-.PHONY : $(dirActionArchTargets)
-.PHONY : $(actionArchTargets)
+
+.PHONY: $(DIRS) all host rebuild
+.PHONY: $(ARCHS) $(ACTIONS)
+.PHONY: $(dirActionTargets) $(dirArchTargets)
+.PHONY: $(dirActionArchTargets)
+.PHONY: $(actionArchTargets)
 
 include $(CONFIG)/RULES_COMMON

configure/RULES_EXPAND

@@ -12,72 +12,28 @@
 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)/%)
 
 $(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)
+.PRECIOUS: $(EXPANDED)
 .PHONY: expand_clean
 
 #---------------------------------------------------------------
@@ -86,10 +42,8 @@ expand_clean:
 ASSEMBLE_TOOL ?= $(PERL) $(TOOLS)/assembleSnippets.pl
 
 define COMMON_ASSEMBLY_template
-ifneq '$$($1_PATTERN)' ''
 $1_SNIPPETS += $$(foreach dir, .. $$(SRC_DIRS), \
     $$(wildcard $$(dir)/$$($1_PATTERN)))
-endif
 $(COMMON_DIR)/$1: $$($1_SNIPPETS)
 	$(ECHO) "Assembling common file $$@ from snippets"
 	@$(RM) $1
@@ -100,10 +54,8 @@ $(foreach asy, $(COMMON_ASSEMBLIES), \
     $(eval $(call COMMON_ASSEMBLY_template,$(strip $(asy)))))
 
 define ASSEMBLY_template
-ifneq '$$($1_PATTERN)' ''
 $1_SNIPPETS += $$(foreach dir, .. $$(SRC_DIRS), \
     $$(wildcard $$(dir)/$$($1_PATTERN)))
-endif
 $1: $$($1_SNIPPETS)
 	$(ECHO) "Assembling file $$@ from snippets"
 	@$(RM) $$@
@@ -118,3 +70,4 @@ $1$(DEP):
 endef
 $(foreach asy, $(sort $(COMMON_ASSEMBLIES) $(ASSEMBLIES)), \
     $(eval $(call ASSEMBLY_DEP_template,$(strip $(asy)))))
+

configure/RULES_MODULES

@@ -23,8 +23,7 @@
 #           -include $(TOP)/../CONFIG_SITE.local
 
 # Add checked-out submodules to DIRS
-LIVE_SUBMODULES = $(subst /Makefile,,$(wildcard $(addsuffix /Makefile, $(SUBMODULES))))
-DIRS += $(LIVE_SUBMODULES)
+DIRS += $(subst /Makefile,,$(wildcard $(addsuffix /Makefile, $(SUBMODULES))))
 
 include $(CONFIG)/RULES_DIRS
 
@@ -46,10 +45,3 @@ realclean:
 	$(RM) $(wildcard RELEASE.*.local)
 
 .PHONY: RELEASE.host realclean
-
-# Testing: Combine test failure logs from the live submodules
-TESTS_FAILED_LOGS = $(wildcard $(addsuffix /$(TESTS_FAILED_LOG), \
-    $(LIVE_SUBMODULES)))
-runtests test-results: % : | $(addsuffix $(DIVIDER)%, $(LIVE_SUBMODULES))
-	$(if $(TESTS_FAILED_LOGS), \
-	    @$(CAT) $(TESTS_FAILED_LOGS)>> $(TESTS_FAILED_PATH))

configure/RULES_TARGET

@@ -21,6 +21,7 @@ $(foreach target, $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRA
 
 #-----------------------------------------------------------------------
 
+# This define block requires GNU make 3.81
 define PROD_template
 ifeq ($$(strip $$($(1)_OBJS) $$($(1)_SRCS) $$(PRODUCT_OBJS)),)
 $(1)_OBJS = $(1)$$(OBJ)
@@ -94,20 +95,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
@@ -148,11 +141,6 @@ $(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), \

configure/RULES_TOP

@@ -26,54 +26,53 @@ ifndef DISABLE_TOP_RULES
 distclean: realclean cvsclean realuninstall
 
 realuninstall: uninstallDirs
-	$(RMDIR) $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB)
+	$(RMDIR) $(INSTALL_LOCATION_BIN)
+	$(RMDIR) $(INSTALL_LOCATION_LIB)
 
 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
+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)
 
-# Only run this at the top of the parent
-runtests test-results:
-	@$(SHOWTESTFAILURES)
+# Remove the bin and lib directories if they have no sub-directories
+#
+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:
+  cleandirs distclean uninstall realuninstall archuninstall:
 	$(error Target '$@' not available in a submodule)
 
 endif # DISABLE_TOP_RULES
 
-# Clean out old results
-before-runtests before-test-results: rm-failure-file
-rm-failure-file:
-	$(RM) $(TESTS_FAILED_PATH)
 
 help:
 	@echo "Usage: gnumake [options] [target] ..."
 	@echo "Targets supported by all Makefiles:"
 	@echo "     all            - Same as install (default rule)"
-	@echo "     inc            - Installs header, dbd and html files"
+	@echo "     inc            - Installs header files"
 	@echo "     build          - Builds and installs all targets"
 	@echo "     install        - Builds and installs all targets"
 	@echo "     buildInstall   - Same as install (deprecated)"
@@ -107,7 +106,7 @@ endif
 	@echo "Object targets are supported by the O.<arch> level Makefile .e.g"
 	@echo "     xxxRecord.o"
 
-.PHONY: distclean uninstall rm-failure-file help
+.PHONY: cleandirs distclean uninstall help
 .PHONY: realuninstall archuninstall uninstallDirs
 
 ifndef DISABLE_TOP_RULES

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

@@ -76,7 +76,7 @@ CPPFLAGS += $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS) $(OPT_CPPFLAGS)\
  $(USR_CPPFLAGS) $(CMD_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS)\
  $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
 
-ECHO = @$(if $(filter -s,$(MFLAGS)),$(NOP),echo)
+ECHO = @$(if $(findstring s,$(MFLAGS)),$(NOP),echo)
 
 #--------------------------------------------------
 # Although RTEMS uses gcc, it wants to use gcc its own way

configure/os/CONFIG.Common.UnixCommon

@@ -8,7 +8,7 @@
 #-------------------------------------------------------
 
 # Unix valid build types
-VALID_BUILDS = Host Ioc Command
+VALID_BUILDS = Host Ioc
 
 #-------------------------------------------------------
 # Unix prefix and suffix definitions

configure/os/CONFIG.Common.V69-ppc32

@@ -1,3 +0,0 @@
-include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc32
-VXWORKS_VERSION = 6.9
-export LD_LIBRARY_PATH=$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib

configure/os/CONFIG.Common.V69-ppc604

@@ -1,3 +0,0 @@
-include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
-VXWORKS_VERSION = 6.9
-export LD_LIBRARY_PATH=$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib

configure/os/CONFIG.Common.darwin-aarch64

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

configure/os/CONFIG.Common.eldk42-ppc4xxFP

@@ -11,12 +11,15 @@ ELDK=/opt/eldk-4.2
 GNU_TARGET=ppc_4xxFP
 GNU_DIR=$(ELDK)/usr
 
-# This cross tool chain is installed in a somehow weired way
+# Optimizer is buggy. Throws SIGTRAP in typeinfo for epics::pvAccess::ChannelArray
+OPT_CXXFLAGS_YES += -fno-inline-functions
+
+ARCH_DEP_CPPFLAGS += --sysroot=$(ELDK)/$(GNU_TARGET)
+ARCH_DEP_LDFLAGS =   --sysroot=$(ELDK)/$(GNU_TARGET)
+
+# This cross tool chain is installed in a somehow weird way
 # Without the following lines it does not work on RHEL7
 # but it worked on SL6
 ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2
 ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/powerpc-linux
 ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/backward
-
-ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/lib
-ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/usr/lib

configure/os/CONFIG.Common.linux-386

@@ -12,7 +12,7 @@ include $(CONFIG)/os/CONFIG.Common.linux-x86
 ARCH_DEP_CFLAGS = -march=i386
 
 ifeq ($(BUILD_CLASS),CROSS)
-  VALID_BUILDS = Ioc Command
+  VALID_BUILDS = Ioc
 endif
 
 # If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,

configure/os/CONFIG.Common.linux-486

@@ -10,7 +10,7 @@ include $(CONFIG)/os/CONFIG.Common.linux-x86
 ARCH_DEP_CFLAGS = -march=i486
 
 ifeq ($(BUILD_CLASS),CROSS)
-   VALID_BUILDS = Ioc Command
+   VALID_BUILDS = Ioc
 endif
 
 # If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,

configure/os/CONFIG.Common.linux-586

@@ -11,7 +11,7 @@ include $(CONFIG)/os/CONFIG.Common.linux-x86
 ARCH_DEP_CFLAGS = -march=i586
 
 ifeq ($(BUILD_CLASS),CROSS)
-   VALID_BUILDS = Ioc Command
+   VALID_BUILDS = Ioc
 endif
 
 # If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,

configure/os/CONFIG.Common.linux-686

@@ -11,7 +11,7 @@ include $(CONFIG)/os/CONFIG.Common.linux-x86
 ARCH_DEP_CFLAGS = -march=i686
 
 ifeq ($(BUILD_CLASS),CROSS)
-   VALID_BUILDS = Ioc Command
+   VALID_BUILDS = Ioc
 endif
 
 # If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,

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_eb

@@ -0,0 +1,9 @@
+# CONFIG.Common.linux-arm_eb
+#
+# 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,9 @@
+# CONFIG.Common.linux-arm_el
+#
+# 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

@@ -10,7 +10,7 @@ include $(CONFIG)/os/CONFIG.Common.linux-x86
 ARCH_DEP_CFLAGS += -march=athlon-mp -mfpmath=sse
 
 ifeq ($(BUILD_CLASS),CROSS)
-   VALID_BUILDS = Ioc Command
+   VALID_BUILDS = Ioc
 endif
 
 # If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,

configure/os/CONFIG.Common.linux-microblaze

@@ -15,7 +15,7 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon
 ARCH_CLASS = microblaze
 
 ifeq ($(BUILD_CLASS),CROSS)
-	VALID_BUILDS = Ioc Command
+	VALID_BUILDS = Ioc
 	GNU_TARGET = microblazeel-unknown-linux-gnu
 	CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
 endif

configure/os/CONFIG.Common.linux-xscale_be

@@ -13,7 +13,7 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon
 ARCH_CLASS = xscale
 
 ifeq ($(BUILD_CLASS),CROSS)
-    VALID_BUILDS = Ioc Command
+    VALID_BUILDS = Ioc
     GNU_TARGET = xscale_be
     CMPLR_PREFIX = $(GNU_TARGET:%=%-)
 

configure/os/CONFIG.Common.linuxCommon

@@ -23,17 +23,15 @@ 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))
+# 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))
+    $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
 
-# 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))
+# 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))
+    $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
 
 # Link libraries controlled by COMMANDLINE_LIBRARY
 # The newest Linux versions only need readline, older ones need both

configure/os/CONFIG.Common.nilrt7-armv7a

@@ -1,18 +0,0 @@
-# National Instruments CompactRIO running LabView RT 19.5.1
-
-# Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-
-ARCH_CLASS = arm
-
-GNU_TARGET = arm-linux-gnu
-
-SYSROOT = /opt/LabVIEW-RT-19.5.1/arm/sysroots/armv7a-vfp-neon-nilrt-linux-gnueabi
-
-ARCH_DEP_CPPFLAGS += -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon
-ARCH_DEP_CPPFLAGS += --sysroot=$(SYSROOT)
-ARCH_DEP_CPPFLAGS += -I$(SYSROOT)/usr/include/c++/4.7.2/arm-nilrt-linux-gnueabi/
-ARCH_DEP_CPPFLAGS += -I$(SYSROOT)/usr/include/c++/4.7.2/
-ARCH_DEP_LDFLAGS  += --sysroot=$(SYSROOT)
-
-COMMANDLINE_LIBRARY = READLINE_NCURSES

configure/os/CONFIG.Common.vxWorks-ppc32

@@ -14,7 +14,6 @@ ARCH_CLASS = ppc
 
 # Architecture specific build flags
 ARCH_DEP_CPPFLAGS = -DCPU=PPC32
-ARCH_DEP_CPPFLAGS = -DCPU=PPC604
 ARCH_DEP_CFLAGS = -mstrict-align
 
 GNU_TARGET = powerpc-wrs-vxworks

configure/os/CONFIG.Common.vxWorks-ppc604

@@ -14,12 +14,9 @@ ARCH_CLASS = ppc
 
 # Architecture specific build flags
 ARCH_DEP_CPPFLAGS = -DCPU=PPC604
-ARCH_DEP_CFLAGS   = -mcpu=604 -mstrict-align
-
-CODE_CFLAGS_2 = -mno-implicit-fp
-CODE_CFLAGS_3 = -mno-implicit-fp
-CODE_CFLAGS_4 = -fno-implicit-fp
-CODE_CFLAGS += $(CODE_CFLAGS_$(VX_GNU_MAJOR_VERSION))
-
+ARCH_DEP_CFLAGS_2 = -mcpu=604 -mstrict-align -mno-implicit-fp
+ARCH_DEP_CFLAGS_3 = -mcpu=604 -mstrict-align -mno-implicit-fp
+ARCH_DEP_CFLAGS_4 = -mcpu=604 -mstrict-align -fno-implicit-fp
+ARCH_DEP_CFLAGS = $(ARCH_DEP_CFLAGS_$(VX_GNU_MAJOR_VERSION))
 
 GNU_TARGET = powerpc-wrs-vxworks

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

@@ -30,7 +30,7 @@ ARCH_DEP_LDFLAGS += -m32
 # Compiler does not define  __unix __unix__ unix
 
 # Override for -DUNIX from CONFIG.Common.UnixCommon
-OP_SYS_CPPFLAGS = -D_MINGW -D__USE_MINGW_ANSI_STDIO
+OP_SYS_CPPFLAGS = -D_MINGW
 
 EXE = .exe
 RES = .coff

configure/os/CONFIG.RHEL7-x86_64.SL6-x86

@@ -1,9 +1,9 @@
 # "cross compile" for older Linux version
 # Use older compiler and older libraries
 # Used packages:
-# compat-gcc-44-c++-4.4.7
-# compat-gcc-44-4.4.7
-# compat-glibc-headers-2.12
+# compat-gcc-44-c++-4.4
+# compat-gcc-44-4.4
+# compat-glibc-headers-2.12-4
 # It was neccessary to install 32 bit compatibility libraries manually
 #-------------------------------------------------------
 
@@ -12,5 +12,5 @@ CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc44
 CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++44
 
 TARGET_CPPFLAGS = -isystem /usr/lib/x86_64-redhat-linux6E/include
-TARGET_LDFLAGS = -B /usr/lib/x86_64-redhat-linux6E/lib
+TARGET_LDFLAGS = -L /usr/lib/x86_64-redhat-linux6E/lib
 LINK.cpp += --as-needed -lc -lm -lrt -lpthread -lreadline -ltinfo

configure/os/CONFIG.RHEL7-x86_64.SL6-x86_64

@@ -1,10 +1,10 @@
 # "cross compile" for older Linux version
 # Use older compiler and older libraries
 # Used packages:
-# compat-gcc-44-c++-4.4.7
-# compat-gcc-44-4.4.7
-# compat-glibc-headers-2.12
-# compat-glibc-2.12
+# compat-gcc-44-c++-4.4
+# compat-gcc-44-4.4
+# compat-glibc-headers-2.12-4
+# compat-glibc-2.12-4
 #-------------------------------------------------------
 
 include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
@@ -12,5 +12,5 @@ CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc44
 CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++44
 
 TARGET_CPPFLAGS = -isystem /usr/lib/x86_64-redhat-linux6E/include
-TARGET_LDFLAGS = -B /usr/lib/x86_64-redhat-linux6E/lib64
+TARGET_LDFLAGS = -L /usr/lib/x86_64-redhat-linux6E/lib64
 LINK.cpp += --as-needed -lc -lm -lrt -lpthread -lreadline -ltinfo

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

@@ -1,8 +0,0 @@
-include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
-
-PATH_FILTER = $(subst /,/,$(1))
-
-# Silence the tr1 namespace deprecation warnings
-USR_CXXFLAGS_WIN32 += -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
-
-MSVC_DIR = /opt/wine-msvc-2017/bin/x86/

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

@@ -1,8 +0,0 @@
-include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
-
-PATH_FILTER = $(subst /,/,$(1))
-
-# Silence the tr1 namespace deprecation warnings
-USR_CXXFLAGS_WIN32 += -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
-
-MSVC_DIR = /opt/wine-msvc-2017/bin/x64/

configure/os/CONFIG.UnixCommon.Common

@@ -11,7 +11,6 @@ RM = rm -f
 MKDIR = mkdir -p
 RMDIR = rm -rf
 CAT = cat
-TOUCH = touch
 
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.UnixCommon.Common

configure/os/CONFIG.darwin-aarch64.Common

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

configure/os/CONFIG.linux-aarch64.Common

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

configure/os/CONFIG.linux-aarch64.linux-aarch64

@@ -1,8 +0,0 @@
-# CONFIG.linux-aarch64.linux-aarch64
-#
-# Definitions for native linux-aarch64 builds
-# Override these definitions in CONFIG_SITE.linux-aarch64.linux-aarch64
-#-------------------------------------------------------
-
-# Include common gnu compiler definitions
-include $(CONFIG)/CONFIG.gnuCommon

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

@@ -4,7 +4,7 @@
 # Override these settings in CONFIG_SITE.linux-x86.linux-arm
 #-------------------------------------------------------
 
-VALID_BUILDS = Ioc Command
+VALID_BUILDS = Ioc
 GNU_TARGET = arm-linux
 
 # prefix of compiler tools

configure/os/CONFIG.linux-x86.linux-arm_eb

@@ -0,0 +1,9 @@
+# CONFIG.linux-x86.linux-arm_eb
+#
+# Definitions for linux-x86 host - linux-arm_eb (big endian) target builds
+# Sites may override these definitions in CONFIG_SITE.linux-x86.linux-arm_eb
+#-------------------------------------------------------
+
+# Include definitions for linux-arm targets
+include $(CONFIG)/os/CONFIG.linux-x86.linux-arm
+

configure/os/CONFIG.linux-x86.linux-arm_el

@@ -0,0 +1,9 @@
+# CONFIG.linux-x86.linux-arm_el
+#
+# Definitions for linux-x86 host - linux-arm_el (little endian) target builds
+# Sites may override these definitions in CONFIG_SITE.linux-x86.linux-arm_el
+#-------------------------------------------------------
+
+# Include definitions for linux-arm targets
+include $(CONFIG)/os/CONFIG.linux-x86.linux-arm
+

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

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

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

@@ -4,5 +4,21 @@
 # Override these definitions in CONFIG_SITE.linux-x86.windows-x64-mingw
 #-------------------------------------------------------
 
-# Use the definitions from the win32-x86-mingw target
-include $(CONFIG)/os/CONFIG.linux-x86.win32-x86-mingw
+# Include common gnu compiler definitions
+include $(CONFIG)/CONFIG.gnuCommon
+
+# Add resource compiler
+RCCMD = $(GNU_BIN)/$(CMPLR_PREFIX)windres$(CMPLR_SUFFIX) $(INCLUDES) $< $@
+
+# Remove -fPIC flags, add out-implib
+SHRLIB_CFLAGS =
+SHRLIB_LDFLAGS = -shared \
+    -Wl,--out-implib,$(DLLSTUB_PREFIX)$*$(DLLSTUB_SUFFIX)
+LOADABLE_SHRLIB_LDFLAGS = -shared \
+    -Wl,--out-implib,$(DLLSTUB_PREFIX)$*$(DLLSTUB_SUFFIX)
+
+# No need to explicitly link with gcc library
+GNU_LDLIBS_YES =
+
+# Link with winsock2
+OP_SYS_LDLIBS = -lws2_32

configure/os/CONFIG.linux-x86_64.linux-aarch64

@@ -1,28 +0,0 @@
-# CONFIG.linux-x86_64.linux-aarch64
-#
-# Definitions for linux-x86_64 host - linux-aarch64 target builds
-# Sites may override these in CONFIG_SITE.linux-x86_64.linux-aarch64
-#-------------------------------------------------------
-
-VALID_BUILDS = Ioc Command
-GNU_TARGET = aarch64-linux
-
-# prefix of compiler tools
-CMPLR_SUFFIX =
-CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
-
-# Provide a link-time path for readline if needed
-OP_SYS_INCLUDES += $(READLINE_DIR:%=-I%/include)
-READLINE_LDFLAGS = $(READLINE_DIR:%=-L%/lib)
-RUNTIME_LDFLAGS_READLINE_YES_NO = $(READLINE_DIR:%=-Wl,-rpath,%/lib)
-RUNTIME_LDFLAGS += \
-    $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
-SHRLIBDIR_LDFLAGS += $(READLINE_LDFLAGS)
-PRODDIR_LDFLAGS += $(READLINE_LDFLAGS)
-
-# Library flags
-STATIC_LDFLAGS_YES= -Wl,-Bstatic
-STATIC_LDFLAGS_NO=
-STATIC_LDLIBS_YES= -Wl,-Bdynamic
-STATIC_LDLIBS_NO=
-

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

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

configure/os/CONFIG.win32-x86.Common

@@ -11,7 +11,6 @@ MKDIR = $(PERL) -MExtUtils::Command -e mkpath
 RMDIR = $(PERL) -MExtUtils::Command -e rm_rf
 NOP = $(PERL) -e ''
 CAT = $(PERL) -MExtUtils::Command -e cat
-TOUCH = $(PERL) -MExtUtils::Command -e touch
 
 WIND_HOST_TYPE = x86-win32
 OSITHREAD_USE_DEFAULT_STACK = NO
@@ -26,3 +25,6 @@ endif
 
 # Needed to find dlls for base installed build tools (antelope,eflex,...)
 PATH := $(EPICS_BASE_BIN):$(PATH)
+
+# Silence the tr1 namespace deprecation warnings
+USR_CXXFLAGS_WIN32 += -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING

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

@@ -6,7 +6,7 @@
 
 # Win32 valid build types and include directory suffixes
 
-VALID_BUILDS = Host Ioc Command
+VALID_BUILDS = Host Ioc
 
 CMPLR_CLASS = msvc
 
@@ -14,15 +14,15 @@ OPT_WHOLE_PROGRAM = YES
 
 #-------------------------------------------------------
 
-WINLINK = $(MSVC_DIR)link
+WINLINK = link
 
-RCCMD = $(MSVC_DIR)rc -l 0x409 $(INCLUDES) -fo $@ $<
+RCCMD = rc -l 0x409 $(INCLUDES) -fo $@ $<
 
-ARCMD = $(MSVC_DIR)lib -nologo -verbose -out:$@ $(LIB_OPT_LDFLAGS) $(LIBRARY_LD_OBJS)
+ARCMD = lib -nologo -verbose -out:$@ $(LIB_OPT_LDFLAGS) $(LIBRARY_LD_OBJS)
 
 #
 # Configure OS vendor C compiler
-CC = $(MSVC_DIR)cl
+CC = cl
 
 # Override CONFIG.gnuCommon settings for cross builds.
 GNU = NO
@@ -75,14 +75,14 @@ STATIC_CFLAGS_YES= -MT$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS)
 STATIC_CFLAGS_NO= -MD$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS) -DEPICS_CALL_DLL
 
 # OS vendor c preprocessor
-CPP = $(MSVC_DIR)cl -nologo -C -E
+CPP = cl -nologo -C -E
 
 # Configure OS vendor C++ compiler
 #
 # -EHsc - generate code for exceptions
 # -GR - generate code for run time type identification
 #
-CCC = $(MSVC_DIR)cl -EHsc -GR
+CCC = cl -EHsc -GR
 
 # Other compiler flags, used for CPP, C and C++
 #
@@ -107,9 +107,6 @@ CODE_CPPFLAGS += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
 WARN_CXXFLAGS_YES = -W3 -w44355 -w44344 -w44251
 WARN_CXXFLAGS_NO  = -W1
 
-# Silence tr1 namespace deprecation warnings
-WARN_CXXFLAGS += -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
-
 #
 # -Ox maximum optimizations
 # -GL whole program optimization
@@ -138,22 +135,19 @@ OBJ_CXXFLAG = -Fo
 STATIC_CXXFLAGS_YES= -MT$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS)
 STATIC_CXXFLAGS_NO= -MD$(VISC_CFLAGS_DEBUG) $(BUILD_DLL_CFLAGS) -DEPICS_CALL_DLL
 
-STATIC_LDLIBS_YES=ws2_32.lib advapi32.lib user32.lib kernel32.lib winmm.lib dbghelp.lib
+STATIC_LDLIBS_YES=ws2_32.lib advapi32.lib user32.lib kernel32.lib winmm.lib
 STATIC_LDLIBS_NO=
 STATIC_LDFLAGS=
 RANLIB=
 
 #
-# option needed for parallel builds with Visual Studio 2013 onward
-# VS2012 and above have VisualStudioVersion, so just need to exclude 2012 (11.0)
-# -FS Force Synchronous PDB Writes
+# option needed for parallel builds with Visual Studio 2015 onward
 #
+# -FS Force Synchronous PDB Writes
 ifneq ($(VisualStudioVersion),)
-ifneq ($(VisualStudioVersion),11.0)
   OPT_CXXFLAGS_NO += -FS
   OPT_CFLAGS_NO += -FS
 endif
-endif
 
 
 #

configure/os/CONFIG_SITE.Common.cygwin-x86

@@ -16,9 +16,3 @@ COMMANDLINE_LIBRARY = READLINE_NCURSESW
 
 # No other libraries needed
 #COMMANDLINE_LIBRARY = READLINE
-
-
-# WARNING: Variables that are set in $(CONFIG)/CONFIG.gnuCommon cannot be
-# overridden in this file for native builds, e.g. variables such as
-#    OPT_CFLAGS_YES, WARN_CFLAGS, SHRLIB_LDFLAGS
-# They must be set in CONFIG_SITE.cygwin-x86.cygwin-x86 instead.

configure/os/CONFIG_SITE.Common.cygwin-x86_64

@@ -11,8 +11,10 @@
 #LDLIBS_READLINE = -lreadline -lcurses
 
 
-# WARNING: Variables that are set in $(CONFIG)/CONFIG.gnuCommon cannot be
-# overridden in this file for native builds, e.g. variables such as
-#    OPT_CFLAGS_YES, WARN_CFLAGS, SHRLIB_LDFLAGS
-# They must be set in CONFIG_SITE.cygwin-x86_64.cygwin-x86_64 instead.
+# It makes sense to include debugging symbols even in optimized builds
+# in case you want to attach gdb to the process or examine a core-dump.
+# This does cost disk space, but not memory as debug symbols are not
+# loaded into RAM when the binary is loaded.
+OPT_CFLAGS_YES += -g
+OPT_CXXFLAGS_YES += -g
 

configure/os/CONFIG_SITE.Common.darwin-aarch64

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

configure/os/CONFIG_SITE.Common.linux-aarch64

@@ -1,38 +0,0 @@
-# CONFIG_SITE.Common.linux-aarch64
-#
-# Site Specific definitions for all linux-aarch64 targets
-#-------------------------------------------------------
-
-# NOTE for SHARED_LIBRARIES: In most cases if this is set to YES the
-# shared libraries will be found automatically.  However if the .so
-# files are installed at a different path to their compile-time path
-# then in order to be found at runtime do one of these:
-# a) LD_LIBRARY_PATH must include the full absolute pathname to
-#    $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) when invoking base
-#    executables.
-# b) Add the runtime path to SHRLIB_DEPLIB_DIRS and PROD_DEPLIB_DIRS, which 
-#    will add the named directory to the list contained in the executables.
-# c) Add the runtime path to /etc/ld.so.conf and run ldconfig
-#    to inform the system of the shared library location.
-
-# Depending on your version of Linux you'll want one of the following
-# lines to enable command-line editing and history in iocsh.  If you're
-# not sure which, start with the top one and work downwards until the
-# build doesn't fail to link the readline library.  If none of them work,
-# comment them all out to build without readline support.
-
-# No other libraries needed (recent Fedora, Ubuntu etc.):
-#COMMANDLINE_LIBRARY = READLINE
-
-# Needs -lncurses (RHEL 5 etc.):
-#COMMANDLINE_LIBRARY = READLINE_NCURSES
-
-# Needs -lcurses (older versions)
-#COMMANDLINE_LIBRARY = READLINE_CURSES
-
-
-# WARNING: Variables that are set in $(CONFIG)/CONFIG.gnuCommon cannot be
-# overridden in this file for native builds, e.g. variables such as
-#    OPT_CFLAGS_YES, WARN_CFLAGS, SHRLIB_LDFLAGS
-# They must be set in CONFIG_SITE.linux-aarch64.linux-aarch64 instead.
-

configure/os/CONFIG_SITE.Common.linux-arm

@@ -1,44 +1,39 @@
 # CONFIG_SITE.Common.linux-arm
 #
-# Site-specific settings for the linux-arm target
+# Site Specific definitions for all linux-arm targets
+#-------------------------------------------------------
 
-# NOTE: In most cases if SHARED_LIBRARIES is set to YES the
+# NOTE for SHARED_LIBRARIES: In most cases if this is set to YES the
 # shared libraries will be found automatically.  However if the .so
 # files are installed at a different path to their compile-time path
 # then in order to be found at runtime do one of these:
 # a) LD_LIBRARY_PATH must include the full absolute pathname to
 #    $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) when invoking base
 #    executables.
-# b) Add the runtime path to SHRLIB_DEPLIB_DIRS and PROD_DEPLIB_DIRS, which
+# b) Add the runtime path to SHRLIB_DEPLIB_DIRS and PROD_DEPLIB_DIRS, which 
 #    will add the named directory to the list contained in the executables.
 # c) Add the runtime path to /etc/ld.so.conf and run ldconfig
 #    to inform the system of the shared library location.
 
+# Depending on your version of Linux you'll want one of the following
+# lines to enable command-line editing and history in iocsh.  If you're
+# not sure which, start with the top one and work downwards until the
+# build doesn't fail to link the readline library.  If none of them work,
+# comment them all out to build without readline support.
 
-# Use GNU Readline if the header file is installed
-COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
-    $(firstword $(READLINE_DIR) $(GNU_DIR))/include/readline/readline.h), \
-  READLINE, EPICS))
+# No other libraries needed (recent Fedora, Ubuntu etc.):
+#COMMANDLINE_LIBRARY = READLINE
 
-# If libreadline needs additional libraries to be linked with it, try
-# uncommenting each of the lines below in turn, starting with the top
-# one and working downwards, until the build succeeds. Do a 'make rebuild'
-# from the top of the Base tree after changing this setting.
-
-# Needs -lncurses:
+# Needs -lncurses (RHEL 5 etc.):
 #COMMANDLINE_LIBRARY = READLINE_NCURSES
 
-# Needs -lcurses:
+# Needs -lcurses (older versions)
 #COMMANDLINE_LIBRARY = READLINE_CURSES
 
-# Readline is broken or you don't want use it:
-#COMMANDLINE_LIBRARY = EPICS
 
-
-# WARNING: Variables that are set in $(CONFIG)/CONFIG.gnuCommon cannot be
-# overridden in this file for native builds, e.g. variables such as
-#    OPT_CFLAGS_YES, WARN_CFLAGS, SHRLIB_LDFLAGS
-# They must be set in CONFIG_SITE.linux-arm.linux-arm instead.
-
-# Permit access to 64-bit file-systems
-OP_SYS_CFLAGS += -D_FILE_OFFSET_BITS=64
+# It makes sense to include debugging symbols even in optimized builds
+# in case you want to attach gdb to the process or examine a core-dump.
+# This does cost disk space, but not memory as debug symbols are not
+# loaded into RAM when the binary is loaded.
+OPT_CFLAGS_YES += -g
+OPT_CXXFLAGS_YES += -g

configure/os/CONFIG_SITE.Common.linux-cris

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

configure/os/CONFIG_SITE.Common.linux-microblaze

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

configure/os/CONFIG_SITE.Common.linux-x86

@@ -1,8 +1,9 @@
 # CONFIG_SITE.Common.linux-x86
 #
-# Site-specific settings for the linux-x86 target
+# Site Specific definitions for linux-x86 target
+# Only the local epics system manager should modify this file
 
-# NOTE: In most cases if SHARED_LIBRARIES is set to YES the
+# NOTE for SHARED_LIBRARIES: In most cases if this is set to YES the
 # shared libraries will be found automatically.  However if the .so
 # files are installed at a different path to their compile-time path
 # then in order to be found at runtime do one of these:
@@ -14,15 +15,14 @@
 # c) Add the runtime path to /etc/ld.so.conf and run ldconfig
 #    to inform the system of the shared library location.
 
+# Depending on your version of Linux you'll want one of the following
+# lines to enable command-line editing and history in iocsh.  If you're
+# not sure which, start with the top one and work downwards until the
+# build doesn't fail to link the readline library.  If none of them work,
+# comment them all out to build without readline support.
 
-# Use GNU Readline if the header file is installed
-COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
-    $(GNU_DIR)/include/readline/readline.h), READLINE, EPICS))
-
-# If libreadline needs additional libraries to be linked with it, try
-# uncommenting each of the lines below in turn, starting with the top
-# one and working downwards, until the build succeeds. Do a 'make rebuild'
-# from the top of the Base tree after changing this setting.
+# No other libraries needed (recent Fedora, Ubuntu etc.):
+COMMANDLINE_LIBRARY = READLINE
 
 # Needs -lncurses (RHEL 5 etc.):
 #COMMANDLINE_LIBRARY = READLINE_NCURSES
@@ -30,21 +30,31 @@ COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
 # Needs -lcurses (older versions)
 #COMMANDLINE_LIBRARY = READLINE_CURSES
 
-# Readline is broken or you don't want use it:
-#COMMANDLINE_LIBRARY = EPICS
-
-
-# WARNING: Variables that are set in $(CONFIG)/CONFIG.gnuCommon cannot be
-# overridden in this file for native builds, e.g. variables such as
-#    OPT_CFLAGS_YES, WARN_CFLAGS, SHRLIB_LDFLAGS
-# They must be set in CONFIG_SITE.linux-x86.linux-x86 instead.
 
 # Permit access to 64-bit file-systems
 OP_SYS_CFLAGS += -D_FILE_OFFSET_BITS=64
 
+
+# Uncomment the followings lines to build with CLANG instead of GCC.
+#
+#GNU         = NO
+#CMPLR_CLASS = clang
+#CC          = clang
+#CCC         = clang++
+
+
+# It makes sense to include debugging symbols even in optimized builds
+# in case you want to attach gdb to the process or examine a core-dump.
+# This does cost disk space, but not memory as debug symbols are not
+# loaded into RAM when the binary is loaded.
+OPT_CFLAGS_YES += -g
+OPT_CXXFLAGS_YES += -g
+
+
 # Tune GNU compiler output for a specific 32-bit cpu-type
 # (e.g. generic, native, i386, i686, pentium2/3/4, prescott, k6, athlon etc.)
 GNU_TUNE_CFLAGS = -mtune=generic
 
+
 # Developers using a suitable compiler may enable its address sanitizer:
 #ENABLE_ASAN = YES

configure/os/CONFIG_SITE.Common.linux-x86_64

@@ -1,8 +1,9 @@
 # CONFIG_SITE.Common.linux-x86_64
 #
-# Site-specific settings for the linux-x86_64 target
+# Site Specific definitions for linux-x86_64 target
+# Only the local epics system manager should modify this file
 
-# NOTE: In most cases if SHARED_LIBRARIES is set to YES the
+# NOTE for SHARED_LIBRARIES: In most cases if this is set to YES the
 # shared libraries will be found automatically.  However if the .so
 # files are installed at a different path to their compile-time path
 # then in order to be found at runtime do one of these:
@@ -14,15 +15,14 @@
 # c) Add the runtime path to /etc/ld.so.conf and run ldconfig
 #    to inform the system of the shared library location.
 
+# Depending on your version of Linux you'll want one of the following
+# lines to enable command-line editing and history in iocsh.  If you're
+# not sure which, start with the top one and work downwards until the
+# build doesn't fail to link the readline library.  If none of them work,
+# comment them all out to build without readline support.
 
-# Use GNU Readline if the header file is installed
-COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
-    $(GNU_DIR)/include/readline/readline.h), READLINE, EPICS))
-
-# If libreadline needs additional libraries to be linked with it, try
-# uncommenting each of the lines below in turn, starting with the top
-# one and working downwards, until the build succeeds. Do a 'make rebuild'
-# from the top of the Base tree after changing this setting.
+# No other libraries needed (recent Fedora, Ubuntu etc.):
+COMMANDLINE_LIBRARY = READLINE
 
 # Needs -lncurses (RHEL 5 etc.):
 #COMMANDLINE_LIBRARY = READLINE_NCURSES
@@ -30,18 +30,27 @@ COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
 # Needs -lcurses (older versions)
 #COMMANDLINE_LIBRARY = READLINE_CURSES
 
-# Readline is broken or you don't want use it:
-#COMMANDLINE_LIBRARY = EPICS
+
+# Uncomment the followings lines to build with CLANG instead of GCC.
+#
+#GNU         = NO
+#CMPLR_CLASS = clang
+#CC          = clang
+#CCC         = clang++
 
 
-# WARNING: Variables that are set in $(CONFIG)/CONFIG.gnuCommon cannot be
-# overridden in this file for native builds, e.g. variables such as
-#    OPT_CFLAGS_YES, WARN_CFLAGS, SHRLIB_LDFLAGS
-# They must be set in CONFIG_SITE.linux-x86_64.linux-x86_64 instead.
+# It makes sense to include debugging symbols even in optimized builds
+# in case you want to attach gdb to the process or examine a core-dump.
+# This does cost disk space, but not memory as debug symbols are not
+# loaded into RAM when the binary is loaded.
+OPT_CFLAGS_YES += -g
+OPT_CXXFLAGS_YES += -g
+
 
 # Tune GNU compiler output for a specific 64-bit cpu-type
 # (e.g. generic, native, core2, nocona, k8, opteron, athlon64, barcelona etc.)
 GNU_TUNE_CFLAGS = -mtune=generic
 
+
 # Developers using a suitable compiler may enable its address sanitizer:
 #ENABLE_ASAN = YES

configure/os/CONFIG_SITE.Common.linux-xscale_be

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

configure/os/CONFIG_SITE.Common.linuxCommon

@@ -1,19 +1,2 @@
-# CONFIG_SITE.Common.linuxCommon
-#
-# Site-specific settings for all linux targets
-
-# WARNING: Variables that are set in $(CONFIG)/CONFIG.gnuCommon cannot be
-# overridden in this file for native builds, e.g. variables such as
-#   OPT_CFLAGS_YES, WARN_CFLAGS, SHRLIB_LDFLAGS
-# They must be set in the host+target specific file instead:
-#   CONFIG_SITE.<linux-arch>.<linux-arch>
-
-# It makes sense to include debugging symbols even in optimized builds
-# in case you want to attach gdb to the process or examine a core-dump.
-# This does cost disk space, but not memory as debug symbols are not
-# loaded into RAM when the binary is loaded.
-OPT_CFLAGS_YES += -g
-OPT_CXXFLAGS_YES += -g
-
 COMMANDLINE_LIBRARY = READLINE
 CODE_CPPFLAGS += -fno-strict-aliasing

configure/os/CONFIG_SITE.Common.vxWorksCommon

@@ -4,16 +4,12 @@
 
 #### Fixes for CONFIG.Common.vxWorksCommon  #######
 
-VX_GNU_VERSION_7 = 4.8.1.11
-
-
 # These are needed for vxWorks 6.x; the GNU toolset version number
 # is in the path to the compiler tools:
 VX_GNU_VERSION_5   = 2.96
 VX_GNU_VERSION_6 = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
 VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_MAJOR_VERSION))
-VX_GNU_MAJOR_VERSION = $(firstword $(subst ., ,$(VX_GNU_VERSION)))
-VX_GNU_MINOR_VERSION = $(word 2,$(subst ., ,$(VX_GNU_VERSION)))
+VX_GNU_MINOR_VERSION = $(basename $(patsubst $(VX_GNU_MAJOR_VERSION).%,%,$(VX_GNU_VERSION)))
 
 # gcc version before 3.4 are "old" and need special treatment
 VX_OLD_GCC_2   = OLD
@@ -24,41 +20,22 @@ VX_OLD_GCC = $(VX_OLD_GCC_$(VX_GNU_MAJOR_VERSION))
 # vxWorks directory definitions
 VX_DIR_5 = $(WIND_BASE)
 VX_DIR_6 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
-VX_DIR_7 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)/pkgs/os
 VX_DIR = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))
 
-VX_INCLUDE_DIRS_5  = $(VX_DIR)/target/h
-VX_INCLUDE_DIRS_6  = $(VX_DIR)/target/h
-VX_INCLUDE_DIRS_6 += $(VX_DIR)/target/h/wrn/coreip
-VX_INCLUDE_DIRS_7  = $(VX_DIR)/core/kernel-1.2.8.0/h
-VX_INCLUDE_DIRS_7 += $(VX_DIR)/lang-lib/libc-1.0.0.1/libc-kernel-1.0.8.0/h
-VX_INCLUDE_DIRS_7 += $(VX_DIR)/utils/ostools-1.0.5.0/h
-VX_INCLUDE_DIRS_7 += $(VX_DIR)/utils/ostools-1.0.5.0/shareh
-VX_INCLUDE_DIRS_7 += $(VX_DIR)/arch/ppc-1.3.4.0/kernel/base/h/
-VX_INCLUDE_DIRS_7 += $(VX_DIR)/arch/ppc-1.3.4.0/kernel/60x/h/arch/ppc/
-VX_INCLUDE_DIRS_7 += $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)/samples/prebuilt_projects/vsb_vxsim_linux/krnl/h/public
+VX_INCLUDE_DIRS_5 = $(VX_DIR)/target/h
+VX_INCLUDE_DIRS_6 = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
 GNU_TARGET_INCLUDE_DIR = $(VX_INCLUDE_DIRS_$(VXWORKS_MAJOR_VERSION))
-
-TARGET_CPPFLAGS_5 = -isystem $(VX_DIR)/target/h
-TARGET_CPPFLAGS_6 = -isystem $(VX_DIR)/target/h
-TARGET_CPPFLAGS_7 = -isystem $(VX_DIR)/core/kernel-1.2.8.0/h -D_VSB_CONFIG_FILE='<$(WIND_BASE)/vxworks-$(VXWORKS_VERSION)/samples/prebuilt_projects/vsb_vxsim_linux/h/config/vsbConfig.h>'
-TARGET_CPPFLAGS = $(TARGET_CPPFLAGS_$(VXWORKS_MAJOR_VERSION))
+TARGET_CPPFLAGS = -isystem $(VX_DIR)/target/h
 
 # vxWorks GNU directories
 
 GNU_DIR_5 = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
 GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
-GNU_DIR_7 = $(WIND_BASE)/compilers/gnu-$(VX_GNU_VERSION)/$(WIND_HOST_TYPE)
 GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION))
 
 # Operating system flags
 OP_SYS_CFLAGS += -fno-strict-aliasing
 
-OP_SYS_INCLUDE_CPPFLAGS_5 += -include $(VX_DIR)/target/h/vxWorks.h
-OP_SYS_INCLUDE_CPPFLAGS_6 += -include $(VX_DIR)/target/h/vxWorks.h
-OP_SYS_INCLUDE_CPPFLAGS_7 += -include vxWorks.h
-OP_SYS_INCLUDE_CPPFLAGS = $(OP_SYS_INCLUDE_CPPFLAGS_$(VXWORKS_MAJOR_VERSION))
-
 # For gcc versions before 3.4 we need this g++ compiler flag
 # However WindRiver says gcc 3.3 does not need it any more
 # which would allow to build vxWorks 6 without this flag.

configure/os/CONFIG_SITE.RHEL7-x86_64.Common

@@ -2,20 +2,16 @@ include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
 
 # Build 32 bit version as a cross architecture
 #CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86
+#CROSS_COMPILER_RUNTEST_ARCHS += RHEL7-x86
 
 # Improved error checking with clang
 CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64-clang
+CROSS_COMPILER_RUNTEST_ARCHS += RHEL7-x86_64-clang
 
 # Build for old SL6 64 bit
 CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64
+CROSS_COMPILER_RUNTEST_ARCHS += SL6-x86_64
 
 # Build for old SL6 32 bit
-#CROSS_COMPILER_TARGET_ARCHS += SL6-x86
-
-# WINE MSVC
-CROSS_COMPILER_TARGET_ARCHS += win32-x86 windows-x64
-
-# NI Linux Real-Time 7.x
-# requires RPM gcc-c++-arm-linux-gnu
-CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a
-
+CROSS_COMPILER_TARGET_ARCHS += SL6-x86
+CROSS_COMPILER_RUNTEST_ARCHS += SL6-x86_64

configure/os/CONFIG_SITE.SL6-x86_64.Common

@@ -1,5 +1,5 @@
 # Build 32 bit version as a cross architecture
-#CROSS_COMPILER_TARGET_ARCHS += SL6-x86
+CROSS_COMPILER_TARGET_ARCHS += SL6-x86
 
 # Improved error checking with clang
 #CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64-clang

configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86

@@ -6,11 +6,3 @@
 #  GNU_DIR used when COMMANDLINE_LIBRARY is READLINE
 #GNU_DIR=C:/cygwin
 
-
-# It makes sense to include debugging symbols even in optimized builds
-# in case you want to attach gdb to the process or examine a core-dump.
-# This does cost disk space, but not memory as debug symbols are not
-# loaded into RAM when the binary is loaded.
-OPT_CFLAGS_YES += -g
-OPT_CXXFLAGS_YES += -g
-

configure/os/CONFIG_SITE.linux-aarch64.linux-aarch64

@@ -1,12 +0,0 @@
-# CONFIG_SITE.linux-aarch64.linux-aarch64
-#
-# Site specific definitions for native linux-aarch64 builds
-#-------------------------------------------------------
-
-# It makes sense to include debugging symbols even in optimized builds
-# in case you want to attach gdb to the process or examine a core-dump.
-# This does cost disk space, but not memory as debug symbols are not
-# loaded into RAM when the binary is loaded.
-OPT_CFLAGS_YES += -g
-OPT_CXXFLAGS_YES += -g
-

configure/os/CONFIG_SITE.linux-x86.Common

@@ -12,10 +12,6 @@ CROSS_COMPILER_TARGET_ARCHS += T2-ppc604
 # vxWorks 6.7 for MVxxxx boards
 CROSS_COMPILER_TARGET_ARCHS += V67-ppc604
 
-# vxWorks 6.9 for MVxxxx boards
-CROSS_COMPILER_TARGET_ARCHS += V69-ppc604
-CROSS_COMPILER_TARGET_ARCHS += V69-ppc32
-
 # NI compact RIO
 CROSS_COMPILER_TARGET_ARCHS += V63-ppc603
 

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

@@ -0,0 +1,13 @@
+#  CONFIG_SITE.linux-x86.linux-arm_eb
+#
+# Site specific definitions for linux-x86 host - linux-arm_eb target builds
+#-------------------------------------------------------
+
+# Include definitions for linux-arm targets
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.linux-arm
+
+# Path to the GNU toolset for linux-arm_eb (big endian) target
+#GNU_DIR = /local/anj/cross-arm/gcc-3.4.5-glibc-2.3.6/armeb-linux
+
+# GNU crosscompiler target name
+#GNU_TARGET = armeb-linux

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

@@ -0,0 +1,13 @@
+#  CONFIG_SITE.linux-x86.linux-arm_el
+#
+# Site specific definitions for linux-x86 host - linux-arm_el target builds
+#-------------------------------------------------------
+
+# Include definitions for linux-arm targets
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.linux-arm
+
+# Path to the GNU toolset for linux-arm_el (little endian) target
+#GNU_DIR = /local/anj/cross-arm/gcc-3.4.5-glibc-2.3.6/armel-linux
+
+# GNU crosscompiler target name
+#GNU_TARGET = armel-linux

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

@@ -3,17 +3,3 @@
 # Site specific definitions for linux-x86 host - linux-x86 target builds
 #-------------------------------------------------------
 
-# It makes sense to include debugging symbols even in optimized builds
-# in case you want to attach gdb to the process or examine a core-dump.
-# This does cost disk space, but not memory as debug symbols are not
-# loaded into RAM when the binary is loaded.
-OPT_CFLAGS_YES += -g
-OPT_CXXFLAGS_YES += -g
-
-# Uncomment the followings lines to build with CLANG instead of GCC.
-#
-#GNU         = NO
-#CMPLR_CLASS = clang
-#CC          = clang
-#CCC         = clang++
-

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

@@ -1,30 +0,0 @@
-# CONFIG_SITE.linux-x86.linux-aarch64
-#
-# Site specific definitions for linux-x86 host - linux-aarch64 target builds
-#-------------------------------------------------------
-
-# Set GNU crosscompiler target name
-GNU_TARGET = aarch64-linux-gnu
-
-# Set GNU tools install path
-# Examples is the installation at the APS:
-GNU_DIR = /usr/local/Xilinx/SDK/2018.3/gnu/aarch64/lin/aarch64-linux
-
-# If cross-building shared libraries and the paths on the target machine are
-# different than on the build host, you should uncomment the lines below to
-# disable embedding compile-time library paths into the generated files.
-# You will need to provide another way for programs to find their shared
-# libraries at runtime, such as by setting LD_LIBRARY_PATH or (better) using
-# mechanisms related to /etc/ld.so.conf
-#SHRLIBDIR_RPATH_LDFLAGS_YES_NO =
-#PRODDIR_RPATH_LDFLAGS_YES_NO =
-# However it is usually simpler to set STATIC_BUILD=YES here and not
-# try to use shared libraries at all when cross-building, like this:
-STATIC_BUILD=YES
-SHARED_LIBRARIES=NO
-
-# To use libreadline, point this to its install prefix
-#READLINE_DIR = $(GNU_DIR)
-#READLINE_DIR = /tools/cross/linux-x86.linux-arm/readline
-# See CONFIG_SITE.Common.linux-arm for other COMMANDLINE_LIBRARY values
-#COMMANDLINE_LIBRARY = READLINE

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

@@ -3,17 +3,4 @@
 # Site specific definitions for linux-x86_64 host - linux-x86_64 target builds
 #-------------------------------------------------------
 
-# It makes sense to include debugging symbols even in optimized builds
-# in case you want to attach gdb to the process or examine a core-dump.
-# This does cost disk space, but not memory as debug symbols are not
-# loaded into RAM when the binary is loaded.
-OPT_CFLAGS_YES += -g
-OPT_CXXFLAGS_YES += -g
-
-# Uncomment the followings lines to build with CLANG instead of GCC.
-#
-#GNU         = NO
-#CMPLR_CLASS = clang
-#CC          = clang
-#CCC         = clang++
 

documentation/.gitignore

@@ -1,3 +0,0 @@
-*.db
-epics-base.tag
-html/

documentation/KnownProblems.html

@@ -4,17 +4,17 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <title>Known Problems in EPICS 7.0.3.1</title>
+  <title>Known Problems in EPICS 7.0.3</title>
 </head>
 
 <body>
-<h1 style="text-align: center">EPICS 7.0.3.1: Known Problems</h1>
+<h1 style="text-align: center">EPICS 7.0.3: Known Problems</h1>
 
 <p>Any patch files linked below should be applied at the root of the
-base-7.0.3.1 tree. Download them, then use the GNU Patch program as
+base-7.0.3 tree. Download them, then use the GNU Patch program as
 follows:</p>
 
-<blockquote><pre>% <b>cd <i>/path/to/</i>base-7.0.3.1</b>
+<blockquote><pre>% <b>cd <i>/path/to/</i>base-7.0.3</b>
 % <b>patch -p1 &lt; <i>/path/to/</i>file.patch</b></pre></blockquote>
 
 <p>The following problems were known by the developers at the time of this
@@ -28,6 +28,10 @@ release:</p>
     ...</li>
 -->
 
+  <li>IOCs running on some versions of Cygwin may display warnings at iocInit
+    about duplicate EPICS CA Address list entries. These warnings might be due
+    to a bug in Cygwin; they are benign and can be ignored.</li>
+
 </ul>
 
 </body>

documentation/Makefile

@@ -1,35 +0,0 @@
-TOP = ..
-include $(TOP)/configure/CONFIG
-
-ifeq ($(T_A),$(EPICS_HOST_ARCH))
-
-DOXYGEN=doxygen
-
-EXPAND = Doxyfile@
-
-EXPAND_ME += EPICS_VERSION
-EXPAND_ME += EPICS_REVISION
-EXPAND_ME += EPICS_MODIFICATION
-EXPAND_ME += EPICS_PATCH_LEVEL
-EXPAND_ME += OS_CLASS CMPLR_CLASS
-
-ME = documentation/O.$(T_A)/html
-GH_FILES = $(ME)/ $(ME)/.nojekyll $(ME)/*.* $(ME)/*/*.*
-
-install: doxygen
-
-doxygen: Doxyfile ../mainpage.dox
-	$(DOXYGEN)
-	rsync -av $(TOP)/html/ html/
-
-.PHONY: doxygen
-
-commit: doxygen
-	$(TOUCH) html/.nojekyll
-	(cd $(TOP) && $(CURDIR)/../commit-gh.sh $(GH_FILES))
-
-.PHONY: commit
-
-endif # EPICS_HOST_ARCH
-
-include $(TOP)/configure/RULES

documentation/README.1st

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

documentation/README.html

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

documentation/README.md

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