Update README

- fixes hanging apt install tzdata

.appveyor.yml

@@ -0,0 +1,177 @@
+# .appveyor.yml for testing EPICS Base ci-scripts
+# (see: https://github.com/epics-base/ci-scripts)
+
+# Note:
+# Paths to scripts are different in this test configuration
+# (your module has one more directory level: .ci)
+
+# Ralph Lange <ralph.lange@gmx.de>
+# Copyright (c) 2020 ITER Organization
+
+#---------------------------------#
+#       build cache               #
+#---------------------------------#
+
+cache:
+  - C:\Users\appveyor\.tools -> appveyor\do.py
+
+#---------------------------------#
+#       repository cloning        #
+#---------------------------------#
+
+# Called at very beginning, before repo cloning
+init:
+  # Set autocrlf to make batch files work
+  - git config --global core.autocrlf true
+  # print the connection info for RDP connections (see 'debugging' below)
+  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+
+# Set clone depth (do not fetch complete history)
+clone_depth: 50
+
+# Skipping commits affecting only specific files
+skip_commits:
+  files:
+    - 'documentation/*'
+    - 'templates/*'
+    - '**/*.html'
+    - '**/*.md'
+    - '.travis.yml'
+    - '.github/workflows/*'
+
+#---------------------------------#
+#       additional packages       #
+#---------------------------------#
+
+install:
+# fetch submodules (like ci-scripts)
+  - cmd: git submodule update --init --recursive
+# for the sequencer
+  - cinst re2c
+
+#---------------------------------#
+#   build matrix configuration    #
+#---------------------------------#
+
+# Default build worker image
+image: Visual Studio 2015
+
+# Build Configurations: shared/static, optimized/debug
+configuration:
+  - default
+  - static
+  - debug
+  - static-debug
+
+# Environment variables: compiler toolchain, base version, setup file, ...
+environment:
+  # common / default variables for all jobs
+  SETUP_PATH: .:.ci
+  SET: test01
+  BASE_RECURSIVE: NO
+  VV: 1
+
+  matrix:
+  - CMP: vs2019
+    SET: test00
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+  - CMP: gcc
+  - CMP: vs2019
+    VV: 0
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+  - CMP: vs2019
+    BASE: 3.15
+    CLEAN_DEPS: NO
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+  - CMP: vs2019
+    BASE: 3.14
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+  - CMP: vs2017
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    EXTRA: EXTRA_DEF="extra"
+    EXTRA1: EXTRA1_DEF="extra 1"
+    EXTRA2: EXTRA2_DEF="extra 2"
+  - CMP: vs2015
+  - CMP: vs2013
+  - CMP: vs2012
+  - CMP: vs2010
+  - CMP: vs2008
+
+# Platform: architecture
+platform:
+  - x86
+  - x64
+
+# Matrix configuration: allow/exclude specific failing jobs
+matrix:
+  # The MSI tool generated from that builds segfaults (*shrug*)
+  allow_failures:
+    - platform: x64
+      configuration: static-debug
+      CMP: vs2019
+      BASE: 3.14
+  exclude:
+  # Run test00 only once: x64 dynamic
+  - platform: x86
+    SET: test00
+  - configuration: static
+    SET: test00
+  - configuration: debug
+    SET: test00
+  - configuration: static-debug
+    SET: test00
+  # VS2012 and older installs don't have the 64 bit compiler
+  - platform: x64
+    CMP: vs2012
+  - platform: x64
+    CMP: vs2010
+  - platform: x64
+    CMP: vs2008
+
+# Run test script for unit tests (SET = test00)
+for:
+-
+  matrix:
+    only:
+      - SET: test00
+  build_script:
+    - cmd: python cue-test.py
+  test_script:
+    - cmd: echo Tests have been run in the build phase
+
+#---------------------------------#
+#     building & testing          #
+#---------------------------------#
+
+build_script:
+  - cmd: python cue.py prepare
+  - cmd: python cue.py build
+
+test_script:
+  - cmd: python cue.py -T 15M test
+  - cmd: python cue.py test-results
+
+#---------------------------------#
+#         debugging               #
+#---------------------------------#
+
+## if you want to connect by remote desktop to a failed build, uncomment these lines
+## note that you will need to connect within the usual build timeout limit (60 minutes)
+## so you may want to adjust the build matrix above to just build the one of interest
+
+#on_failure:
+#  - ps: $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

.github/workflows/build-and-test.yml

@@ -0,0 +1,186 @@
+name: ci-scripts build/test
+
+on: [push, pull_request]
+
+env:
+  SETUP_PATH: .:.ci
+  SET: test01
+  VV: 1
+  BASE_RECURSIVE: NO
+  CMP: gcc
+  APT: re2c
+  CHOCO: re2c
+  BREW: re2c
+
+jobs:
+  unit-test:
+    name: Unit tests on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2019, windows-2016, macos-10.15]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Show initial environment
+      run: python cue-test.py env
+    - name: Run unit tests
+      run: python cue-test.py
+
+  build-linux:
+    name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    env:
+      CMP: ${{ matrix.cmp }}
+      BCFG: ${{ matrix.configuration }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04]
+        cmp: [gcc, clang]
+        configuration: [default, static, debug, static-debug]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Prepare and compile dependencies
+      run: python cue.py prepare
+    - name: Build main module (example app)
+      run: python cue.py build
+    - name: Run main module tests
+      run: python cue.py -T 15M test
+    - name: Collect and show test results
+      run: python cue.py test-results
+
+  build-linux-old:
+    name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    env:
+      CMP: ${{ matrix.cmp }}
+      BCFG: ${{ matrix.configuration }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-16.04]
+        cmp: ["gcc-4.8", "gcc-4.9"]
+        configuration: [default, static]
+    steps:
+    - uses: actions/checkout@v2
+    - name: "apt-get install ${{ matrix.cmp }}"
+      run: |
+        export GCC_NAME="${{ matrix.cmp }}"
+        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++-${GCC_NAME#gcc-}
+    - name: Prepare and compile dependencies
+      run: python cue.py prepare
+    - name: Build main module (example app)
+      run: python cue.py build
+    - name: Run main module tests
+      run: python cue.py -T 15M test
+    - name: Collect and show test results
+      run: python cue.py test-results
+
+  build-macos:
+    name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    env:
+      CMP: ${{ matrix.cmp }}
+      BCFG: ${{ matrix.configuration }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-10.15]
+        cmp: [clang]
+        configuration: [default, debug]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Prepare and compile dependencies
+      run: python cue.py prepare
+    - name: Build main module (example app)
+      run: python cue.py build
+    - name: Run main module tests
+      run: python cue.py -T 15M test
+    - name: Collect and show test results
+      run: python cue.py test-results
+
+  build-windows:
+    name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    env:
+      CMP: ${{ matrix.cmp }}
+      BCFG: ${{ matrix.configuration }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [windows-2019, windows-2016]
+        cmp: [gcc, vs2019, vs2017]
+        configuration: [default, static, debug, static-debug]
+        exclude:
+          - os: windows-2019
+            cmp: vs2017
+          - os: windows-2016
+            cmp: vs2019
+    steps:
+    - uses: actions/checkout@v2
+    - name: Prepare and compile dependencies
+      run: python cue.py prepare
+    - name: Build main module (example app)
+      run: python cue.py build
+    - name: Run main module tests
+      run: python cue.py -T 15M test
+    - name: Collect and show test results
+      run: python cue.py test-results
+
+  build-rtems:
+    name: RTEMS${{ matrix.rtems }} / ${{ matrix.configuration }} / ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    env:
+      CMP: ${{ matrix.cmp }}
+      BCFG: ${{ matrix.configuration }}
+      RTEMS: ${{ matrix.rtems }}
+      RTEMS_TARGET: RTEMS-pc686-qemu
+      APT: re2c g++-mingw-w64-i686 g++-mingw-w64-x86-64 qemu-system-x86
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04]
+        cmp: [gcc]
+        configuration: [default, debug]
+        rtems: ["4.9", "4.10", "5"]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Prepare and compile dependencies
+      run: python cue.py prepare
+    - name: Build main module (example app)
+      run: python cue.py build
+    - name: Run main module tests
+      run: python cue.py -T 15M test
+    - name: Collect and show test results
+      run: python cue.py test-results
+
+  build-wine:
+    name: WINE${{ matrix.wine }} / ${{ matrix.configuration }} / ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    env:
+      CMP: ${{ matrix.cmp }}
+      BCFG: ${{ matrix.configuration }}
+      WINE: ${{ matrix.wine }}
+      APT: re2c g++-mingw-w64-i686 g++-mingw-w64-x86-64
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-18.04]
+        cmp: [gcc]
+        configuration: [default, static, debug, static-debug]
+        wine: [32, 64]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Prepare and compile dependencies
+      run: python cue.py prepare
+    - name: Build main module (example app)
+      run: python cue.py build
+    - name: Run main module tests
+      run: python cue.py -T 15M test
+    - name: Collect and show test results
+      run: python cue.py test-results

.gitignore

@@ -1,5 +1,10 @@
 /QtC-*
+
 *.orig
 *.log
 .*.swp
 *.autosave
+
+/.idea/
+*.py[cod]
+__pycache__/

.gitlab-ci.yml

@@ -0,0 +1,180 @@
+# .gitlab-ci.yml for testing EPICS Base ci-scripts
+# (see: https://github.com/epics-base/ci-scripts)
+
+# Note:
+# Paths to scripts are different in this test configuration
+# (your module has one more directory level: .ci)
+
+image: ubuntu:bionic
+
+cache:
+  key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
+  paths:
+    - .cache/
+
+variables:
+  GIT_SUBMODULE_STRATEGY: "recursive"
+  SETUP_PATH: ".:.ci"
+  BASE_RECURSIVE: "NO"
+  APT: "libreadline6-dev libncurses5-dev perl clang g++-mingw-w64-i686 g++-mingw-w64-x86-64 qemu-system-x86 re2c"
+  DEBIAN_FRONTEND: "noninteractive"
+  CMP: "gcc"
+  BGFC: "default"
+  VV: "1"
+  SET: test01
+
+# Unit tests
+unit_test:
+  stage: build
+  variables:
+    SET: test00
+  before_script:
+    - apt-get update -qq && apt-get install -y -qq make git python curl p7zip-full
+    - python cue-test.py env
+  script:
+    - python cue-test.py
+
+# Template job for test builds (hidden)
+.build:
+  stage: build
+  before_script:
+    - apt-get update -qq && apt-get install -y -qq build-essential git python curl p7zip-full
+    - python cue.py prepare
+  script:
+    - python cue.py build
+    - python cue.py test
+    - python cue.py test-results
+
+# gcc builds using four configurations (shared/static, optimized/debug)
+gcc_default:
+  extends: .build
+
+gcc_static:
+  extends: .build
+  variables:
+    BCFG: "static"
+
+gcc_debug:
+  extends: .build
+  variables:
+    BCFG: "debug"
+
+gcc_static_debug:
+  extends: .build
+  variables:
+    BCFG: "static-debug"
+
+# clang builds using four configurations (shared/static, optimized/debug)
+clang_default:
+  extends: .build
+  variables:
+    CMP: "clang"
+
+clang_static:
+  extends: .build
+  variables:
+    CMP: "clang"
+    BCFG: "static"
+
+clang_debug:
+  extends: .build
+  variables:
+    CMP: "clang"
+    BCFG: "debug"
+
+clang_static_debug:
+  extends: .build
+  variables:
+    CMP: "clang"
+    BCFG: "static-debug"
+
+# WINE based cross-builds to Windows 32bit and 64bit
+wine32_default:
+  extends: .build
+  variables:
+    WINE: "32"
+
+wine32_static:
+  extends: .build
+  variables:
+    WINE: "32"
+    BCFG: "static"
+
+wine32_debug:
+  extends: .build
+  variables:
+    WINE: "32"
+    BCFG: "debug"
+
+wine32_static_debug:
+  extends: .build
+  variables:
+    WINE: "32"
+    BCFG: "static-debug"
+
+wine64_default:
+  extends: .build
+  variables:
+    WINE: "64"
+
+wine64_static:
+  extends: .build
+  variables:
+    WINE: "64"
+    BCFG: "static"
+
+wine64_debug:
+  extends: .build
+  variables:
+    WINE: "64"
+    BCFG: "debug"
+
+wine64_static_debug:
+  extends: .build
+  variables:
+    WINE: "64"
+    BCFG: "static-debug"
+
+# Cross-builds to RTEMS 4.9 and 4.10
+rtems4.9_default:
+  extends: .build
+  image: ubuntu:focal
+  variables:
+    RTEMS: "4.9"
+    BASE: "3.15"
+
+rtems4.9_debug:
+  extends: .build
+  image: ubuntu:focal
+  variables:
+    RTEMS: "4.9"
+    BASE: "3.15"
+    BCFG: "debug"
+
+rtems4.10_default:
+  extends: .build
+  image: ubuntu:focal
+  variables:
+    RTEMS: "4.10"
+
+rtems4.10_debug:
+  extends: .build
+  image: ubuntu:focal
+  variables:
+    RTEMS: "4.10"
+    BCFG: "debug"
+
+rtems5_default:
+  extends: .build
+  image: ubuntu:focal
+  variables:
+    RTEMS: "5"
+    RTEMS_TARGET: "RTEMS-pc686-qemu"
+
+rtems5_debug:
+  extends: .build
+  image: ubuntu:focal
+  variables:
+    RTEMS: "5"
+    RTEMS_TARGET: "RTEMS-pc686-qemu"
+    BCFG: "debug"

.travis.yml

@@ -7,7 +7,7 @@
 
 language: cpp
 compiler: gcc
-dist: xenial
+dist: bionic
 
 cache:
   directories:
@@ -16,6 +16,9 @@ cache:
 env:
   global:
     - SETUP_PATH=.:.ci
+    - VV=1
+    - CHOCO=re2c
+    - BASE_RECURSIVE=NO
 
 addons:
   apt:
@@ -27,17 +30,19 @@ addons:
     - g++-mingw-w64-i686
     - g++-mingw-w64-x86-64
     - qemu-system-x86
+    - p7zip-full
   homebrew:
     packages:
     - re2c
-    - bash
+    - p7zip
-    update: true
 
 install:
-  - ./travis/prepare.sh
+  - python cue.py prepare
 
 script:
-  - ./travis-test.sh
+  - python cue.py build
+  - python cue.py test
+  - python cue.py test-results
 
 # If you need to do more during install and build,
 # add a local directory to your module and do e.g.
@@ -46,135 +51,129 @@ script:
 # Define build jobs
 
 # Well-known variables to use
-# SET      source setup file
+# SET         source setup file
-# EXTRA    content will be added to make command line
+# ADD_MODULES extra modules (for a specific job)
-# STATIC   set to YES for static build (default: NO)
+# EXTRA       content will be added to make command line
-# TEST     set to NO to skip running the tests (default: YES)
+# BCFG        build configuration (static/debug/static-debug;
-# VV       set to make build scripts verbose (default: unset)
+#             default: shared-optimized)
+# TEST        set to NO to skip running the tests (default: YES)
+# VV          set to make build scripts verbose (default: unset)
 
 # Usually from setup files, but may be specified or overridden
 #  on a job line
-# MODULES  list of dependency modules
+# MODULES     list of dependency modules
-# BASE     branch or release tag name of the EPICS Base to use
+# BASE        branch or release tag name of the EPICS Base to use
-# <MODULE> branch or release tag for a specific module
+# <MODULE>    branch or release tag for a specific module
-# ...      see README for setup file syntax description
+# ...         see README for setup file syntax description
 
 jobs:
   include:
 
-# Run unit tests on Linux and Mac
+# Run unit tests
 
   - env: SET=test00
+    install: python cue-test.py env
+    script: python cue-test.py
+
+  - env: SET=test00 TRAVIS_COMPILER=gcc
+    language: python
+    python: "3.7"
+    install: python cue-test.py env
+    script: python cue-test.py
 
   - env: SET=test00
     os: osx
+    osx_image: xcode11.3
+    install: python cue-test.py env
+    script: python cue-test.py
 
-# Compile the example application
+  - env: SET=test00
-# using the build configurations from full makeBaseApp example
+    os: windows
+    install: python cue-test.py env
+    script: python cue-test.py
+
+# Compile example
 
   - env: SET=test01
+    dist: focal
 
-  - env: SET=test01
+  - env: SET=test01 BCFG=static-debug
-    compiler: clang
+    dist: focal
 
-  - env: VV="" SET=test01
+  - env: SET=test01 CLEAN_DEPS=NO
+    dist: trusty
+
+  - env: SET=test01 BCFG=static-debug
+    dist: trusty
+
+  - env: SET=test01 TRAVIS_COMPILER=gcc
+    language: python
+    python: "3.7"
 
   - env: SET=test01 EXTRA="CMD_CXXFLAGS=-std=c++11"
-
+  - env: SET=test01 BCFG=static
-  - env: SET=test01 EXTRA="CMD_CXXFLAGS=-std=c++11"
+  - env: SET=test01 BCFG=debug
-    compiler: clang
+  - env: SET=test01 BCFG=static-debug
-
-# trusty is pretty close to RHEL7
-  - env: SET=test01
-    dist: trusty
-
-  - env: SET=test01 EXTRA="CMD_CXXFLAGS=-std=c++11"
-    dist: trusty
-
-# Cross-compilation to Windows using MinGW and WINE
-
-  - env: SET=test01 WINE=32 TEST=NO STATIC=YES
-    compiler: mingw
-
-  - env: SET=test01 WINE=64 TEST=NO STATIC=YES
-    compiler: mingw
-
-# dynamic (DLL) builds are broken on xenial
-  - env: SET=test01 WINE=32 TEST=NO STATIC=NO
-    dist: bionic
-    compiler: mingw
-
-  - env: SET=test01 WINE=64 TEST=NO STATIC=NO
-    dist: bionic
-    compiler: mingw
-
-# Cross-compilation to RTEMS
-# (needs EPICS Base >= 3.16.2)
-
-  - env: SET=test01 RTEMS=4.10 TEST=NO
-
-  - env: SET=test01 RTEMS=4.9 TEST=NO
-
-# Other gcc versions (adding as an extra package)
 
   - env: SET=test01
-    compiler: gcc-6
+    compiler: clang
-    addons: { apt: { packages: ["g++-6"], sources: ["ubuntu-toolchain-r-test"] } }
+
+  - env: SET=test01 BCFG=static-debug
+    compiler: clang
+
+  - os: osx
+    osx_image: xcode11.3
+    env:
+      - SET=test01
+      - EXTRA=CMD_CFLAGS="-mmacosx-version-min=10.7"
+      - EXTRA1=CMD_CXXFLAGS="-mmacosx-version-min=10.7 -std=c++11 -stdlib=libc++"
+      - EXTRA2=CMD_LDXFLAGS="-mmacosx-version-min=10.7 -std=c++11 -stdlib=libc++"
+    compiler: clang
+
+  - env: SET=test01 BCFG=debug
+    os: osx
+    osx_image: xcode11.3
+    compiler: clang
+
+  - env: SET=test01 WINE=32 TEST=NO
+  - env: SET=test01 WINE=32 TEST=NO BCFG=static
+  - env: SET=test01 WINE=32 TEST=NO BCFG=debug
+  - env: SET=test01 WINE=32 TEST=NO BCFG=static-debug
+
+  - env: SET=test01 WINE=64 TEST=NO
+  - env: SET=test01 WINE=64 TEST=NO BCFG=static
+  - env: SET=test01 WINE=64 TEST=NO BCFG=debug
+  - env: SET=test01 WINE=64 TEST=NO BCFG=static-debug
+
+  - env: SET=test01 RTEMS=4.9 BASE=3.15 TEST=NO APT=usrmerge
+  - env: SET=test01 RTEMS=4.9 BASE=3.15 TEST=NO BCFG=debug APT=usrmerge
+
+  - env: SET=test01 RTEMS=4.10 APT=usrmerge
+  - env: SET=test01 RTEMS=4.10 BCFG=debug APT=usrmerge
+
+  - env: SET=test01 RTEMS=5 RTEMS_TARGET=RTEMS-pc686-qemu
+    dist: focal
+  - env: SET=test01 RTEMS=5 RTEMS_TARGET=RTEMS-pc686-qemu BCFG=debug
+    dist: focal
 
   - env: SET=test01
-    compiler: gcc-7
+    os: windows
-    addons: { apt: { packages: ["g++-7"], sources: ["ubuntu-toolchain-r-test"] } }
+  - env: SET=test01 BCFG=static
+    os: windows
+  - env: SET=test01 BCFG=debug
+    os: windows
+  - env: SET=test01 BCFG=static-debug
+    os: windows
 
-# MacOS build
+  - env: SET=test01
-
+    compiler: vs2017
-# SNCSEQ 2.2.7 fails to build on MacOS; currently needs master
+    os: windows
-  - env: SET=test01 SNCSEQ=master
+  - env: SET=test01 BCFG=static
-    os: osx
+    compiler: vs2017
-    compiler: clang
+    os: windows
-
+  - env: SET=test01 BCFG=debug
-# Base 3.15 builds
+    compiler: vs2017
-# ================
+    os: windows
-
+  - env: SET=test01 BCFG=static-debug
-  - env: BASE=R3.15.7 SET=test01
+    compiler: vs2017
-
+    os: windows
-  - env: BASE=R3.15.7 SET=test01 WINE=64 TEST=NO STATIC=YES
-    dist: bionic
-    compiler: mingw
-
-# The DLL build for this Base version is known to fail
-#  - env: BASE=R3.15.7 SET=test01 WINE=64 TEST=NO STATIC=NO
-#    dist: bionic
-#    compiler: mingw
-
-# Cross-compilation to RTEMS
-# (needs EPICS Base >= 3.16.2)
-
-  - env: BASE=R3.16.2 SET=test01 RTEMS=4.10 TEST=NO
-    dist: trusty
-
-  - env: BASE=R3.16.2 SET=test01 RTEMS=4.9 TEST=NO
-    dist: trusty
-
-# SNCSEQ 2.2.7 fails to build on MacOS; currently needs master
-  - env: BASE=R3.15.7 SET=test01 SNCSEQ=master
-    os: osx
-    compiler: clang
-
-# Base 3.14 builds
-# ================
-
-  - env: BASE=R3.14.12.8 SET=test01
-
-  - env: BASE=R3.14.12.8 SET=test01 WINE=64 TEST=NO STATIC=YES
-    dist: bionic
-    compiler: mingw
-
-# The DLL build for this Base version is known to fail
-#  - env: BASE=R3.14.12.8 SET=test01 WINE=64 TEST=NO STATIC=NO
-#    dist: bionic
-#    compiler: mingw
-
-# SNCSEQ 2.2.7 fails to build on MacOS; currently needs master
-  - env: BASE=R3.14.12.8 SET=test01 SNCSEQ=master
-    os: osx
-    compiler: clang

README.md

@@ -1,7 +1,10 @@
 <a target="_blank" href="http://semver.org">![Version][badge.version]</a>
 <a target="_blank" href="https://travis-ci.org/epics-base/ci-scripts">![Travis status][badge.travis]</a>
+<a target="_blank" href="https://ci.appveyor.com/project/epics-base/ci-scripts">![AppVeyor status][badge.appveyor]</a>
+<a target="_blank" href="https://github.com/epics-base/ci-scripts/actions">![GitHub Actions status][badge.gh-actions]</a>
+<a target="_blank" href="https://gitlab.com/epics-base/ci-scripts/-/pipelines">![GitLab CI/CD status][badge.gitlab]</a>
 
-# Continuous Integration Scripts for EPICS Modules
+# Continuous Integration for EPICS Modules
 
 The scripts inside this repository are intended to provide a common,
 easy-to-use and flexible way to add Continuous Integration to EPICS
@@ -9,66 +12,132 @@ software modules, e.g. Device or Driver Support modules.
 
 By including this repository as a Git Submodule, you will be able to
 use the same flexible, powerful CI setup that EPICS Bases uses,
-including a mechanism to specify sets of dependent modules
+including a way to specify sets of dependent modules
 (with versions) that you want to compile your module against.
 
-By using the submodule mechnism, your module will always use an
+By using the submodule mechanism, your module will always use an
 explicit commit, i.e. a fixed version of the scripts.
 This ensures that any further development of the ci-scripts will
-never break existing use.
+never break your existing use.
 
 ## This Repository
 
-In addition to the scripts themselves (in the subdirectories),
+In addition to the script that runs the builds and tests, this repository
-this repository contains the test suite that is used to verify
+contains service specific documentation and example configuration files
-functionality and features of the ci-scripts.
+(in the subdirectories), and a small test suite that is used to verify
+functionality and features of the ci-scripts module itself
 
-You are welcome to use the test suite as a reference, but keep in
+The example files are your best reference. They are kept up-to-date and
-mind that in your module the path to the scripts has one level more
+show a fully-featured and a minimal setup.
-(e.g., `./travis/abc` here would be `./.ci/travis/abc` in your
+
+You are welcome to use the test suite as a secondary reference, but keep in
+mind that in your main module the path to the scripts has one level more
+(e.g., `./abc` here would be `./.ci/abc` in your
 module).
-Also, a test suite might not show the same level of quality as an
+Also, the test suite does not show the same quality and documentation
-example.
+levels as the example files.
 
 ## Features
 
  - Compile against different branches or releases of EPICS Base and
-   additional dependencies (modules like asyn, std, etc.).
+   additional dependencies (modules like asyn, std, sequencer, etc.).
 
- - Define settings files that declare sets of dependencies
+ - Define setup files that declare sets of dependencies with their
-   with their versions and locations.
+   versions and locations.
 
- - Define hook scripts for any dependency.
+ - Define hooks for any dependency.
    Hooks are run on the dependency module before it is compiled, so
    the module can be patched or further configured.
 
- - Define static or shared builds (executables, libraries).
+ - Define shared (default) or static builds (for executables and libraries).
+ 
+ - Define optimized (default) or debug builds.
 
- - Run tests (using the EPICS unit test suite).
+ - Run tests (using the EPICS build system, i.e., `make runtests`
+   and friends).
 
 ## Supported CI Services
 
-### Travis-CI
+The listed properties and instructions for the CI services apply to
- - Use different compilers (gcc, clang)
+their free tiers for open source projects, hosted in the cloud on
- - Use different gcc versions
+their infrastructure.
+
+The companies behind these services also offer "enterprise" installations
+on customer infrastructure, which will have different performance
+and limitations.
+
+### [Travis-CI](https://travis-ci.org/)
+ - Two parallel runners on Linux/Windows (two runners on MacOS)
+ - Ubuntu 14/16/18/20, MacOS 10.13/14/15, Windows Server v1809
+ - Compile natively on Linux (different versions of gcc, clang)
+ - Compile natively on MacOS (clang)
+ - Compile natively on Windows (gcc/MinGW, Visual Studio 2017)
  - Cross-compile for Windows 32bit and 64bit using MinGW and WINE
- - Cross-compile for RTEMS 4.9 and 4.10 (Base >= 3.16.2)
+ - Cross-compile for RTEMS 4.9 and 4.10 (pc386, Base >= 3.15)
- - Compile on MacOS
+ - Cross-compile for RTEMS 5 (10 BSPs, Base >= 7.0.5.1)
- - Built dependencies are cached (for faster builds)
+ - Built dependencies are cached (for faster builds).
+ 
+See specific
+**[ci-scripts on Travis-CI README](travis/README.md)**
+for more details.
+
+### [AppVeyor](https://www.appveyor.com/)
+ - One parallel runner (all builds are sequential)
+ - Windows Server 2012/2016/2019
+ - Compile using gcc/MinGW or different Visual Studio versions: \
+   2008, 2010, 2012, 2013, 2015, 2017, 2019
+ - Compile for Windows 32bit and 64bit
+ - No useful caching available.
+
+See specific
+**[ci-scripts on AppVeyor README](appveyor/README.md)**
+for more details.
+
+### [GitHub Actions](https://github.com/)
+ - 20 parallel runners on Linux/Windows (5 runners on MacOS)
+ - Ubuntu 16/18/20, MacOS 10.15, Windows Server 2016/2019
+ - Compile natively on Linux (gcc, clang)
+ - Compile natively on MacOS (clang)
+ - Compile natively on Windows (gcc/MinGW, Visual Studio 2017 & 2019)
+ - Cross-compile for Windows 32bit and 64bit using MinGW and WINE
+ - Cross-compile for RTEMS 4.9 and 4.10 (pc386, Base >= 3.15)
+ - Cross-compile for RTEMS 5 (10 BSPs, Base >= 7.0.5.1)
+ - Caching not supported by ci-scripts yet.
+
+See specific
+**[ci-scripts on GitHub Actions README](github-actions/README.md)**
+for more details.
+
+### [GitLab CI/CD](https://gitlab.com/)
+
+ - Docker-based runners on Linux (one VM instance per job)
+ - Can use any Docker image from Dockerhub (the examples use
+  `ubuntu:bionic`)
+ - Compile natively using different compilers (gcc, clang)
+ - Cross-compile for Windows 32bit and 64bit using MinGW and WINE
+ - Cross-compile for RTEMS 4.9 and 4.10 (pc386, Base >= 3.15)
+ - Cross-compile for RTEMS 5 (10 BSPs, Base >= 7.0.5.1)
+ - Built dependencies are cached (for faster builds).
+
+See specific
+**[ci-scripts on GitLab CI/CD README](gitlab/README.md)**
+for more details.
 
 ## How to Use the CI-Scripts
 
- 1. Get an account on a supported CI service provider platform.
+ 1. Get an account on a supported CI service provider platform
     (e.g. [Travis-CI](https://travis-ci.org/),
-    Appveyor, Azure Pipelines...)
+    [AppVeyor](https://www.appveyor.com/), ...).
+    GitHub Actions does not require a separate account.
 
     (More details in the specific README of the subdirectory.)
 
- 2. In your Support Module, add this ci-scripts respository
+ 2. In your module, add this ci-scripts repository
     as a Git Submodule (name suggestion: `.ci`).
+    ```bash
+    git submodule add https://github.com/epics-base/ci-scripts .ci
     ```
-    $ git submodule add https://github.com/epics-base/ci-scripts .ci
+
-    ```
  3. Create setup files for different sets of dependencies you
     want to compile against. (See below.)
 
@@ -76,13 +145,14 @@ example.
     ```
     MODULES=sncseq asyn
 
-    BASE=R3.15.6
+    BASE=3.15
     ASYN=R4-34
-    SNCSEQ=R2-2-7
+    SNCSEQ=R2-2-8
     ```
-    will compile against the EPICS Base release 3.15.6, the Sequencer
+    will compile against the EPICS Base 3.15 branch, the Sequencer
-    release 2.2.7 and release 4.34 of asyn.
+    release 2.2.8 and release 4.34 of asyn.
-    (Any settings can be overridden from `.travis.yml`.)
+    (Any settings can be overridden from the specific job line
+    in the service configuration, e.g., `.travis.yml`.)
 
  4. Create a configuration for the CI service by copying one of
     the examples provided in the service specific subdirectory
@@ -92,14 +162,41 @@ example.
 
  5. Push your changes and check the CI service for your build results.
 
+## Calling the cue.py Script
+
+Independent from CI service and platform, the runner script is called
+from your main configuration as:
+
+`python .ci/cue.py <action>`
+
+where `<action>` is one of:
+
+`prepare`\
+Prepare the build by cloning Base and the configured dependency modules,
+set up the EPICS build system, then
+compile Base and these modules in the order they appear in the `MODULES`
+setting.
+
+`build`\
+Build your main module.
+
+`test`\
+Run the tests of your main module.
+
+`test-results`\
+Collect the results of your tests and print a summary.
+
+`exec`\
+Execute the remainder of the line using the default command shell.
+
 ## Setup Files
 
 Your module might depend on EPICS Base and a few other support modules.
 (E.g., a specific driver might need StreamDevice, ASYN and the Sequencer.)
 In that case, building against every possible combination of released
 versions of those dependencies is not possible:
-Base (37) x StreamDevice (50) x ASYN (40) x Sequencer (51) would produce
+Base (39) x StreamDevice (50) x ASYN (40) x Sequencer (52) would produce
-more than 3.7 million different combinations, i.e. build jobs.
+more than 4 million different combinations, i.e. build jobs.
 
 A more reasonable approach is to create a few setups, each being a
 combination of dependency releases, that do a few scans of the available
@@ -107,18 +204,23 @@ combination of dependency releases, that do a few scans of the available
 for stable versions that many of your users have in production, one for the
 latest released versions and one for the development branches.
 
+A job uses a setup file if `SET=<setup>` (without the `.set` extension
+of the setup file) is set for the job in the main configuration file.
+
 ## Setup File Syntax
 
-Setup files are loaded by the bash scripts. They are found by searching
+Setup files are loaded by the build script. They are found by searching
 the locations in `SETUP_PATH` (space or colon separated list of directories,
 relative to your module's root directory).
 
 Setup files can include other setup files by calling `include <setup>`
-(omitting the `.set` extension of the setup file). The configured
+(again omitting the `.set` extension of the setup file). The configured
 `SETUP_PATH` is searched for the include.
 
-Any `VAR=value` setting of a variable is only executed if `VAR` is unset or
+Any `VAR=value` setting of a variable in a setup file is only executed if
-empty. That way any settings can be overridden by settings in `.travis.yml`.
+`VAR` is unset or empty.
+That way any settings can be overridden by setting them in the job
+description inside the main configuration file (e.g., `.travis.yml`).
 
 Empty lines or lines starting with `#` are ignored.
 
@@ -128,6 +230,10 @@ EPICS Base (slug: `base`) will always be a dependency and will be added and
 compiled first. The other dependencies are added and compiled in the order
 they are defined in `MODULES`.
 
+Modules needed only for specific jobs (e.g., on specific architectures)
+can be added from the main configuration file by setting `ADD_MODULES`
+for the specific job(s).
+
 `REPOOWNER=<name>` sets the default GitHub owner (or organization) for all
 dependency modules. Useful if you want to compile against a complete set
 of dependencies forked into your private GitHub area.
@@ -161,10 +267,11 @@ recursing into submodules. [default is including submodules: `YES`]
 be always be extended by the release or branch name as `<name>-<version>`.
 [default is the slug in lower case: `foo`]
 
-`FOO_HOOK=<script>` Set the name of a script that will be run after cloning
+`FOO_HOOK=<hook>` Set the name of a `.patch` file, a `.zip` or `.7z` archive
-the module, before compiling it. Working directory when running the script
+or a script that will be applied (using `-p1`), extracted or run after cloning
-is the root of the targeted module (e.g. `.../.cache/foo-1.2`).
+the module, before compiling it.
-[default: no hooks are run]
+Working directory is the root of the targeted module,
+e.g., `.../.cache/foo-1.2`). [default: no hook]
 
 `FOO_VARNAME=<name>` Set the name that is used for the module when creating
 the `RELEASE.local` files. [default is the slug in upper case: `FOO`]
@@ -174,31 +281,179 @@ that usually it is sufficient to set `FOO=<version>`.
 You can find the list of supported (and tested) modules in `defaults.set`.
 Feel free to suggest more default settings using a Pull Request.
 
+## RTEMS
+
+Setting `RTEMS` to the RTEMS version number (`4.9`, `4.10` or `5`)
+enables cross-compiling to RTEMS on supported CI services.
+Tests can also be run cross-platform, using `qemu`.
+
+The RTEMS 5 builds now include most of the BSPs with configuration in Base:
+
+- beatnik
+- gen68360
+- mcp750
+- mvme167
+- mvme2100
+- mvme3100
+- pc686 w/ libbsd
+- qoriq_e500 w/ libbsd
+- uC5282
+- xilinx_zynq_a9_qemu w/ libbsd
+
+Build configuration [can be found here][ref.rtems5build].
+Set `RTEMS_TARGET` to configure the EPICS target architecture and
+`RSB_BUILD` to select the RTEMS toolchain release name/data from
+https://github.com/mdavidsaver/rsb/releases.
+
+RTEMS 5 builds need to be switched to a newer ubuntu version
+(aka. **os: ubuntu-20.04** with GitHub Actions,
+**dist: focal** with Travis-CI or
+**image: ubuntu:focal** with GitLab CI/CD).
+
 ## Debugging
 
-Setting `VV=1` in your `.travis.yml` configuration for a specific job
+Setting `VV=1` in your service configuration (e.g., `.travis.yml`) for a
-will run the job with high verbosity, printing every command as it is being
+specific job will run the job with high verbosity,
-executed and switching the dependency builds to higher verbosity.
+printing every command as it is being executed and switching the dependency
+builds to higher verbosity.
 
-## References: User Modules
+For debugging on your local machine, you may set `CACHEDIR` to change the 
+location for the dependency builds. [default is `$HOME/.cache`]
 
-EPICS: [PCAS module](https://github.com/epics-modules/pcas)
+Set `PARALLEL_MAKE` to the number of parallel make jobs that you want your
+build to use. [default is the number of CPUs on the runner]
 
-EPICS Base: [pvData](https://github.com/epics-base/pvDataCPP),
+Set `CLEAN_DEPS` to `NO` if you want to leave the object file directories
+(`**/O.*`) in the cached dependencies. [default is to run `make clean`
+after building a dependency]
+
+Service specific options are described in the README files
+in the service specific subdirectories:
+
+- [Travis-CI README](travis/README.md)
+- [AppVeyor README](appveyor/README.md)
+- [GitHub Actions README](github-actions/README.md)
+- [GitLab README](gitlab/README.md)
+
+## References: EPICS Modules Using ci-scripts
+
+[EPICS Base](https://github.com/epics-base/epics-base) and its submodules
+[pvData](https://github.com/epics-base/pvDataCPP),
 [pvAccess](https://github.com/epics-base/pvAccessCPP),
-[pva2pva](https://github.com/epics-base/pva2pva)
+[pva2pva](https://github.com/epics-base/pva2pva),
+[PVXS](https://github.com/mdavidsaver/pvxs)
 
-ESS: [Motor driver (model 3) for EtherCAT Motion Controller](https://github.com/EuropeanSpallationSource/m-epics-ethercatmc)
+EPICS Modules:
+[ASYN](https://github.com/epics-modules/asyn),
+[autosave](https://github.com/epics-modules/autosave),
+[busy](https://github.com/epics-modules/busy),
+[devlib2](https://github.com/epics-modules/devlib2),
+[ecmc](https://github.com/epics-modules/ecmc),
+[gtest](https://github.com/epics-modules/gtest),
+[ip](https://github.com/epics-modules/ip),
+[lua](https://github.com/epics-modules/lua),
+[MCoreUtils](https://github.com/epics-modules/MCoreUtils),
+[modbus](https://github.com/epics-modules/modbus),
+[motor](https://github.com/epics-modules/motor),
+[mrfioc2](https://github.com/epics-modules/mrfioc2),
+[OPCUA](https://github.com/ralphlange/opcua),
+[PCAS](https://github.com/epics-modules/pcas),
+[softGlueZync](https://github.com/epics-modules/softGlueZynq),
+[sscan](https://github.com/epics-modules/sscan),
+[std](https://github.com/epics-modules/std),
+[vac](https://github.com/epics-modules/vac),
+[xxx](https://github.com/epics-modules/xxx)
 
-ITER: [OPC UA Device Support](https://github.com/ralphlange/opcua)
+ESS: [EtherCAT MC Motor Driver][ref.ethercatmc]
+
+## Migration Hints
+
+Look for changes in the example configuration files, and check how they
+apply to your module.
+
+If comments in the example have changed, copy them to your configuration
+to always have up-to-date documentation in your file.
+
+### 2.x to 3.x Migration
+
+Update the script and test settings in your configuration to call the
+new script, following the example file.
+
+`python .ci/cue.py <action>`
+
+#### AppVeyor
+
+The `configuration:` setting options have changed; they are now
+`default`, `static`, `debug` and `static-debug`.
+
+MinGW builds are now using the `CMP: gcc` compiler setting.
+
+Adding arguments to make is supported through the `EXTRA` .. `EXTRA5`
+variables. Each variable value will be passed as one argument.
+
+#### Travis
+
+The new `BCFG` (build configuration) variable accepts the same options as
+the AppVeyor `configuration:` setting. Replace any`STATIC=YES` settings with
+`BCFG=static`.
+
+Remove `bash` in the `homebrew:` section of `addons:`. There are no more
+bash scripts.
+
+MinGW builds (cross-builds using WINE as well as native builds on Windows)
+are now using the `gcc` compiler setting.
+Since `gcc` is the default, you can simply remove `compiler: mingw` lines.
+
+For Windows, Travis offers native MinGW and Visual Studio 2017 compilers.
+Use `os: windows` and set `compiler:` to `gcc` or `vs2017`
+ for those builds.
+
+Chocolatey packages to be installed for the Windows jobs are set by adding
+them to the environment variable `CHOCO`.
 
 ## Frequently Asked Questions
 
-**How can I see what the dependency jobs are actually doing?**
+##### How can I see what the dependency building jobs are actually doing?
 
 Set `VV=1` in the configuration line of the job you are interested in.
 This will make all builds (not just for your module) verbose.
 
+##### How do I update my module to use a newer minor release of ci-scripts?
+
+Update the submodule in `.ci` first, then change your CI configuration
+(if needed) and commit both to your module. E.g., to update your Travis
+setup to release 3.3.0 of ci-scripts:
+```bash
+cd .ci
+git pull origin v3.3.0
+cd -
+git add .ci
+  # if needed:
+  edit .travis.yml     # and/or other CI service configurations
+  git add .travis.yml
+git commit -m "Update ci-scripts submodule to v3.3.0"
+```
+
+Check the example configuration files inside ci-scripts (and their
+changes) to see what might be needed and/or interesting to change
+in your configuration.
+
+Depending on the changes contained in the ci-scripts update, it might
+be advisable to clear the CI caches after updating ci-scripts. E.g.,
+a change in setting up EPICS Base will not be applied if Base is found 
+in the cache.
+
+##### How do I add a dependency module only for a specific job?
+
+Add the additional dependency in the main configuration file by setting
+`ADD_MODULES` for the specific job(s).
+
+##### Why the name _cue_?
+
+The noun _cue_ is defined as "_a signal (such as a word, phrase, or bit of
+stage business) to a performer to begin a specific speech or action_".
+(Merriam-Webster)
+
 ## Release Numbering of this Module
 
 The module tries to apply [Semantic Versioning](https://semver.org/).
@@ -212,6 +467,7 @@ is created.
 
 Minor release numbers refer to additions and enhancements that do not
 require the configuration inside an existing user module to be changed.
+(Unless for using a new feature.)
 
 Again: using the git submodule mechanism to include these scripts means
 that user modules always work with a fixed, frozen version.
@@ -226,5 +482,13 @@ This module is distributed subject to a Software License Agreement found
 in file LICENSE that is included with this distribution.
 
 <!-- Links -->
-[badge.version]: https://badge.fury.io/gh/epics-base%2Fci-scripts.svg
+[badge.version]: https://img.shields.io/github/v/release/epics-base/ci-scripts?sort=semver
 [badge.travis]: https://travis-ci.org/epics-base/ci-scripts.svg?branch=master
+[badge.appveyor]: https://ci.appveyor.com/api/projects/status/8b578alg974axvux?svg=true
+[badge.gh-actions]: https://github.com/epics-base/ci-scripts/workflows/ci-scripts%20build/test/badge.svg
+[badge.gitlab]: https://gitlab.com/epics-base/ci-scripts/badges/master/pipeline.svg
+
+[reddit.bash]: https://www.reddit.com/r/bash/comments/393oqv/why_is_the_version_of_bash_included_in_os_x_so_old/
+
+[ref.ethercatmc]: https://github.com/EuropeanSpallationSource/m-epics-ethercatmc
+[ref.rtems5build]: https://github.com/mdavidsaver/rsb/blob/3911854462e74838e3e5f33a9e8f936fd0f1d95d/.github/workflows/build-5.yml#L98-L137

add-msi-to-314.patch

@@ -0,0 +1,851 @@
+diff --git a/config/RULES.Db b/config/RULES.Db
+index b4946c7aa..90b76ed08 100644
+--- a/config/RULES.Db
++++ b/config/RULES.Db
+@@ -12,11 +12,7 @@
+ #
+ MAKEBPT		= $(EPICS_BASE_HOST_BIN)/makeBpt$(EXE)
+ 
+-ifndef MSI
+-# Tool from R3.14 extensions bin, R3.13 extensions bin, or user path
+-MSI = $(firstword $(wildcard $(EPICS_EXTENSIONS_HOST_BIN)/msi$(HOSTEXE) \
+-         $(EPICS_EXTENSIONS)/bin/$(HOST_ARCH)/msi$(HOSTEXE)) msi$(HOSTEXE))
+-endif
++MSI = $(EPICS_BASE_HOST_BIN)/msi$(HOSTEXE)
+ 
+ DBEXPAND	= $(EPICS_BASE_HOST_BIN)/dbExpand$(EXE)
+ DBST		= dbst
+diff --git a/configure/CONFIG_BASE b/configure/CONFIG_BASE
+index 7ee5a5b89..9a9793093 100644
+--- a/configure/CONFIG_BASE
++++ b/configure/CONFIG_BASE
+@@ -112,8 +112,5 @@ ifndef DBST
+ DBST = dbst
+ endif
+ 
+-ifndef MSI
+-MSI = msi
+-endif
+-
++MSI = $(EPICS_BASE_HOST_BIN)/msi$(HOSTEXE)
+ 
+diff --git a/src/dbtools/Makefile b/src/dbtools/Makefile
+index 38ed52c9e..8655a5337 100644
+--- a/src/dbtools/Makefile
++++ b/src/dbtools/Makefile
+@@ -11,6 +11,11 @@ TOP=../..
+ 
+ include $(TOP)/configure/CONFIG
+ 
++PROD_HOST += msi
++
++msi_SRCS = msi.c
++msi_LIBS += Com
++
+ INC += dbLoadTemplate.h
+ INC += dbtoolsIocRegister.h
+ 
+diff --git a/src/dbtools/msi.c b/src/dbtools/msi.c
+new file mode 100644
+index 000000000..525d4f25b
+--- /dev/null
++++ b/src/dbtools/msi.c
+@@ -0,0 +1,798 @@
++/*************************************************************************\
++* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
++* National Laboratory.
++* Copyright (c) 2002 The Regents of the University of California, as
++* Operator of Los Alamos National Laboratory.
++* This file is distributed subject to a Software License Agreement found
++* in the file LICENSE that is included with this distribution. 
++\*************************************************************************/
++/*msi - macro sunstitutions and include */
++ 
++/*
++ * Modification Log:
++ * -----------------
++ * .01  08DEC97       mrk     Original version
++ */
++
++#include <stdlib.h>
++#include <stddef.h>
++#include <stdio.h>
++#include <string.h>
++#include <ctype.h>
++#include <errno.h>
++
++#include <epicsVersion.h>
++#include <dbDefs.h>
++#include <macLib.h>
++#include <ellLib.h>
++#include <errlog.h>
++
++#define MAX_BUFFER_SIZE 4096
++
++#if ((EPICS_VERSION <= 3) && (EPICS_REVISION <= 13))
++#define macEnvExpand(x) strdup(x)
++#endif
++
++/*Forward references to local routines*/
++static void usageExit(void);
++static void addMacroReplacements(MAC_HANDLE *macPvt,char *pval);
++static void makeSubstitutions(void *inputPvt,void *macPvt,char *templateName);
++
++/*Routines that read the template files */
++static void inputConstruct(void **inputPvt);
++static void inputDestruct(void *inputPvt);
++static void inputAddPath(void *inputPvt, char *pval);
++static void inputBegin(void *inputPvt,char *fileName);
++static char *inputNextLine(void *inputPvt);
++static void inputNewIncludeFile(void *inputPvt,char *name);
++static void inputErrPrint(void *inputPvt);
++
++/*Routines that read the substitution file */
++static void substituteDestruct(void *substitutePvt);
++static void substituteOpen(void **substitutePvt,char *substitutionName);
++static int substituteGetNextSet(void *substitutePvt,char **filename);
++static char *substituteGetReplacements(void *substitutePvt);
++
++/*Exit status*/
++static int exitStatus = 0;
++
++int opt_V = 0;
++
++
++int main(int argc,char **argv)
++{
++    void *inputPvt;
++    MAC_HANDLE *macPvt;
++    char *pval;
++    int  narg;
++    char *substitutionName=0;
++    char *templateName=0;
++    int  i;
++
++    inputConstruct(&inputPvt);
++    macCreateHandle(&macPvt,0);
++    macSuppressWarning(macPvt,1);
++    while((argc>1) && (argv[1][0] == '-')) {
++	narg = (strlen(argv[1])==2) ? 2 : 1;
++	pval = (narg==1) ? (argv[1]+2) : argv[2];
++	if(strncmp(argv[1],"-I",2)==0) {
++	    inputAddPath(inputPvt,pval);
++	} else if(strncmp(argv[1],"-o",2)==0) {
++	    if(freopen(pval,"w",stdout)==NULL) {
++            fprintf(stderr,"Can't open %s for writing: %s\n", pval, strerror(errno));
++            exit(1);
++        }
++	} else if(strncmp(argv[1],"-M",2)==0) {
++	    addMacroReplacements(macPvt,pval);
++	} else if(strncmp(argv[1],"-S",2)==0) {
++	    substitutionName = calloc(strlen(pval)+1,sizeof(char));
++	    strcpy(substitutionName,pval);
++	} else if(strncmp(argv[1],"-V",2)==0) {
++	    macSuppressWarning(macPvt,0);
++	    opt_V = 1;
++	    narg = 1; /* no argument for this option */
++	} else {
++	    usageExit();
++	}
++	argc -= narg;
++	for(i=1; i<argc; i++) argv[i] = argv[i + narg];
++    }
++    if(argc>2) {
++	fprintf(stderr,"too many filename arguments\n");
++	usageExit();
++    }
++    if(argc==2) {
++        templateName = calloc(strlen(argv[1])+1,sizeof(char));
++        strcpy(templateName,argv[1]);
++    }
++    if(!substitutionName) {
++	makeSubstitutions(inputPvt,macPvt,templateName);
++    } else {
++	void *substitutePvt;
++        char *filename = 0;
++
++	substituteOpen(&substitutePvt,substitutionName);
++        while(substituteGetNextSet(substitutePvt,&filename)) {
++            if(templateName) filename = templateName;
++            if(!filename) {
++	        fprintf(stderr,"no template file\n");
++	        usageExit();
++            }
++            macPushScope(macPvt);
++	    while((pval = substituteGetReplacements(substitutePvt))){
++	        addMacroReplacements(macPvt,pval);
++	        makeSubstitutions(inputPvt,macPvt,filename);
++	    }
++            macPopScope(macPvt);
++        }
++        substituteDestruct(substitutePvt);
++    }
++    errlogFlush();
++    inputDestruct(inputPvt);
++    free((void *)templateName);
++    free((void *)substitutionName);
++    return(exitStatus);
++}
++
++void usageExit(void)
++{
++    fprintf(stderr,"usage: msi -V -opath -Ipath ... -Msub ... -Ssubfile  template\n");
++    fprintf(stderr,"    Specifying path will replace the default '.'\n");
++    fprintf(stderr,"    stdin is used if template is not given\n");
++    exit(1);
++}
++
++static void addMacroReplacements(MAC_HANDLE *macPvt,char *pval)
++{
++    char **pairs;
++    long status;
++
++    status = macParseDefns(macPvt,pval,&pairs);
++    if(!status) {
++        fprintf(stderr,"Error macParseDefns error\n");
++        usageExit();
++    }
++    status = macInstallMacros(macPvt,pairs);
++    if(!status) {
++        fprintf(stderr,"Error macInstallMacros error\n");
++        usageExit();
++    }
++    free((void *)pairs);
++}
++
++typedef enum {cmdInclude,cmdSubstitute} cmdType;
++static const char *cmdNames[] = {"include","substitute"};
++static void makeSubstitutions(void *inputPvt,void *macPvt,char *templateName)
++{
++    char *input;
++    static char buffer[MAX_BUFFER_SIZE];
++    int  n;
++    static int unexpWarned = 0;
++
++    inputBegin(inputPvt,templateName);
++    while((input = inputNextLine(inputPvt))) {
++	int	expand=1;
++	char	*p;
++	char	*command = 0;
++
++	p = input; 
++	/*skip whitespace at beginning of line*/
++	while(*p && (isspace(*p))) ++p;
++	/*Look for i or s */
++	if(*p && (*p=='i' || *p=='s')) command = p;
++	if(command) {
++	    char *pstart;
++	    char *pend;
++	    char *copy;
++	    int  cmdind=-1;
++	    int  i;
++	    
++	    for(i=0; i< NELEMENTS(cmdNames); i++) {
++		if(strstr(command,cmdNames[i])) {
++		    cmdind = i;
++		}
++	    }
++	    if(cmdind<0) goto endif;
++	    p = command + strlen(cmdNames[cmdind]);
++	    /*skip whitespace after command*/
++	    while(*p && (isspace(*p))) ++p;
++	    /*Next character must be quote*/
++	    if((*p==0) || (*p!='"')) goto endif;
++	    pstart = ++p;
++	    /*Look for end quote*/
++	    while(*p && (*p!='"')) {
++		/*allow escape for imbeded quote*/
++		if((*p=='\\') && *(p+1)=='"') {
++		    p += 2; continue;
++		} else {
++		    if(*p=='"') break;
++		}
++		++p;
++	    }
++	    pend = p;
++	    if(*p==0) goto endif;
++            /*skip quote and any trailing blanks*/
++            while(*++p==' ') ;
++            if(*p != '\n' && *p !=0) goto endif;
++	    copy = calloc(pend-pstart+1,sizeof(char));
++	    strncpy(copy,pstart,pend-pstart);
++	    switch(cmdind) {
++	    case cmdInclude:
++	        inputNewIncludeFile(inputPvt,copy);
++		break;
++	    case cmdSubstitute:
++		addMacroReplacements(macPvt,copy);
++		break;
++	    default:
++		fprintf(stderr,"Logic Error: makeSubstitutions\n");
++	        inputErrPrint(inputPvt);
++		exit(1);
++	    }
++	    free(copy);
++	    expand = 0;
++	}
++endif:
++	if (expand) {
++	    n = macExpandString(macPvt,input,buffer,MAX_BUFFER_SIZE-1);
++	    fputs(buffer,stdout);
++	    if (!unexpWarned && n<0) {
++		const char * pErrMsg = "Warning: Undefined macros present, use msi -V to list\n";
++		if ( opt_V ) {
++		    exitStatus = 2;
++		    pErrMsg = "Error: Undefined macros present\n";
++		}
++		fprintf( stderr, pErrMsg );
++		unexpWarned++;
++	    }
++	}
++    }
++}
++
++typedef struct inputFile{
++    ELLNODE	node;
++    char	*filename;
++    FILE	*fp;
++    int		lineNum;
++}inputFile;
++
++typedef struct pathNode {
++    ELLNODE	node;
++    char	*directory;
++} pathNode;
++
++typedef struct inputData {
++    ELLLIST 	inputFileList;
++    ELLLIST 	pathList;
++    char	inputBuffer[MAX_BUFFER_SIZE];
++}inputData;
++
++static void inputOpenFile(inputData *pinputData,char *filename);
++static void inputCloseFile(inputData *pinputData);
++static void inputCloseAllFiles(inputData *pinputData);
++
++static void inputConstruct(void **ppvt)
++{
++    inputData	*pinputData;
++
++    pinputData = calloc(1,sizeof(inputData));
++    ellInit(&pinputData->inputFileList);
++    ellInit(&pinputData->pathList);
++    *ppvt = pinputData;
++}
++
++static void inputDestruct(void *pvt)
++{
++    inputData	*pinputData = (inputData *)pvt;
++    pathNode	*ppathNode;
++
++    inputCloseAllFiles(pinputData);
++    while((ppathNode = (pathNode *)ellFirst(&pinputData->pathList))) {
++	ellDelete(&pinputData->pathList,&ppathNode->node);
++	free((void *)ppathNode->directory);
++	free((void *)ppathNode);
++    }
++    free(pvt);
++}
++
++static void inputAddPath(void *pvt, char *path)
++{
++    inputData	*pinputData = (inputData *)pvt;
++    ELLLIST	*ppathList = &pinputData->pathList;
++    pathNode	*ppathNode;
++    const char	*pcolon;
++    const char	*pdir;
++    int		len;
++    int		emptyName;
++
++    pdir = path;
++    /*an empty name at beginning, middle, or end means current directory*/
++    while(pdir && *pdir) {
++	emptyName = ((*pdir == ':') ? 1 : 0);
++	if(emptyName) ++pdir;
++	ppathNode = (pathNode *)calloc(1,sizeof(pathNode));
++	ellAdd(ppathList,&ppathNode->node);
++	if(!emptyName) {
++	    pcolon = strchr(pdir,':');
++	    len = (pcolon ? (pcolon - pdir) : strlen(pdir));
++	    if(len>0)  {
++	        ppathNode->directory = (char *)calloc(len+1,sizeof(char));
++	        strncpy(ppathNode->directory,pdir,len);
++		pdir = pcolon;
++		/*unless at end skip past first colon*/
++		if(pdir && *(pdir+1)!=0) ++pdir;
++	    } else { /*must have been trailing : */
++		emptyName=1;
++	    }
++	}
++	if(emptyName) {
++	    ppathNode->directory = (char *)calloc(2,sizeof(char));
++	    strcpy(ppathNode->directory,".");
++	}
++    }
++    return;
++}
++
++static void inputBegin(void *pvt,char *fileName)
++{
++    inputData	*pinputData = (inputData *)pvt;
++
++    inputCloseAllFiles(pinputData);
++    inputOpenFile(pinputData,fileName);
++}
++
++static char *inputNextLine(void *pvt)
++{
++    inputData	*pinputData = (inputData *)pvt;
++    inputFile	*pinputFile;
++    char	*pline;
++
++    while((pinputFile = (inputFile *)ellFirst(&pinputData->inputFileList))) {
++        pline = fgets(pinputData->inputBuffer,MAX_BUFFER_SIZE,pinputFile->fp);
++	if(pline) {
++	    ++pinputFile->lineNum;
++	    return(pline);
++	}
++	inputCloseFile(pinputData);
++    }
++    return(0);
++}
++
++static void inputNewIncludeFile(void *pvt,char *name)
++{
++    inputData	*pinputData = (inputData *)pvt;
++
++    inputOpenFile(pinputData,name);
++}
++
++static void inputErrPrint(void *pvt)
++{
++    inputData	*pinputData = (inputData *)pvt;
++    inputFile	*pinputFile;
++
++    fprintf(stderr,"input: %s  which is ",pinputData->inputBuffer);
++    pinputFile = (inputFile *)ellFirst(&pinputData->inputFileList);
++    while(pinputFile) {
++	fprintf(stderr,"line %d of ",pinputFile->lineNum);
++	if(pinputFile->filename) {
++	    fprintf(stderr," file %s\n",pinputFile->filename);
++	} else {
++	    fprintf(stderr,"stdin:\n");
++	}
++	pinputFile = (inputFile *)ellNext(&pinputFile->node);
++	if(pinputFile) {
++	    fprintf(stderr,"  which is included from ");
++	} else {
++	    fprintf(stderr,"\n");
++	}
++    }
++    fprintf(stderr,"\n");
++}
++
++static void inputOpenFile(inputData *pinputData,char *filename)
++{
++    ELLLIST	*ppathList = &pinputData->pathList;
++    pathNode	*ppathNode = 0;
++    inputFile	*pinputFile;
++    char	*fullname = 0;
++    FILE	*fp = 0;
++
++    if(!filename) {
++	fp = stdin;
++    } else if((ellCount(ppathList)==0) || strchr(filename,'/')){
++	fp = fopen(filename,"r");
++    } else {
++        ppathNode = (pathNode *)ellFirst(ppathList);
++        while(ppathNode) {
++	    fullname = calloc(strlen(filename)+strlen(ppathNode->directory) +2,
++		sizeof(char));
++	    strcpy(fullname,ppathNode->directory);
++	    strcat(fullname,"/");
++	    strcat(fullname,filename);
++	    fp = fopen(fullname,"r");
++	    if(fp) break;
++	    free((void *)fullname);
++	    ppathNode = (pathNode *)ellNext(&ppathNode->node);
++	}
++    }
++    if(!fp) {
++	fprintf(stderr,"Could not open %s\n",filename);
++        inputErrPrint((void *)pinputData);
++        exit(1);
++    }
++    pinputFile = calloc(1,sizeof(inputFile));
++    if(ppathNode) {
++	pinputFile->filename = calloc(1,strlen(fullname)+1);
++	strcpy(pinputFile->filename,fullname);
++	free((void *)fullname);
++    } else if(filename) {
++        pinputFile->filename = calloc(1,strlen(filename)+1);
++        strcpy(pinputFile->filename,filename);
++    } else {
++	pinputFile->filename = calloc(1,strlen("stdin")+1);
++	strcpy(pinputFile->filename,"stdin");
++    }
++    pinputFile->fp = fp;
++    ellInsert(&pinputData->inputFileList,0,&pinputFile->node);
++}
++
++static void inputCloseFile(inputData *pinputData)
++{
++    inputFile *pinputFile;
++
++    pinputFile = (inputFile *)ellFirst(&pinputData->inputFileList);
++    if(!pinputFile) return;
++    ellDelete(&pinputData->inputFileList,&pinputFile->node);
++    if(fclose(pinputFile->fp)) 
++	fprintf(stderr,"fclose failed: file %s\n",pinputFile->filename);
++    free(pinputFile->filename);
++    free(pinputFile);
++}
++
++static void inputCloseAllFiles(inputData *pinputData)
++{
++    inputFile	*pinputFile;
++
++    while((pinputFile=(inputFile *)ellFirst(&pinputData->inputFileList))){
++	inputCloseFile(pinputData);
++    }
++}
++
++/*start of code that handles substitution file*/
++typedef enum {
++    tokenLBrace,tokenRBrace,tokenSeparater,tokenString,tokenEOF
++}tokenType;
++
++typedef struct subFile {
++    char	*substitutionName;
++    FILE	*fp;
++    int		lineNum;
++    char	inputBuffer[MAX_BUFFER_SIZE];
++    char	*pnextChar;
++    tokenType	token;
++    char	string[MAX_BUFFER_SIZE];
++} subFile;
++
++typedef struct patternNode {
++    ELLNODE	node;
++    char	*var;
++}patternNode;
++
++typedef struct subInfo {
++    subFile	*psubFile;
++    int		isFile;
++    char	*filename;
++    int		isPattern;
++    ELLLIST	patternList;
++    size_t	size;
++    size_t	curLength;
++    char	*macroReplacements;
++}subInfo;
++
++static char *subGetNextLine(subFile *psubFile);
++static tokenType subGetNextToken(subFile *psubFile);
++static void subFileErrPrint(subFile *psubFile,char * message);
++static void freeSubFile(subInfo *psubInfo);
++static void freePattern(subInfo *psubInfo);
++static void catMacroReplacements(subInfo *psubInfo,const char *value);
++
++void freeSubFile(subInfo *psubInfo)
++{
++    subFile	*psubFile = psubInfo->psubFile;
++    if(psubFile->fp) {
++        if(fclose(psubFile->fp))
++            fprintf(stderr,"fclose failed on substitution file\n");
++    }
++    free((void *)psubFile);
++    free((void *)psubInfo->filename);
++    psubInfo->psubFile = 0;
++}
++
++void freePattern(subInfo *psubInfo)
++{
++    patternNode	*ppatternNode;
++    while((ppatternNode = (patternNode *)ellFirst(&psubInfo->patternList))) {
++	ellDelete(&psubInfo->patternList,&ppatternNode->node);
++	free(ppatternNode->var);
++	free(ppatternNode);
++    }
++    psubInfo->isPattern = 0;
++}
++
++static void substituteDestruct(void *pvt)
++{
++    subInfo	*psubInfo = (subInfo *)pvt;
++
++    freeSubFile(psubInfo);
++    freePattern(psubInfo);
++    free((void *)psubInfo);
++    return;
++}
++
++static void substituteOpen(void **ppvt,char *substitutionName)
++{
++    subInfo	*psubInfo;
++    subFile	*psubFile;
++    FILE	*fp;
++
++    psubInfo = calloc(1,sizeof(subInfo));
++    *ppvt = (void *)psubInfo;
++    psubFile = calloc(1,sizeof(subFile));
++    psubInfo->psubFile = psubFile;
++    ellInit(&psubInfo->patternList);
++    fp = fopen(substitutionName,"r");
++    if(!fp) {
++	fprintf(stderr,"Could not open %s\n",substitutionName);
++        exit(1);
++    }
++    psubFile->substitutionName = substitutionName;
++    psubFile->fp = fp;
++    psubFile->lineNum = 0;
++    psubFile->inputBuffer[0] = 0;
++    psubFile->pnextChar = &psubFile->inputBuffer[0];
++    subGetNextToken(psubFile);
++    return;
++}
++
++static int substituteGetNextSet(void *pvt,char **filename)
++{
++    subInfo	*psubInfo = (subInfo *)pvt;
++    subFile	*psubFile = psubInfo->psubFile;
++    patternNode	*ppatternNode;
++
++    *filename = 0;
++    while(psubFile->token==tokenSeparater) subGetNextToken(psubFile);
++    if(psubFile->token==tokenEOF) return(0);
++    if(psubFile->token==tokenString && strcmp(psubFile->string,"file")==0) {
++        psubInfo->isFile = 1;
++        if(subGetNextToken(psubFile)!=tokenString) {
++            subFileErrPrint(psubFile,"Expecting filename");
++            exit(1);
++        }
++        freePattern(psubInfo);
++        free((void *)psubInfo->filename);
++        if(psubFile->string[0]=='"'&&psubFile->string[strlen(psubFile->string)-1]=='"') {
++            psubFile->string[strlen(psubFile->string)-1]='\0';
++            psubInfo->filename = macEnvExpand(psubFile->string+1);
++        }
++        else {
++            psubInfo->filename = macEnvExpand(psubFile->string);
++        }
++        while(subGetNextToken(psubFile)==tokenSeparater);
++        if(psubFile->token!=tokenLBrace) {
++            subFileErrPrint(psubFile,"Expecting {");
++            exit(1);
++        }
++        subGetNextToken(psubFile);
++    }
++    *filename = psubInfo->filename;
++    while(psubFile->token==tokenSeparater) subGetNextToken(psubFile);
++    if(psubFile->token==tokenLBrace) return(1);
++    if(psubFile->token==tokenRBrace) return(0);
++    if(psubFile->token!=tokenString
++    || strcmp(psubFile->string,"pattern")!=0) {
++        subFileErrPrint(psubFile,"Expecting pattern");
++        exit(1);
++    }
++    freePattern(psubInfo);
++    psubInfo->isPattern = 1;
++    while(subGetNextToken(psubFile)==tokenSeparater);
++    if(psubFile->token!=tokenLBrace) {
++	subFileErrPrint(psubFile,"Expecting {");
++	exit(1);
++    }
++    while(1) {
++        while(subGetNextToken(psubFile)==tokenSeparater);
++	if(psubFile->token!=tokenString) break;
++	ppatternNode = calloc(1,sizeof(patternNode));
++	ellAdd(&psubInfo->patternList,&ppatternNode->node);
++	ppatternNode->var = calloc(strlen(psubFile->string)+1,sizeof(char));
++	strcpy(ppatternNode->var,psubFile->string);
++    }
++    if(psubFile->token!=tokenRBrace) {
++	subFileErrPrint(psubFile,"Expecting }");
++	exit(1);
++    }
++    subGetNextToken(psubFile);
++    return(1);
++}
++
++static char *substituteGetReplacements(void *pvt)
++{
++    subInfo	*psubInfo = (subInfo *)pvt;
++    subFile	*psubFile = psubInfo->psubFile;
++    patternNode *ppatternNode;
++
++    if(psubInfo->macroReplacements) psubInfo->macroReplacements[0] = 0;
++    psubInfo->curLength = 0;
++    while(psubFile->token==tokenSeparater) subGetNextToken(psubFile);
++    if(psubFile->token==tokenRBrace && psubInfo->isFile) {
++        psubInfo->isFile = 0;
++        free((void *)psubInfo->filename);
++        psubInfo->filename = 0;
++        freePattern(psubInfo);
++        subGetNextToken(psubFile);
++        return(0);
++    }
++    if(psubFile->token==tokenEOF) return(0);
++    if(psubFile->token!=tokenLBrace) return(0);
++    if(psubInfo->isPattern) {
++	int gotFirstPattern = 0;
++
++        while(subGetNextToken(psubFile)==tokenSeparater);
++	ppatternNode = (patternNode *)ellFirst(&psubInfo->patternList);
++	while(1) {
++            if(psubFile->token==tokenRBrace) {
++                if(ppatternNode) 
++                    subFileErrPrint(psubFile,"less values than patterns");
++                subGetNextToken(psubFile);
++                return(psubInfo->macroReplacements);
++            }
++            if(psubFile->token!=tokenString) {
++                subFileErrPrint(psubFile,"Illegal token");
++                exit(-1);
++            }
++	    if(gotFirstPattern) catMacroReplacements(psubInfo,",");
++	    gotFirstPattern = 1;
++            if(ppatternNode) {
++	        catMacroReplacements(psubInfo,ppatternNode->var);
++	        catMacroReplacements(psubInfo,"=");
++	        catMacroReplacements(psubInfo,psubFile->string);
++                ppatternNode = (patternNode *)ellNext(&ppatternNode->node);
++            } else {
++                subFileErrPrint(psubFile,"more values than patterns");
++            }
++            while(subGetNextToken(psubFile)==tokenSeparater);
++	}
++    } else while(1) {
++        switch(subGetNextToken(psubFile)) {
++	    case tokenRBrace:
++                subGetNextToken(psubFile);
++                return(psubInfo->macroReplacements);
++	    case tokenSeparater:
++		catMacroReplacements(psubInfo,",");
++		break;
++	    case tokenString:
++		catMacroReplacements(psubInfo,psubFile->string);
++		break;
++	    default:
++		subFileErrPrint(psubFile,"Illegal token");
++		exit(1);
++	}
++    }
++}
++
++static char *subGetNextLine(subFile *psubFile)
++{
++    char *pline;
++
++    pline = fgets(psubFile->inputBuffer,MAX_BUFFER_SIZE,psubFile->fp);
++    ++psubFile->lineNum;
++    while(pline && psubFile->inputBuffer[0]=='#') {
++	pline = fgets(psubFile->inputBuffer,MAX_BUFFER_SIZE,psubFile->fp);
++        ++psubFile->lineNum;
++    }
++    if(!pline) {
++	psubFile->token = tokenEOF;
++	psubFile->inputBuffer[0] = 0;
++	psubFile->pnextChar = 0;
++	return(0);
++    }
++    psubFile->pnextChar = &psubFile->inputBuffer[0];
++    return(&psubFile->inputBuffer[0]);
++}
++
++static void subFileErrPrint(subFile *psubFile,char * message)
++{
++    fprintf(stderr,"substitution file %s line %d: %s",
++	psubFile->substitutionName,
++	psubFile->lineNum,psubFile->inputBuffer);
++    fprintf(stderr,"%s\n",message);
++}
++
++
++static tokenType subGetNextToken(subFile *psubFile)
++{
++    char	*p;
++    char	*pto;
++
++    p = psubFile->pnextChar;
++    if(!p) { psubFile->token = tokenEOF; return(tokenEOF);}
++    if(*p==0 || *p=='\n' || *p=='#') {
++	p = subGetNextLine(psubFile);
++	if(!p) { psubFile->token = tokenEOF; return(tokenEOF);}
++        else { psubFile->token = tokenSeparater; return(tokenSeparater);}
++    }
++    while(isspace(*p)) p++;
++    if(*p=='{') {
++	psubFile->token = tokenLBrace;
++	psubFile->pnextChar = ++p;
++	return(tokenLBrace);
++    }
++    if(*p=='}') {
++	psubFile->token = tokenRBrace;
++	psubFile->pnextChar = ++p;
++	return(tokenRBrace);
++    }
++    if(*p==0 || isspace(*p) || *p==',') {
++	while(isspace(*p) || *p==',') p++;
++	psubFile->token = tokenSeparater;
++	psubFile->pnextChar = p;
++	return(tokenSeparater);
++    }
++    /*now handle quoted strings*/
++    if(*p=='"') {
++	pto = &psubFile->string[0];
++	*pto++ = *p++;
++	while(*p!='"') {
++	    if(*p==0 || *p=='\n') {
++		subFileErrPrint(psubFile,"Strings must be on single line\n");
++		exit(1);
++	    }
++	    /*allow  escape for imbeded quote*/
++	    if((*p=='\\') && *(p+1)=='"') {
++		*pto++ = *p++;
++		*pto++ = *p++;
++		continue;
++	    }
++	    *pto++ = *p++;
++	}
++	*pto++ = *p++;
++	psubFile->pnextChar = p;
++	*pto = 0;
++	psubFile->token = tokenString;
++	return(tokenString);
++    }
++    /*Now take anything up to next non String token and not space*/
++    pto = &psubFile->string[0];
++    while(!isspace(*p) && (strspn(p,"\",{}")==0)) *pto++ = *p++; 
++    *pto = 0;
++    psubFile->pnextChar = p;
++    psubFile->token = tokenString;
++    return(tokenString);
++}
++
++static void catMacroReplacements(subInfo *psubInfo,const char *value)
++{
++    size_t	len = strlen(value);
++
++    if(psubInfo->size <= (psubInfo->curLength + len)) {
++        size_t newsize = psubInfo->size + MAX_BUFFER_SIZE;
++        char *newbuf;
++
++        if(newsize <= psubInfo->curLength + len)
++            newsize = psubInfo->curLength + len + 1;
++        newbuf = calloc(1,newsize);
++        if(!newbuf) {
++            fprintf(stderr,"calloc failed for size %Zu\n",newsize);
++            exit(1);
++        }
++        if(psubInfo->macroReplacements) {
++            memcpy(newbuf,psubInfo->macroReplacements,psubInfo->curLength);
++            free(psubInfo->macroReplacements);
++        }
++        psubInfo->size = newsize;
++        psubInfo->macroReplacements = newbuf;
++    }
++    strcat(psubInfo->macroReplacements,value);
++    psubInfo->curLength += len;
++}

appveyor/.appveyor.yml.example-full

@@ -0,0 +1,177 @@
+# .appveyor.yml for use with EPICS Base ci-scripts
+# (see: https://github.com/epics-base/ci-scripts)
+
+# This is YAML - indentation levels are crucial
+
+#---------------------------------#
+#       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
+  # print the connection info for RDP connections (see 'debugging' below)
+  #- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+
+# Set clone depth (do not fetch complete history)
+clone_depth: 50
+
+# Skipping commits affecting only specific files
+skip_commits:
+  files:
+    - 'documentation/*'
+    - 'templates/*'
+    - '**/*.html'
+    - '**/*.md'
+    - '.travis.yml'
+
+#---------------------------------#
+#       additional packages       #
+#---------------------------------#
+
+install:
+# fetch submodules (like ci-scripts)
+  - cmd: git submodule update --init --recursive
+# for the sequencer
+  - cinst re2c
+
+#---------------------------------#
+#   build matrix configuration    #
+#---------------------------------#
+
+# Since dependencies cannot be cached and AppVeyor only grants a single builder VM, all jobs
+# are executed sequentially, each one taking 10-15 minutes.
+# Consider this when defining your build matrix. (A full matrix build takes more than 8 hours.)
+
+# Default build worker image
+image: Visual Studio 2015
+
+# Build Configurations: shared/static, optimized/debug
+configuration:
+  - default
+  - static
+  - debug
+  - static-debug
+
+# Environment variables
+
+# Well-known variables to use
+# CMP         compiler to use ('gcc' for native MinGW, 'vs...' for Visual Studio)
+# SET         source setup file
+# ADD_MODULES extra modules (for a specific job)
+# TEST        set to NO to skip running the tests (default: YES)
+# VV          set VV=1 to make build scripts verbose (default: unset)
+# EXTRA       content will be added to make command line
+# EXTRA1..5   more additional arguments for the make command
+#             (one argument per variable)
+
+# Usually from setup files, but may be specified or overridden
+#  on a job line
+# MODULES     list of dependency modules
+# BASE        branch or release tag name of the EPICS Base to use
+# <MODULE>    branch or release tag for a specific module
+# ...         see README for setup file syntax description
+
+# AppVeyor specific
+# APPVEYOR_BUILD_WORKER_IMAGE  run job using specified VM image
+#                              (not the one from the image: line above)
+
+environment:
+  # common / default variables for all jobs
+  SETUP_PATH: .ci-local:.ci
+  BASE: 7.0
+
+  matrix:
+  - CMP: vs2019
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+  - CMP: gcc
+  - CMP: vs2019
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+  - CMP: vs2019
+    BASE: 3.15
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+  - CMP: vs2019
+    BASE: 3.14
+    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: vs2008
+
+# Platform: processor architecture
+platform:
+  - x86
+  - x64
+
+# Matrix configuration: exclude sets of jobs
+matrix:
+  exclude:
+  # VS2012 and older installs don't have the 64 bit compiler
+  - platform: x64
+    CMP: vs2012
+  - platform: x64
+    CMP: vs2010
+  - platform: x64
+    CMP: vs2008
+  # Exclude more jobs to reduce build time
+  # E.g., skip 32-bit for newer compilers
+  #- platform: x86
+  #  CMP: vs2019
+  #- platform: x86
+  #  CMP: vs2017
+
+#---------------------------------#
+#     building & testing          #
+#---------------------------------#
+
+build_script:
+  - cmd: python .ci/cue.py prepare
+  - cmd: python .ci/cue.py build
+
+test_script:
+  - cmd: python .ci/cue.py test
+
+on_finish:
+  - ps: Get-ChildItem *.tap -Recurse -Force | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+  - cmd: python .ci/cue.py test-results
+
+#---------------------------------#
+#         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
+
+# to print the RDP connection info
+# uncomment the appropriate line in the init: section above
+
+# 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:
+      - me@example.com
+    on_build_success: false
+
+  - provider: GitHubPullRequest

appveyor/.appveyor.yml.example-mini

@@ -0,0 +1,70 @@
+# .appveyor.yml for use with EPICS Base ci-scripts
+# (see: https://github.com/epics-base/ci-scripts)
+
+cache:
+  - C:\Users\appveyor\.tools
+
+init:
+  - git config --global core.autocrlf true
+
+clone_depth: 50
+
+skip_commits:
+  files:
+    - 'documentation/*'
+    - 'templates/*'
+    - '**/*.html'
+    - '**/*.md'
+    - '.travis.yml'
+
+install:
+  - cmd: git submodule update --init --recursive
+
+image: Visual Studio 2019
+
+# Build Configurations: shared/static, optimized/debug
+configuration:
+  - default
+#  - static
+  - debug
+#  - static-debug
+
+environment:
+  # common / default variables for all jobs
+  SETUP_PATH: .ci-local:.ci
+
+  matrix:
+  - CMP: vs2019
+    BASE: 7.0
+  - CMP: vs2019
+    BASE: 3.15
+
+# Platform: processor architecture
+platform:
+#  - x86
+  - x64
+
+# Matrix configuration: exclude sets of jobs
+matrix:
+  exclude:
+  # VS2012 and older installs don't have the 64 bit compiler
+  - platform: x64
+    CMP: vs2012
+  - platform: x64
+    CMP: vs2010
+  - platform: x64
+    CMP: vs2008
+
+build_script:
+  - cmd: python .ci/cue.py prepare
+  - cmd: python .ci/cue.py build
+
+test_script:
+  - cmd: python .ci/cue.py test
+
+on_finish:
+  - ps: Get-ChildItem *.tap -Recurse -Force | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+  - cmd: python .ci/cue.py test-results
+
+notifications:
+  - provider: GitHubPullRequest

appveyor/README.md

@@ -0,0 +1,119 @@
+# AppVeyor Scripts for EPICS Modules
+
+## Features
+
+ - One parallel runner (all builds are sequential)
+ - Windows Server 2012/2016/2019
+ - Compile using gcc/MinGW or different Visual Studio versions: \
+   2008, 2010, 2012, 2013, 2015, 2017, 2019
+ - Compile for Windows 32bit and 64bit
+ - No useful caching available.
+
+## How to Use these Scripts
+
+ 1. Get an account on [AppVeyor](https://www.appveyor.com/), connect
+    it to your GitHub account and activate your support module's
+    repository. For more details, please see below and refer to the
+    [AppVeyor documentation](https://www.appveyor.com/docs/).
+    
+    (This applies when using the free tier offered to open source
+    projects. Things will be different using an "Enterprise"
+    installation on customer hardware.)
+
+ 2. Add the ci-scripts respository as a Git Submodule
+    (see [README](../README.md) one level above).
+
+ 3. Add settings files defining which dependencies in which versions
+    you want to build against
+    (see [README](../README.md) one level above).
+
+ 4. Create an AppVeyor configuration by copying one of the examples into
+    the root directory of your module.
+    ```
+    $ cp .ci/appveyor/.appveyor.yml.example-full .appveyor.yml
+    ```
+
+ 5. Edit the `.appveyor.yml` configuration to include the jobs you want
+    AppVeyor to run.
+
+    AppVeyor automatically creates a build matrix with the following axes:
+    1. `configuration:` \
+    Select shared (DLL) or static as well as optimized or debug builds. \
+    Default: `shared-optimized`
+    2. `platform:` \
+    Select 32bit or 64bit processor architecture.
+    3. `environment: / matrix:` \
+    List of environment variable settings. Each list element (starting with
+    a dash) is one step on the axis of the build matrix. \
+    Set `CMP` to select the compiler: `gcc` for the native
+    [MinGW](http://mingw-w64.org/) GNU compiler, `vs2008` ...`vs2019` 
+    (options listed above) for the Microsoft Visual Studio compilers.
+
+    Your builds will take long. \
+    AppVeyor only grants a single parallel runner VM - all jobs of the matrix
+    are executed sequentially. AppVeyor also does not provide a usable cache
+    mechanism to retain dependency artifacts across builds.
+    Each job will take between 6 and 15 minutes, plus testing time, every time.
+
+    The `matrix: / exclude:` setting can be used to reduce the number of
+    jobs. Check the [AppVeyor docs][appveyor.doc.matrix]
+    for more ways to reduce the build matrix size. \
+    E.g., you can opt for not creating matrix axes for `configuration:`
+    and`platform:` by moving these configurations into the job lines
+    under `environment: / matrix:`.
+
+ 6. Push your changes and check
+    [ci.appveyor.com](https://ci.appveyor.com/) for your build results.
+
+## GitHub / AppVeyor Integration and Authentication
+
+### Security
+Enabling Two-Factor-Authentication (2FA) is always a good idea, for all 
+your web based services, including GitHub and AppVeyor. \
+Get an app for your phone (Authy works fine for me, but there are plenty),
+and your phone will generate one-time passwords to verify your identity
+to the service if required (e.g., when logging in from a new device).
+
+### Authentication
+You can use different ways and services to authenticate when you log into
+your AppVeyor account. The easiest way - at least when you're using the
+service with repositories on GitHub - is to use GitHub authentication.
+
+### GitHub Integration
+AppVeyor offers two ways to integrate with GitHub: through a GitHub
+application or through an OAuth application. GitHub applications are using
+the newer API, allow easier fine-grained access rights tuning and are
+preferred.
+
+The differences are mostly visible when you work with repositories under
+organizational GitHub accounts: Using OAuth, AppVeyor always has the full
+rights of your personal GitHub account.
+GitHub applications on the other hand have separate instances and
+configuration for every organizational account you are using on GitHub.
+
+### Enabling Builds for your Repository
+On the 'Projects' tab of your AppVeyor web interface, create a new project.
+If the repository is not listed on the project creation page,
+verify the Integration settings. Most of the relevant configuration
+is taken from GitHub and has to be set up there.
+
+### AppVeyor Account Sharing
+You can always invite other AppVeyor users to have access to an AppVeyor
+account, forming a team. Such additional shared accounts are a way to make
+the AppVeyor limits (e.g., one parallel builder per account) more manageable.
+
+## Known Issues
+
+#### Build Worker Images
+The AppVeyor documentation on build worker images doesn't seem to fully
+describe the way things are handled internally.
+
+The tested and suggested reproducible way of defining the build worker image
+is shown in the example configuration files:
+
+ - Set the default image using the `image:` tag.
+ - Override the image for specific jobs by setting the
+   `APPVEYOR_BUILD_WORKER_IMAGE` environment variable.
+
+<!-- Links -->
+[appveyor.doc.matrix]: https://www.appveyor.com/docs/build-configuration/#build-matrix

configure/RELEASE

@@ -30,7 +30,7 @@
 #SNCSEQ = $(MODULES)/seq-ver
 
 # EPICS_BASE should appear last so earlier modules can override stuff:
-EPICS_BASE = /home/ralph/work/EPICS/V3/base-3.15.6
+EPICS_BASE = /path/to/base/must/be/set/in/a/RELEASE.local/file
 
 # Set RULES here if you want to use build rules from somewhere
 # other than EPICS_BASE:

cue-test.py

@@ -0,0 +1,905 @@
+#!/usr/bin/env python
+"""Module ci-scripts unit tests
+"""
+
+# SET=test00 in the environment and run the tests in this script
+# all other jobs are started as compile jobs
+
+from __future__ import print_function
+
+import sys, os, shutil, fileinput
+import distutils.util
+import re
+import subprocess as sp
+import unittest
+import logging
+from argparse import Namespace
+
+builddir = os.getcwd()
+
+# Detect basic context (service, os)
+if 'TRAVIS' in os.environ:
+    ci_service = 'travis'
+    ci_os = os.environ['TRAVIS_OS_NAME']
+
+if 'GITLAB_CI' in os.environ:
+    ci_service = 'gitlab'
+    ci_os = 'linux'
+
+if 'APPVEYOR' in os.environ:
+    ci_service = 'appveyor'
+    if re.match(r'^Visual', os.environ['APPVEYOR_BUILD_WORKER_IMAGE']):
+        ci_os = 'windows'
+    elif re.match(r'^Ubuntu', os.environ['APPVEYOR_BUILD_WORKER_IMAGE']):
+        ci_os = 'linux'
+    elif re.match(r'^macOS', os.environ['APPVEYOR_BUILD_WORKER_IMAGE']):
+        ci_os = 'osx'
+
+if 'GITHUB_ACTIONS' in os.environ:
+    ci_service = 'github-actions'
+    if os.environ['RUNNER_OS'] == 'macOS':
+        ci_os = 'osx'
+    else:
+        ci_os = os.environ['RUNNER_OS'].lower()
+
+
+def find_in_file(regex, filename):
+    file = open(filename, "r")
+    for line in file:
+        if re.search(regex, line):
+            return True
+    return False
+
+
+def getStringIO():
+    if sys.version_info > (3, 0):
+        import io
+        return io.StringIO()
+    else:
+        import StringIO
+        return StringIO.StringIO()
+
+
+sys.path.append('.')
+import cue
+
+# we're working with tags (detached heads) a lot: suppress advice
+cue.call_git(['config', '--global', 'advice.detachedHead', 'false'])
+
+
+class TestSourceSet(unittest.TestCase):
+
+    def setUp(self):
+        os.environ['SETUP_PATH'] = '.:appveyor'
+        if 'BASE' in os.environ:
+            del os.environ['BASE']
+        cue.clear_lists()
+        os.chdir(builddir)
+
+    def test_EmptySetupDirsPath(self):
+        del os.environ['SETUP_PATH']
+        self.assertRaisesRegexp(NameError, '\(SETUP_PATH\) is empty', cue.source_set, 'test01')
+
+    def test_InvalidSetupName(self):
+        self.assertRaisesRegexp(NameError, 'does not exist in SETUP_PATH', cue.source_set, 'xxdoesnotexistxx')
+
+    def test_ValidSetupName(self):
+        capturedOutput = getStringIO()
+        sys.stdout = capturedOutput
+        cue.source_set('test01')
+        sys.stdout = sys.__stdout__
+        self.assertEqual(cue.setup['BASE'], '7.0', 'BASE was not set to \'7.0\'')
+
+    def test_SetupDoesNotOverridePreset(self):
+        os.environ['BASE'] = 'foo'
+        capturedOutput = getStringIO()
+        sys.stdout = capturedOutput
+        cue.source_set('test01')
+        sys.stdout = sys.__stdout__
+        self.assertEqual(cue.setup['BASE'], 'foo',
+                         'Preset BASE was overridden by test01 setup (expected \'foo\' got {0})'
+                         .format(cue.setup['BASE']))
+
+    def test_IncludeSetupFirstSetWins(self):
+        captured_output = getStringIO()
+        sys.stdout = captured_output
+        cue.source_set('test02')
+        sys.stdout = sys.__stdout__
+        self.assertEqual(cue.setup['BASE'], 'foo',
+                         'BASE set in test02 was overridden by test01 setup (expected \'foo\' got {0})'
+                         .format(cue.setup['BASE']))
+        self.assertEqual(cue.setup['FOO'], 'bar', 'Setting of single word does not work')
+        self.assertEqual(cue.setup['FOO2'], 'bar bar2', 'Setting of multiple words does not work')
+        self.assertEqual(cue.setup['FOO3'], 'bar bar2', 'Indented setting of multiple words does not work')
+        self.assertEqual(cue.setup['SNCSEQ'], 'R2-2-8', 'Setup test01 was not included')
+
+    def test_DoubleIncludeGetsIgnored(self):
+        capturedOutput = getStringIO()
+        sys.stdout = capturedOutput
+        cue.source_set('test03')
+        sys.stdout = sys.__stdout__
+        self.assertRegexpMatches(capturedOutput.getvalue(), 'Ignoring already included setup file')
+
+
+class TestUpdateReleaseLocal(unittest.TestCase):
+    release_local = os.path.join(cue.ci['cachedir'], 'RELEASE.local')
+
+    def setUp(self):
+        if os.path.exists(self.release_local):
+            os.remove(self.release_local)
+        os.chdir(builddir)
+
+    def test_SetModule(self):
+        cue.update_release_local('MOD1', '/foo/bar')
+        found = 0
+        for line in fileinput.input(self.release_local, inplace=1):
+            if 'MOD1=' in line:
+                self.assertEqual(line.strip(), 'MOD1=/foo/bar', 'MOD1 not set correctly')
+                found += 1
+        fileinput.close()
+        self.assertEqual(found, 1, 'MOD1 not written once to RELEASE.local (found {0})'.format(found))
+
+    def test_SetBaseAndMultipleModules(self):
+        cue.update_release_local('EPICS_BASE', '/bar/foo')
+        cue.update_release_local('MOD1', '/foo/bar')
+        cue.update_release_local('MOD2', '/foo/bar2')
+        cue.update_release_local('MOD1', '/foo/bar1')
+        found = {}
+        foundat = {}
+        for line in fileinput.input(self.release_local, inplace=1):
+            if 'MOD1=' in line:
+                self.assertEqual(line.strip(), 'MOD1=/foo/bar1',
+                                 'MOD1 not set correctly (expected \'MOD1=/foo/bar1\' found \'{0}\')'
+                                 .format(line))
+                if 'mod1' in found:
+                    found['mod1'] += 1
+                else:
+                    found['mod1'] = 1
+                foundat['mod1'] = fileinput.filelineno()
+            if 'MOD2=' in line:
+                self.assertEqual(line.strip(), 'MOD2=/foo/bar2',
+                                 'MOD2 not set correctly (expected \'MOD2=/foo/bar2\' found \'{0}\')'
+                                 .format(line))
+                if 'mod2' in found:
+                    found['mod2'] += 1
+                else:
+                    found['mod2'] = 1
+                foundat['mod2'] = fileinput.filelineno()
+            if 'EPICS_BASE=' in line:
+                self.assertEqual(line.strip(), 'EPICS_BASE=/bar/foo',
+                                 'EPICS_BASE not set correctly (expected \'EPICS_BASE=/bar/foo\' found \'{0}\')'
+                                 .format(line))
+                if 'base' in found:
+                    found['base'] += 1
+                else:
+                    found['base'] = 1
+                foundat['base'] = fileinput.filelineno()
+        fileinput.close()
+        self.assertEqual(found['mod1'], 1,
+                         'MOD1 does not appear once in RELEASE.local (found {0})'.format(found['mod1']))
+        self.assertEqual(found['mod2'], 1,
+                         'MOD2 does not appear once in RELEASE.local (found {0})'.format(found['mod2']))
+        self.assertEqual(found['base'], 1,
+                         'EPICS_BASE does not appear once in RELEASE.local (found {0})'.format(found['base']))
+        self.assertGreater(foundat['base'], foundat['mod2'],
+                           'EPICS_BASE (line {0}) appears before MOD2 (line {1})'
+                           .format(foundat['base'], foundat['mod2']))
+        self.assertGreater(foundat['mod2'], foundat['mod1'],
+                           'MOD2 (line {0}) appears before MOD1 (line {1})'.format(foundat['mod2'], foundat['mod1']))
+
+
+class TestAddDependencyUpToDateCheck(unittest.TestCase):
+    hash_3_15_6 = "ce7943fb44beb22b453ddcc0bda5398fadf72096"
+    location = ''
+    licensefile = ''
+    checked_file = ''
+    release_file = ''
+
+    def setUp(self):
+        os.environ['SETUP_PATH'] = '.:appveyor'
+        cue.clear_lists()
+        cue.detect_context()
+        self.location = os.path.join(cue.ci['cachedir'], 'base-R3.15.6')
+        self.licensefile = os.path.join(self.location, 'LICENSE')
+        self.checked_file = os.path.join(self.location, 'checked_out')
+        self.release_file = os.path.join(self.location, 'configure', 'RELEASE')
+        if os.path.exists(self.location):
+            shutil.rmtree(self.location, onerror=cue.remove_readonly)
+        os.chdir(builddir)
+        cue.source_set('defaults')
+        cue.complete_setup('BASE')
+
+    def test_MissingDependency(self):
+        cue.setup['BASE'] = 'R3.15.6'
+        cue.add_dependency('BASE')
+        self.assertTrue(os.path.exists(self.licensefile), 'Missing dependency was not checked out')
+        self.assertTrue(os.path.exists(self.checked_file), 'Checked-out commit marker was not written')
+        with open(self.checked_file, 'r') as bfile:
+            checked_out = bfile.read().strip()
+        bfile.close()
+        self.assertEqual(checked_out, self.hash_3_15_6,
+                         'Wrong commit of dependency checked out (expected=\"{0}\" found=\"{1}\")'
+                         .format(self.hash_3_15_6, checked_out))
+        self.assertFalse(find_in_file('include \$\(TOP\)/../RELEASE.local', self.release_file),
+                         'RELEASE in Base includes TOP/../RELEASE.local')
+
+    def test_UpToDateDependency(self):
+        cue.setup['BASE'] = 'R3.15.6'
+        cue.add_dependency('BASE')
+        os.remove(self.licensefile)
+        cue.add_dependency('BASE')
+        self.assertFalse(os.path.exists(self.licensefile), 'Check out on top of existing up-to-date dependency')
+
+    def test_OutdatedDependency(self):
+        cue.setup['BASE'] = 'R3.15.6'
+        cue.add_dependency('BASE')
+        os.remove(self.licensefile)
+        with open(self.checked_file, "w") as fout:
+            print('XXX not the right hash XXX', file=fout)
+        fout.close()
+        cue.add_dependency('BASE')
+        self.assertTrue(os.path.exists(self.licensefile), 'No check-out on top of out-of-date dependency')
+        with open(self.checked_file, 'r') as bfile:
+            checked_out = bfile.read().strip()
+        bfile.close()
+        self.assertEqual(checked_out, self.hash_3_15_6,
+                         "Wrong commit of dependency checked out (expected='{0}' found='{1}')"
+                         .format(self.hash_3_15_6, checked_out))
+
+
+def is_shallow_repo(place):
+    check = sp.check_output(['git', 'rev-parse', '--is-shallow-repository'], cwd=place).strip().decode('ascii')
+    if check == '--is-shallow-repository':
+        if os.path.exists(os.path.join(place, '.git', 'shallow')):
+            check = 'true'
+        else:
+            check = 'false'
+    return check == 'true'
+
+
+class TestAddDependencyOptions(unittest.TestCase):
+    location = ''
+    testfile = ''
+
+    def setUp(self):
+        os.environ['SETUP_PATH'] = '.'
+        cue.clear_lists()
+        cue.detect_context()
+        if os.path.exists(cue.ci['cachedir']):
+            shutil.rmtree(cue.ci['cachedir'], onerror=cue.remove_readonly)
+        self.location = os.path.join(cue.ci['cachedir'], 'mcoreutils-master')
+        self.testfile = os.path.join(self.location, '.ci', 'LICENSE')
+        os.path.join(cue.ci['cachedir'], 'mcoreutils-master')
+        cue.source_set('defaults')
+        cue.complete_setup('MCoreUtils')
+        cue.setup['MCoreUtils'] = 'master'
+
+    def test_Default(self):
+        cue.add_dependency('MCoreUtils')
+        self.assertTrue(os.path.exists(self.testfile),
+                        'Submodule (.ci) not checked out recursively (requested: default=YES')
+        self.assertTrue(is_shallow_repo(self.location),
+                        'Module not checked out shallow (requested: default=5)')
+
+    def test_SetRecursiveNo(self):
+        cue.setup['MCoreUtils_RECURSIVE'] = 'NO'
+        cue.add_dependency('MCoreUtils')
+        self.assertFalse(os.path.exists(self.testfile), 'Submodule (.ci) checked out recursively')
+
+    def test_SetDepthZero(self):
+        cue.setup['MCoreUtils_DEPTH'] = '0'
+        cue.add_dependency('MCoreUtils')
+        self.assertFalse(is_shallow_repo(self.location), 'Module checked out shallow (requested full)')
+
+    def test_SetDepthThree(self):
+        cue.setup['MCoreUtils_DEPTH'] = '3'
+        cue.add_dependency('MCoreUtils')
+        self.assertTrue(is_shallow_repo(self.location),
+                        'Module not checked out shallow (requested: depth=3)')
+
+    def test_AddMsiTo314(self):
+        cue.complete_setup('BASE')
+        cue.setup['BASE'] = 'R3.14.12.1'
+        msifile = os.path.join(cue.ci['cachedir'], 'base-R3.14.12.1', 'src', 'dbtools', 'msi.c')
+        cue.add_dependency('BASE')
+        self.assertTrue(os.path.exists(msifile), 'MSI was not added to Base 3.14')
+
+    def test_DefaultBaseBranch(self):
+        cue.complete_setup('BASE')
+        self.assertEqual(cue.setup['BASE'], '7.0',
+                         'Default Base branch is not 7.0 (found {0})'.format(cue.setup['BASE']))
+
+
+def repo_access(dep):
+    cue.set_setup_from_env(dep)
+    cue.setup.setdefault(dep + "_DIRNAME", dep.lower())
+    cue.setup.setdefault(dep + "_REPONAME", dep.lower())
+    cue.setup.setdefault('REPOOWNER', 'epics-modules')
+    cue.setup.setdefault(dep + "_REPOOWNER", cue.setup['REPOOWNER'])
+    cue.setup.setdefault(dep + "_REPOURL", 'https://github.com/{0}/{1}.git'
+                         .format(cue.setup[dep + '_REPOOWNER'], cue.setup[dep + '_REPONAME']))
+    with open(os.devnull, 'w') as devnull:
+        return cue.call_git(['ls-remote', '--quiet', '--heads', cue.setup[dep + '_REPOURL']],
+                            stdout=devnull, stderr=devnull)
+
+
+class TestDefaultModuleURLs(unittest.TestCase):
+    modules = ['BASE', 'PVDATA', 'PVACCESS', 'NTYPES',
+               'SNCSEQ', 'STREAM', 'ASYN', 'STD',
+               'CALC', 'AUTOSAVE', 'BUSY', 'SSCAN',
+               'IOCSTATS', 'MOTOR', 'IPAC', ]
+
+    def setUp(self):
+        os.environ['SETUP_PATH'] = '.:appveyor'
+        cue.clear_lists()
+        os.chdir(builddir)
+        cue.source_set('defaults')
+
+    def test_Repos(self):
+        for mod in self.modules:
+            self.assertEqual(repo_access(mod), 0, 'Defaults for {0} do not point to a valid git repository at {1}'
+                             .format(mod, cue.setup[mod + '_REPOURL']))
+
+@unittest.skipIf(ci_os != 'windows', 'VCVars test only applies to windows')
+class TestVCVars(unittest.TestCase):
+    def test_vcvars(self):
+        if ci_service == 'travis':
+            os.environ['TRAVIS_COMPILER'] = 'vs2017'
+        else:
+            os.environ['CONFIGURATION'] = 'default'
+            if ci_service == 'github-actions' and os.environ['IMAGEOS'] == 'win16':
+                os.environ['CMP'] = 'vs2017'
+            else:
+                os.environ['CMP'] = 'vs2019'
+        cue.detect_context()
+        cue.with_vcvars('env')
+
+
+@unittest.skipIf(ci_service != 'travis', 'Run travis tests only on travis')
+class TestTravisDetectContext(unittest.TestCase):
+    def setUp(self):
+        os.environ['TRAVIS'] = 'true'
+        os.environ['TRAVIS_OS_NAME'] = 'linux'
+        os.environ['TRAVIS_COMPILER'] = 'gcc'
+
+    def tearDown(self):
+        cue.clear_lists()
+        os.environ.pop('BCFG', None)
+        os.environ.pop('TEST', None)
+        os.environ.pop('STATIC', None)
+
+    def test_LinuxGccNone(self):
+        cue.detect_context()
+        self.assertEqual(cue.ci['service'], 'travis', "ci['service'] is {0} (expected: travis)"
+                         .format(cue.ci['service']))
+        self.assertEqual(cue.ci['os'], 'linux', "ci['os'] is {0} (expected: linux)"
+                         .format(cue.ci['os']))
+        self.assertEqual(cue.ci['compiler'], 'gcc', "ci['compiler'] is {0} (expected: gcc)"
+                         .format(cue.ci['compiler']))
+        self.assertEqual(cue.ci['platform'], 'x64', "ci['platform'] is {0} (expected: x64)"
+                         .format(cue.ci['platform']))
+        self.assertFalse(cue.ci['static'], "ci['static'] is True (expected: False)")
+        self.assertFalse(cue.ci['debug'], "ci['debug'] is True (expected: False)")
+        self.assertEqual(cue.ci['configuration'], 'shared-optimized',
+                         "ci['configuration'] is {0} (expected: shared-optimized)"
+                         .format(cue.ci['configuration']))
+
+    def test_LinuxClangNone(self):
+        os.environ['TRAVIS_COMPILER'] = 'clang'
+        cue.detect_context()
+        self.assertEqual(cue.ci['service'], 'travis', "ci['service'] is {0} (expected: travis)"
+                         .format(cue.ci['service']))
+        self.assertEqual(cue.ci['os'], 'linux', "ci['os'] is {0} (expected: linux)"
+                         .format(cue.ci['os']))
+        self.assertEqual(cue.ci['compiler'], 'clang', "ci['compiler'] is {0} (expected: clang)"
+                         .format(cue.ci['compiler']))
+        self.assertEqual(cue.ci['platform'], 'x64', "ci['platform'] is {0} (expected: x64)"
+                         .format(cue.ci['platform']))
+        self.assertFalse(cue.ci['static'], "ci['static'] is True (expected: False)")
+        self.assertFalse(cue.ci['debug'], "ci['debug'] is True (expected: False)")
+        self.assertEqual(cue.ci['configuration'], 'shared-optimized',
+                         "ci['configuration'] is {0} (expected: shared-optimized)"
+                         .format(cue.ci['configuration']))
+
+    def test_BcfgShared(self):
+        os.environ['BCFG'] = 'shared'
+        cue.detect_context()
+        self.assertFalse(cue.ci['static'], "ci['static'] is True (expected: False)")
+        self.assertFalse(cue.ci['debug'], "ci['debug'] is True (expected: False)")
+        self.assertEqual(cue.ci['configuration'], 'shared-optimized',
+                         "ci['configuration'] is {0} (expected: shared-optimized)"
+                         .format(cue.ci['configuration']))
+
+    def test_BcfgStatic(self):
+        os.environ['BCFG'] = 'static'
+        cue.detect_context()
+        self.assertTrue(cue.ci['static'], "ci['static'] is False (expected: True)")
+        self.assertFalse(cue.ci['debug'], "ci['debug'] is True (expected: False)")
+        self.assertEqual(cue.ci['configuration'], 'static-optimized',
+                         "ci['configuration'] is {0} (expected: static-optimized)"
+                         .format(cue.ci['configuration']))
+
+    def test_BcfgDebug(self):
+        os.environ['BCFG'] = 'debug'
+        cue.detect_context()
+        self.assertFalse(cue.ci['static'], "ci['static'] is True (expected: False)")
+        self.assertTrue(cue.ci['debug'], "ci['debug'] is False (expected: True)")
+        self.assertEqual(cue.ci['configuration'], 'shared-debug',
+                         "ci['configuration'] is {0} (expected: shared-debug)"
+                         .format(cue.ci['configuration']))
+
+    def test_BcfgStaticDebug(self):
+        os.environ['BCFG'] = 'static-debug'
+        cue.detect_context()
+        self.assertTrue(cue.ci['static'], "ci['static'] is False (expected: True)")
+        self.assertTrue(cue.ci['debug'], "ci['debug'] is False (expected: True)")
+        self.assertEqual(cue.ci['configuration'], 'static-debug',
+                         "ci['configuration'] is {0} (expected: static-debug)"
+                         .format(cue.ci['configuration']))
+
+    def test_TestNo(self):
+        os.environ['TEST'] = 'NO'
+        cue.detect_context()
+        self.assertFalse(cue.ci['test'], "ci['test'] is True (expected: False)")
+
+    def test_WindowsGccNone(self):
+        os.environ['TRAVIS_OS_NAME'] = 'windows'
+        cue.detect_context()
+        self.assertEqual(cue.ci['service'], 'travis', "ci['service'] is {0} (expected: travis)"
+                         .format(cue.ci['service']))
+        self.assertEqual(cue.ci['os'], 'windows', "ci['os'] is {0} (expected: windows)"
+                         .format(cue.ci['os']))
+        self.assertEqual(cue.ci['compiler'], 'gcc', "ci['compiler'] is {0} (expected: gcc)"
+                         .format(cue.ci['compiler']))
+        self.assertEqual(cue.ci['platform'], 'x64', "ci['platform'] is {0} (expected: x64)"
+                         .format(cue.ci['platform']))
+        self.assertFalse(cue.ci['static'], "ci['static'] is True (expected: False)")
+        self.assertFalse(cue.ci['debug'], "ci['debug'] is True (expected: False)")
+        self.assertEqual(cue.ci['configuration'], 'shared-optimized',
+                         "ci['configuration'] is {0} (expected: shared-optimized)"
+                         .format(cue.ci['configuration']))
+        self.assertIn('strawberryperl', cue.ci['choco'], "'strawberryperl' is not in ci['choco']")
+        self.assertIn('make', cue.ci['choco'], "'make' is not in ci['choco']")
+
+    def test_WindowsVs2017None(self):
+        os.environ['TRAVIS_OS_NAME'] = 'windows'
+        os.environ['TRAVIS_COMPILER'] = 'vs2017'
+        cue.detect_context()
+        self.assertEqual(cue.ci['service'], 'travis', "ci['service'] is {0} (expected: travis)"
+                         .format(cue.ci['service']))
+        self.assertEqual(cue.ci['os'], 'windows', "ci['os'] is {0} (expected: windows)"
+                         .format(cue.ci['os']))
+        self.assertEqual(cue.ci['compiler'], 'vs2017', "ci['compiler'] is {0} (expected: vs2017)"
+                         .format(cue.ci['compiler']))
+        self.assertEqual(cue.ci['platform'], 'x64', "ci['platform'] is {0} (expected: x64)"
+                         .format(cue.ci['platform']))
+        self.assertFalse(cue.ci['static'], "ci['static'] is True (expected: False)")
+        self.assertFalse(cue.ci['debug'], "ci['debug'] is True (expected: False)")
+        self.assertEqual(cue.ci['configuration'], 'shared-optimized',
+                         "ci['configuration'] is {0} (expected: shared-optimized)"
+                         .format(cue.ci['configuration']))
+        self.assertIn('strawberryperl', cue.ci['choco'], "'strawberryperl' is not in ci['choco']")
+        self.assertIn('make', cue.ci['choco'], "'make' is not in ci['choco']")
+
+    def test_WindowsVs2019None(self):
+        os.environ['TRAVIS_OS_NAME'] = 'windows'
+        os.environ['TRAVIS_COMPILER'] = 'vs2019'
+        cue.detect_context()
+        self.assertEqual(cue.ci['service'], 'travis', "ci['service'] is {0} (expected: travis)"
+                         .format(cue.ci['service']))
+        self.assertEqual(cue.ci['os'], 'windows', "ci['os'] is {0} (expected: windows)"
+                         .format(cue.ci['os']))
+        self.assertEqual(cue.ci['compiler'], 'vs2017', "ci['compiler'] is {0} (expected: vs2017)"
+                         .format(cue.ci['compiler']))
+        self.assertEqual(cue.ci['platform'], 'x64', "ci['platform'] is {0} (expected: x64)"
+                         .format(cue.ci['platform']))
+        self.assertFalse(cue.ci['static'], "ci['static'] is True (expected: False)")
+        self.assertFalse(cue.ci['debug'], "ci['debug'] is True (expected: False)")
+        self.assertEqual(cue.ci['configuration'], 'shared-optimized',
+                         "ci['configuration'] is {0} (expected: shared-optimized)"
+                         .format(cue.ci['configuration']))
+        self.assertIn('strawberryperl', cue.ci['choco'], "'strawberryperl' is not in ci['choco']")
+        self.assertIn('make', cue.ci['choco'], "'make' is not in ci['choco']")
+
+    def test_OsxClangNone(self):
+        os.environ['TRAVIS_OS_NAME'] = 'osx'
+        os.environ['TRAVIS_COMPILER'] = 'clang'
+        cue.detect_context()
+        self.assertEqual(cue.ci['service'], 'travis', "ci['service'] is {0} (expected: travis)"
+                         .format(cue.ci['service']))
+        self.assertEqual(cue.ci['os'], 'osx', "ci['os'] is {0} (expected: osx)"
+                         .format(cue.ci['os']))
+        self.assertEqual(cue.ci['compiler'], 'clang', "ci['compiler'] is {0} (expected: clang)"
+                         .format(cue.ci['compiler']))
+        self.assertEqual(cue.ci['platform'], 'x64', "ci['platform'] is {0} (expected: x64)"
+                         .format(cue.ci['platform']))
+        self.assertFalse(cue.ci['static'], "ci['static'] is True (expected: False)")
+        self.assertFalse(cue.ci['debug'], "ci['debug'] is True (expected: False)")
+        self.assertEqual(cue.ci['configuration'], 'shared-optimized',
+                         "ci['configuration'] is {0} (expected: shared-optimized)"
+                         .format(cue.ci['configuration']))
+
+    def test_StaticGetsWarning(self):
+        os.environ['STATIC'] = 'YES'
+        capturedOutput = getStringIO()
+        sys.stdout = capturedOutput
+        cue.detect_context()
+        sys.stdout = sys.__stdout__
+        self.assertRegexpMatches(capturedOutput.getvalue(), "Variable 'STATIC' not supported anymore")
+
+    def test_MisspelledBcfgGetsWarning(self):
+        os.environ['BCFG'] = 'static-dubug'
+        capturedOutput = getStringIO()
+        sys.stdout = capturedOutput
+        cue.detect_context()
+        sys.stdout = sys.__stdout__
+        self.assertRegexpMatches(capturedOutput.getvalue(), "Unrecognized build configuration setting")
+
+
+@unittest.skipIf(ci_service != 'appveyor', 'Run appveyor tests only on appveyor')
+class TestAppveyorDetectContext(unittest.TestCase):
+    def setUp(self):
+        os.environ['APPVEYOR'] = 'True'
+        os.environ['APPVEYOR_BUILD_WORKER_IMAGE'] = 'Visual Studio 2019'
+        os.environ['CMP'] = 'vs2019'
+        os.environ['CONFIGURATION'] = 'default'
+        os.environ['PLATFORM'] = 'x64'
+
+    def tearDown(self):
+        cue.clear_lists()
+        os.environ.pop('STATIC', None)
+        os.environ.pop('TEST', None)
+
+    def test_Platform32(self):
+        os.environ['PLATFORM'] = 'x86'
+        cue.detect_context()
+        self.assertFalse(cue.ci['static'], "ci['static'] is True (expected: False)")
+        self.assertFalse(cue.ci['debug'], "ci['debug'] is True (expected: False)")
+        self.assertEqual(cue.ci['configuration'], 'shared-optimized',
+                         "ci['configuration'] is {0} (expected: shared-optimized)"
+                         .format(cue.ci['configuration']))
+        self.assertEqual(cue.ci['platform'], 'x86',
+                         "ci['platform'] is {0} (expected: x86)"
+                         .format(cue.ci['platform']))
+
+    def test_Platform64(self):
+        cue.detect_context()
+        self.assertFalse(cue.ci['static'], "ci['static'] is True (expected: False)")
+        self.assertFalse(cue.ci['debug'], "ci['debug'] is True (expected: False)")
+        self.assertEqual(cue.ci['configuration'], 'shared-optimized',
+                         "ci['configuration'] is {0} (expected: shared-optimized)"
+                         .format(cue.ci['configuration']))
+        self.assertEqual(cue.ci['platform'], 'x64',
+                         "ci['platform'] is {0} (expected: x64)"
+                         .format(cue.ci['platform']))
+
+    def test_PlatformX64(self):
+        os.environ['PLATFORM'] = 'X64'
+        cue.detect_context()
+        self.assertFalse(cue.ci['static'], "ci['static'] is True (expected: False)")
+        self.assertFalse(cue.ci['debug'], "ci['debug'] is True (expected: False)")
+        self.assertEqual(cue.ci['configuration'], 'shared-optimized',
+                         "ci['configuration'] is {0} (expected: shared-optimized)"
+                         .format(cue.ci['configuration']))
+        self.assertEqual(cue.ci['platform'], 'x64',
+                         "ci['platform'] is {0} (expected: x64)"
+                         .format(cue.ci['platform']))
+
+    def test_ConfigDefault(self):
+        cue.detect_context()
+        self.assertFalse(cue.ci['static'], "ci['static'] is True (expected: False)")
+        self.assertFalse(cue.ci['debug'], "ci['debug'] is True (expected: False)")
+        self.assertEqual(cue.ci['configuration'], 'shared-optimized',
+                         "ci['configuration'] is {0} (expected: shared-optimized)"
+                         .format(cue.ci['configuration']))
+
+    def test_ConfigStatic(self):
+        os.environ['CONFIGURATION'] = 'static'
+        cue.detect_context()
+        self.assertTrue(cue.ci['static'], "ci['static'] is False (expected: True)")
+        self.assertFalse(cue.ci['debug'], "ci['debug'] is True (expected: False)")
+        self.assertEqual(cue.ci['configuration'], 'static-optimized',
+                         "ci['configuration'] is {0} (expected: static-optimized)"
+                         .format(cue.ci['configuration']))
+
+    def test_ConfigDebug(self):
+        os.environ['CONFIGURATION'] = 'debug'
+        cue.detect_context()
+        self.assertFalse(cue.ci['static'], "ci['static'] is True (expected: False)")
+        self.assertTrue(cue.ci['debug'], "ci['debug'] is False (expected: True)")
+        self.assertEqual(cue.ci['configuration'], 'shared-debug',
+                         "ci['configuration'] is {0} (expected: shared-debug)"
+                         .format(cue.ci['configuration']))
+
+    def test_ConfigStaticDebug(self):
+        os.environ['CONFIGURATION'] = 'static-debug'
+        cue.detect_context()
+        self.assertTrue(cue.ci['static'], "ci['static'] is False (expected: True)")
+        self.assertTrue(cue.ci['debug'], "ci['debug'] is False (expected: True)")
+        self.assertEqual(cue.ci['configuration'], 'static-debug',
+                         "ci['configuration'] is {0} (expected: static-debug)"
+                         .format(cue.ci['configuration']))
+
+    def test_TestNo(self):
+        os.environ['TEST'] = 'NO'
+        cue.detect_context()
+        self.assertFalse(cue.ci['test'], "ci['test'] is True (expected: False)")
+
+    def test_WindowsGccNone(self):
+        os.environ['CMP'] = 'gcc'
+        cue.detect_context()
+        self.assertEqual(cue.ci['service'], 'appveyor', "ci['service'] is {0} (expected: appveyor)"
+                         .format(cue.ci['service']))
+        self.assertEqual(cue.ci['os'], 'windows', "ci['os'] is {0} (expected: windows)"
+                         .format(cue.ci['os']))
+        self.assertEqual(cue.ci['compiler'], 'gcc', "ci['compiler'] is {0} (expected: gcc)"
+                         .format(cue.ci['compiler']))
+        self.assertEqual(cue.ci['platform'], 'x64', "ci['platform'] is {0} (expected: x64)"
+                         .format(cue.ci['platform']))
+        self.assertFalse(cue.ci['static'], "ci['static'] is True (expected: False)")
+        self.assertFalse(cue.ci['debug'], "ci['debug'] is True (expected: False)")
+        self.assertEqual(cue.ci['configuration'], 'shared-optimized',
+                         "ci['configuration'] is {0} (expected: shared-optimized)"
+                         .format(cue.ci['configuration']))
+        self.assertIn('make', cue.ci['choco'], "'make' is not in ci['choco']")
+
+    def test_WindowsVs2017None(self):
+        os.environ['APPVEYOR_BUILD_WORKER_IMAGE'] = 'Visual Studio 2017'
+        os.environ['CMP'] = 'vs2017'
+        os.environ['PLATFORM'] = 'x86'
+        cue.detect_context()
+        self.assertEqual(cue.ci['service'], 'appveyor', "ci['service'] is {0} (expected: appveyor)"
+                         .format(cue.ci['service']))
+        self.assertEqual(cue.ci['os'], 'windows', "ci['os'] is {0} (expected: windows)"
+                         .format(cue.ci['os']))
+        self.assertEqual(cue.ci['compiler'], 'vs2017', "ci['compiler'] is {0} (expected: vs2017)"
+                         .format(cue.ci['compiler']))
+        self.assertEqual(cue.ci['platform'], 'x86', "ci['platform'] is {0} (expected: x86)"
+                         .format(cue.ci['platform']))
+        self.assertFalse(cue.ci['static'], "ci['static'] is True (expected: False)")
+        self.assertFalse(cue.ci['debug'], "ci['debug'] is True (expected: False)")
+        self.assertEqual(cue.ci['configuration'], 'shared-optimized',
+                         "ci['configuration'] is {0} (expected: shared-optimized)"
+                         .format(cue.ci['configuration']))
+        self.assertIn('make', cue.ci['choco'], "'make' is not in ci['choco']")
+
+    def test_WindowsVs2019None(self):
+        cue.detect_context()
+        self.assertEqual(cue.ci['service'], 'appveyor', "ci['service'] is {0} (expected: appveyor)"
+                         .format(cue.ci['service']))
+        self.assertEqual(cue.ci['os'], 'windows', "ci['os'] is {0} (expected: windows)"
+                         .format(cue.ci['os']))
+        self.assertEqual(cue.ci['compiler'], 'vs2019', "ci['compiler'] is {0} (expected: vs2019)"
+                         .format(cue.ci['compiler']))
+        self.assertEqual(cue.ci['platform'], 'x64', "ci['platform'] is {0} (expected: x64)"
+                         .format(cue.ci['platform']))
+        self.assertFalse(cue.ci['static'], "ci['static'] is True (expected: False)")
+        self.assertFalse(cue.ci['debug'], "ci['debug'] is True (expected: False)")
+        self.assertEqual(cue.ci['configuration'], 'shared-optimized',
+                         "ci['configuration'] is {0} (expected: shared-optimized)"
+                         .format(cue.ci['configuration']))
+        self.assertIn('make', cue.ci['choco'], "'make' is not in ci['choco']")
+
+    def test_StaticGetsWarning(self):
+        os.environ['STATIC'] = 'YES'
+        capturedOutput = getStringIO()
+        sys.stdout = capturedOutput
+        cue.detect_context()
+        sys.stdout = sys.__stdout__
+        self.assertRegexpMatches(capturedOutput.getvalue(), "Variable 'STATIC' not supported anymore")
+
+    def test_MisspelledConfigurationGetsWarning(self):
+        os.environ['CONFIGURATION'] = 'static-dubug'
+        capturedOutput = getStringIO()
+        sys.stdout = capturedOutput
+        cue.detect_context()
+        sys.stdout = sys.__stdout__
+        self.assertRegexpMatches(capturedOutput.getvalue(), "Unrecognized build configuration setting")
+
+
+class TestSetupForBuild(unittest.TestCase):
+    args = Namespace(paths=[])
+    cue.building_base = True
+    if ci_os == 'windows':
+        choco_installs = ['make']
+        if ci_service != 'appveyor':
+            choco_installs.append('strawberryperl')
+        sp.check_call(['choco', 'install', '-ry'] + choco_installs)
+
+    def setUp(self):
+        if ci_service == 'appveyor':
+            os.environ['CONFIGURATION'] = 'default'
+        cue.detect_context()
+
+    def tearDown(self):
+        os.environ.pop('EPICS_HOST_ARCH', None)
+        cue.clear_lists()
+
+    def test_AddPathsOption(self):
+        os.environ['FOOBAR'] = 'BAR'
+        args = Namespace(paths=['/my/{FOOBAR}/dir', '/my/foobar'])
+        cue.setup_for_build(args)
+        self.assertTrue(re.search('/my/BAR/dir', os.environ['PATH']), 'Expanded path not in PATH')
+        self.assertTrue(re.search('/foobar', os.environ['PATH']), 'Plain path not in PATH')
+        os.environ.pop('FOOBAR', None)
+
+    @unittest.skipIf(ci_os != 'windows', 'HostArchConfiguration test only applies to windows')
+    def test_HostArchConfiguration(self):
+        cue.ci['compiler'] = 'vs2017'
+        for cue.ci['debug'] in [True, False]:
+            for cue.ci['static'] in [True, False]:
+                config_st = {True: 'static', False: 'shared'}
+                config_db = {True: '-debug', False: '-optimized'}
+                config = config_st[cue.ci['static']] + config_db[cue.ci['debug']]
+                cue.setup_for_build(self.args)
+                self.assertTrue('EPICS_HOST_ARCH' in os.environ,
+                                'EPICS_HOST_ARCH is not set for Configuration={0}'.format(config))
+                if cue.ci['static']:
+                    self.assertTrue(re.search('-static$', os.environ['EPICS_HOST_ARCH']),
+                                    'EPICS_HOST_ARCH is not -static for Configuration={0}'.format(config))
+                    self.assertFalse(re.search('debug', os.environ['EPICS_HOST_ARCH']),
+                                     'EPICS_HOST_ARCH is -debug for Configuration={0}'.format(config))
+                elif cue.ci['debug']:
+                    self.assertFalse(re.search('static', os.environ['EPICS_HOST_ARCH']),
+                                     'EPICS_HOST_ARCH (found {0}) is -static for Configuration={1}'
+                                     .format(os.environ['EPICS_HOST_ARCH'], config))
+                    self.assertTrue(re.search('-debug$', os.environ['EPICS_HOST_ARCH']),
+                                    'EPICS_HOST_ARCH (found {0}) is not -debug for Configuration={1}'
+                                    .format(os.environ['EPICS_HOST_ARCH'], config))
+                else:
+                    self.assertFalse(re.search('static', os.environ['EPICS_HOST_ARCH']),
+                                     'EPICS_HOST_ARCH is -static for Configuration={0}'.format(config))
+                    self.assertFalse(re.search('debug', os.environ['EPICS_HOST_ARCH']),
+                                     'EPICS_HOST_ARCH is -debug for Configuration={0}'.format(config))
+
+    @unittest.skipIf(ci_os != 'windows', 'HostArchPlatform test only applies to windows')
+    def test_HostArchPlatform(self):
+        if ci_service == 'appveyor':
+            platforms = ['x86', 'x64']
+        else:
+            platforms = ['x64']
+        for platform in platforms:
+            for cc in ['vs2019', 'gcc']:
+                cue.ci['platform'] = platform
+                cue.ci['compiler'] = cc
+                cue.setup_for_build(self.args)
+                self.assertTrue('EPICS_HOST_ARCH' in os.environ,
+                                'EPICS_HOST_ARCH is not set for {0} / {1}'
+                                .format(cc, cue.ci['platform']))
+                if platform == 'x86':
+                    self.assertTrue(re.search('^win32-x86', os.environ['EPICS_HOST_ARCH']),
+                                    'EPICS_HOST_ARCH (found {0}) is not win32-x86 for {1} / {2}'
+                                    .format(os.environ['EPICS_HOST_ARCH'], cc, platform))
+                else:
+                    self.assertTrue(re.search('^windows-x64', os.environ['EPICS_HOST_ARCH']),
+                                    'EPICS_HOST_ARCH (found {0}) is not windows-x64 for {1} / {2}'
+                                    .format(os.environ['EPICS_HOST_ARCH'], cc, platform))
+                if cc == 'gcc':
+                    self.assertTrue(re.search('-mingw$', os.environ['EPICS_HOST_ARCH']),
+                                    'EPICS_HOST_ARCH (found {0}) is not -mingw for {1} / {2}'
+                                    .format(os.environ['EPICS_HOST_ARCH'], cc, platform))
+                    if ci_service == 'appveyor':
+                        pattern = {'x86': 'mingw32', 'x64': 'mingw64'}
+                        self.assertTrue(re.search(pattern[platform], os.environ['PATH']),
+                                        'Binary location for {0} not in PATH (found PATH = {1})'
+                                        .format(pattern[platform], os.environ['PATH']))
+
+    @unittest.skipIf(ci_os != 'windows', 'Strawberry perl test only applies to windows')
+    def test_StrawberryInPath(self):
+        cue.setup_for_build(self.args)
+        self.assertTrue(re.search('strawberry', os.environ['PATH'], flags=re.IGNORECASE),
+                        'Strawberry Perl location not in PATH (found  PATH = {0})'
+                        .format(os.environ['PATH']))
+
+    def setBase314(self, yesno):
+        cfg_base_version = os.path.join('configure', 'CONFIG_BASE_VERSION')
+        fout = open(cfg_base_version, 'w')
+        print('# test file for base version detection', file=fout)
+        print('BASE_3_14={0}'.format(yesno), file=fout)
+        fout.close()
+
+    def setTestResultsTarget(self, target):
+        rules_build = os.path.join('configure', 'RULES_BUILD')
+        fout = open(rules_build, 'w')
+        print('# test file for target detection', file=fout)
+        print('{0}: something'.format(target), file=fout)
+        fout.close()
+
+    def test_DetectionBase314No(self):
+        self.setBase314('NO')
+        cue.setup_for_build(self.args)
+        self.assertFalse(cue.is_base314, 'Falsely detected Base 3.14')
+
+    def test_DetectionBase314Yes(self):
+        self.setBase314('YES')
+        cue.setup_for_build(self.args)
+        self.assertTrue(cue.is_base314, 'Base 3.14 = YES not detected')
+
+    def test_DetectionTestResultsTarget314No(self):
+        self.setBase314('YES')
+        self.setTestResultsTarget('nottherighttarget')
+        cue.setup_for_build(self.args)
+        self.assertFalse(cue.has_test_results, 'Falsely detected test-results target')
+
+    def test_DetectionTestResultsTarget314Yes(self):
+        self.setBase314('YES')
+        self.setTestResultsTarget('test-results')
+        cue.setup_for_build(self.args)
+        self.assertFalse(cue.has_test_results, 'Falsely found test-results on Base 3.14')
+
+    def test_DetectionTestResultsTargetNot314Yes(self):
+        self.setBase314('NO')
+        self.setTestResultsTarget('test-results')
+        cue.setup_for_build(self.args)
+        self.assertTrue(cue.has_test_results, 'Target test-results not detected')
+
+    def test_ExtraMakeArgs(self):
+        os.environ['EXTRA'] = 'bla'
+        for ind in range(1,5):
+            os.environ['EXTRA{0}'.format(ind)] = 'bla {0}'.format(ind)
+        cue.setup_for_build(self.args)
+        self.assertTrue(cue.extra_makeargs[0] == 'bla', 'Extra make arg [0] not set')
+        for ind in range(1,5):
+            self.assertTrue(cue.extra_makeargs[ind] == 'bla {0}'.format(ind),
+                            'Extra make arg [{0}] not set (expected "bla {0}", found "{1}")'
+                            .format(ind, cue.extra_makeargs[ind]))
+
+
+class TestHooks(unittest.TestCase):
+    location = os.path.join(cue.ci['cachedir'], 'hook_test')
+    bla_file = os.path.join(location, 'bla.txt')
+    new_file = os.path.join(location, 'dd', 'new.txt')
+
+    def setUp(self):
+        if os.path.exists(self.location):
+            shutil.rmtree(self.location, onerror=cue.remove_readonly)
+        try:
+            os.makedirs(self.location)
+        except:
+            pass
+        with open(self.bla_file, 'w') as f:
+            f.write('''LINE1=YES
+LINE2=NO''')
+
+    def test_patchfile(self):
+        hook = os.path.join(builddir, 'test.patch')
+        cue.apply_patch(hook, cwd=self.location)
+        line1_yes = False
+        with open(self.bla_file) as f:
+            if 'LINE1=YES' in f.read():
+                line1_yes = True
+        self.assertFalse(line1_yes, "Patch didn't change line in test file 'bla.txt'")
+        self.assertTrue(os.path.exists(self.new_file), "patch didn't add new file")
+
+    def test_archiveZip(self):
+        hook = os.path.join(builddir, 'test.zip')
+        cue.extract_archive(hook, cwd=self.location)
+        self.assertTrue(os.path.exists(self.new_file), "archive extract didn't add new file")
+
+    def test_archive7z(self):
+        hook = os.path.join(builddir, 'test.7z')
+        cue.extract_archive(hook, cwd=self.location)
+        self.assertTrue(os.path.exists(self.new_file), "archive extract didn't add new file")
+
+
+if __name__ == "__main__":
+    if 'VV' in os.environ and os.environ['VV'] == '1':
+        logging.basicConfig(level=logging.DEBUG)
+        cue.silent_dep_builds = False
+
+    cue.detect_context()
+    cue.host_info()
+    if sys.argv[1:] == ['env']:
+        # testing with_vcvars
+        [print(K, '=', V) for K, V in os.environ.items()]
+    elif ci_os == 'windows' and sys.argv[1:] == ['findvs']:
+        from fnmatch import fnmatch
+        print('Available Visual Studio versions')
+        for base in (r'C:\Program Files (x86)', r'C:\Program Files'):
+            for root, dirs, files in os.walk(base):
+                for fname in files:
+                    if fnmatch(fname, 'vcvarsall.bat'):
+                        print('Found', os.path.join(root, fname))
+        sys.stdout.flush()
+    else:
+        unittest.main()

defaults.set

@@ -1,4 +1,5 @@
 # EPICS Base
+BASE=7.0
 BASE_DIRNAME=base
 BASE_REPONAME=epics-base
 BASE_REPOOWNER=epics-base
@@ -34,3 +35,4 @@ STREAM_REPOOWNER=paulscherrerinstitute
 # sscan
 # iocStats
 # motor
+# ipac

exampleApp/Db/Makefile

@@ -9,6 +9,9 @@ DB += dbExample2.db
 DB += dbSubExample.db
 DB += user.substitutions
 
+# Host-side expansion of substitutions file with MSI
+DB += dbExample3.db
+
 # If <anyname>.db template is not named <anyname>*.template add
 # <anyname>_TEMPLATE = <templatename>
 

exampleApp/Db/dbExample3.substitutions

@@ -0,0 +1,8 @@
+# Example host-side substitutions file
+
+file dbExample2.db {
+    pattern { user, no, scan }
+        { "ralph", 4, "1 second" }
+        { "ralph", 5, "2 second" }
+        { "ralph", 6, "5 second" }
+}

exampleApp/Makefile

@@ -4,5 +4,10 @@ DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*))
 DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*))
 DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*))
 DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*))
+
+DIRS := $(DIRS) test
+
+test_DEPEND_DIRS += src
+
 include $(TOP)/configure/RULES_DIRS
 

exampleApp/src/Makefile

@@ -4,6 +4,9 @@ include $(TOP)/configure/CONFIG
 #----------------------------------------
 #  ADD MACRO DEFINITIONS BELOW HERE
 
+# use the new RSET definition
+USR_CPPFLAGS += -DUSE_TYPED_RSET
+
 # xxxRecord.h will be created from xxxRecord.dbd
 DBDINC += xxxRecord
 

exampleApp/src/xxxRecord.c

@@ -1,6 +1,6 @@
 /* xxxRecord.c */
 /* Example record support module */
-  
+
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -25,111 +25,111 @@
 /* Create RSET - Record Support Entry Table */
 #define report NULL
 #define initialize NULL
-static long init_record();
+static long init_record(struct dbCommon *, int);
-static long process();
+static long process(struct dbCommon *);
 #define special NULL
 #define get_value NULL
 #define cvt_dbaddr NULL
 #define get_array_info NULL
 #define put_array_info NULL
-static long get_units();
+static long get_units(DBADDR *, char *);
-static long get_precision();
+static long get_precision(const DBADDR *, long *);
 #define get_enum_str NULL
 #define get_enum_strs NULL
 #define put_enum_str NULL
-static long get_graphic_double();
+static long get_graphic_double(DBADDR *, struct dbr_grDouble *);
-static long get_control_double();
+static long get_control_double(DBADDR *, struct dbr_ctrlDouble *);
-static long get_alarm_double();
+static long get_alarm_double(DBADDR *, struct dbr_alDouble *);
- 
+
 rset xxxRSET={
-	RSETNUMBER,
+    RSETNUMBER,
-	report,
+    report,
-	initialize,
+    initialize,
-	init_record,
+    init_record,
-	process,
+    process,
-	special,
+    special,
-	get_value,
+    get_value,
-	cvt_dbaddr,
+    cvt_dbaddr,
-	get_array_info,
+    get_array_info,
-	put_array_info,
+    put_array_info,
-	get_units,
+    get_units,
-	get_precision,
+    get_precision,
-	get_enum_str,
+    get_enum_str,
-	get_enum_strs,
+    get_enum_strs,
-	put_enum_str,
+    put_enum_str,
-	get_graphic_double,
+    get_graphic_double,
-	get_control_double,
+    get_control_double,
-	get_alarm_double
+    get_alarm_double
 };
 epicsExportAddress(rset,xxxRSET);
 
 typedef struct xxxset { /* xxx input dset */
-	long		number;
+    long		number;
-	DEVSUPFUN	dev_report;
+    DEVSUPFUN	dev_report;
-	DEVSUPFUN	init;
+    DEVSUPFUN	init;
-	DEVSUPFUN	init_record; /*returns: (-1,0)=>(failure,success)*/
+    DEVSUPFUN	init_record; /*returns: (-1,0)=>(failure,success)*/
-	DEVSUPFUN	get_ioint_info;
+    DEVSUPFUN	get_ioint_info;
-	DEVSUPFUN	read_xxx;
+    DEVSUPFUN	read_xxx;
 }xxxdset;
 
 static void checkAlarms(xxxRecord *prec);
 static void monitor(xxxRecord *prec);
-
+
-static long init_record(void *precord,int pass)
+static long init_record(struct dbCommon *pcommon, int pass)
 {
-    xxxRecord	*prec = (xxxRecord *)precord;
+    xxxRecord *prec = (xxxRecord *)pcommon;
     xxxdset	*pdset;
     long	status;
 
     if (pass==0) return(0);
 
     if(!(pdset = (xxxdset *)(prec->dset))) {
-	recGblRecordError(S_dev_noDSET,(void *)prec,"xxx: init_record");
+    recGblRecordError(S_dev_noDSET,(void *)prec,"xxx: init_record");
-	return(S_dev_noDSET);
+    return(S_dev_noDSET);
     }
     /* must have read_xxx function defined */
     if( (pdset->number < 5) || (pdset->read_xxx == NULL) ) {
-	recGblRecordError(S_dev_missingSup,(void *)prec,"xxx: init_record");
+    recGblRecordError(S_dev_missingSup,(void *)prec,"xxx: init_record");
-	return(S_dev_missingSup);
+    return(S_dev_missingSup);
     }
 
     if( pdset->init_record ) {
-	if((status=(*pdset->init_record)(prec))) return(status);
+    if((status=(*pdset->init_record)(prec))) return(status);
     }
     return(0);
 }
-
+
-static long process(void *precord)
+static long process(struct dbCommon *pcommon)
 {
-	xxxRecord	*prec = (xxxRecord *)precord;
+    xxxRecord	*prec = (xxxRecord *)pcommon;
-	xxxdset		*pdset = (xxxdset *)(prec->dset);
+    xxxdset		*pdset = (xxxdset *)(prec->dset);
-	long		 status;
+    long		 status;
-	unsigned char    pact=prec->pact;
+    unsigned char    pact=prec->pact;
 
-	if( (pdset==NULL) || (pdset->read_xxx==NULL) ) {
+    if( (pdset==NULL) || (pdset->read_xxx==NULL) ) {
-		prec->pact=TRUE;
+        prec->pact=TRUE;
-		recGblRecordError(S_dev_missingSup,(void *)prec,"read_xxx");
+        recGblRecordError(S_dev_missingSup,(void *)prec,"read_xxx");
-		return(S_dev_missingSup);
+        return(S_dev_missingSup);
-	}
+    }
 
-	/* pact must not be set until after calling device support */
+    /* pact must not be set until after calling device support */
-	status=(*pdset->read_xxx)(prec);
+    status=(*pdset->read_xxx)(prec);
-	/* check if device support set pact */
+    /* check if device support set pact */
-	if ( !pact && prec->pact ) return(0);
+    if ( !pact && prec->pact ) return(0);
-	prec->pact = TRUE;
+    prec->pact = TRUE;
 
-	recGblGetTimeStamp(prec);
+    recGblGetTimeStamp(prec);
-	/* check for alarms */
+    /* check for alarms */
-	checkAlarms(prec);
+    checkAlarms(prec);
-	/* check event list */
+    /* check event list */
-	monitor(prec);
+    monitor(prec);
-	/* process the forward scan link record */
+    /* process the forward scan link record */
         recGblFwdLink(prec);
 
-	prec->pact=FALSE;
+    prec->pact=FALSE;
-	return(status);
+    return(status);
 }
-
+
 static long get_units(DBADDR *paddr, char *units)
 {
     xxxRecord	*prec=(xxxRecord *)paddr->precord;
@@ -138,7 +138,7 @@ static long get_units(DBADDR *paddr, char *units)
     return(0);
 }
 
-static long get_precision(DBADDR *paddr, long *precision)
+static long get_precision(const DBADDR *paddr, long *precision)
 {
     xxxRecord	*prec=(xxxRecord *)paddr->precord;
 
@@ -176,8 +176,8 @@ static long get_control_double(DBADDR *paddr,struct dbr_ctrlDouble *pcd)
     || fieldIndex == xxxRecordHIGH
     || fieldIndex == xxxRecordLOW
     || fieldIndex == xxxRecordLOLO) {
-	pcd->upper_ctrl_limit = prec->hopr;
+    pcd->upper_ctrl_limit = prec->hopr;
-	pcd->lower_ctrl_limit = prec->lopr;
+    pcd->lower_ctrl_limit = prec->lopr;
     } else recGblGetControlDouble(paddr,pcd);
     return(0);
 }
@@ -195,79 +195,79 @@ static long get_alarm_double(DBADDR *paddr,struct dbr_alDouble *pad)
     } else recGblGetAlarmDouble(paddr,pad);
     return(0);
 }
-
+
 static void checkAlarms(xxxRecord *prec)
 {
     double		val, hyst, lalm;
     float		hihi, high, low, lolo;
-	unsigned short	hhsv, llsv, hsv, lsv;
+    unsigned short	hhsv, llsv, hsv, lsv;
 
-	if(prec->udf == TRUE ){
+    if(prec->udf == TRUE ){
         recGblSetSevr(prec,UDF_ALARM,INVALID_ALARM);
-		return;
+        return;
-	}
+    }
-	hihi = prec->hihi; lolo = prec->lolo; high = prec->high; low = prec->low;
+    hihi = prec->hihi; lolo = prec->lolo; high = prec->high; low = prec->low;
-	hhsv = prec->hhsv; llsv = prec->llsv; hsv = prec->hsv; lsv = prec->lsv;
+    hhsv = prec->hhsv; llsv = prec->llsv; hsv = prec->hsv; lsv = prec->lsv;
-	val = prec->val; hyst = prec->hyst; lalm = prec->lalm;
+    val = prec->val; hyst = prec->hyst; lalm = prec->lalm;
 
-	/* alarm condition hihi */
+    /* alarm condition hihi */
-	if (hhsv && (val >= hihi || ((lalm==hihi) && (val >= hihi-hyst)))){
+    if (hhsv && (val >= hihi || ((lalm==hihi) && (val >= hihi-hyst)))){
-	        if (recGblSetSevr(prec,HIHI_ALARM,prec->hhsv)) prec->lalm = hihi;
+            if (recGblSetSevr(prec,HIHI_ALARM,prec->hhsv)) prec->lalm = hihi;
-		return;
+        return;
-	}
+    }
 
-	/* alarm condition lolo */
+    /* alarm condition lolo */
-	if (llsv && (val <= lolo || ((lalm==lolo) && (val <= lolo+hyst)))){
+    if (llsv && (val <= lolo || ((lalm==lolo) && (val <= lolo+hyst)))){
-	        if (recGblSetSevr(prec,LOLO_ALARM,prec->llsv)) prec->lalm = lolo;
+            if (recGblSetSevr(prec,LOLO_ALARM,prec->llsv)) prec->lalm = lolo;
-		return;
+        return;
-	}
+    }
 
-	/* alarm condition high */
+    /* alarm condition high */
-	if (hsv && (val >= high || ((lalm==high) && (val >= high-hyst)))){
+    if (hsv && (val >= high || ((lalm==high) && (val >= high-hyst)))){
-	        if (recGblSetSevr(prec,HIGH_ALARM,prec->hsv)) prec->lalm = high;
+            if (recGblSetSevr(prec,HIGH_ALARM,prec->hsv)) prec->lalm = high;
-		return;
+        return;
-	}
+    }
 
-	/* alarm condition low */
+    /* alarm condition low */
-	if (lsv && (val <= low || ((lalm==low) && (val <= low+hyst)))){
+    if (lsv && (val <= low || ((lalm==low) && (val <= low+hyst)))){
-	        if (recGblSetSevr(prec,LOW_ALARM,prec->lsv)) prec->lalm = low;
+            if (recGblSetSevr(prec,LOW_ALARM,prec->lsv)) prec->lalm = low;
-		return;
+        return;
-	}
+    }
 
-	/* we get here only if val is out of alarm by at least hyst */
+    /* we get here only if val is out of alarm by at least hyst */
-	prec->lalm = val;
+    prec->lalm = val;
-	return;
+    return;
 }
-
+
 static void monitor(xxxRecord *prec)
 {
-	unsigned short	monitor_mask;
+    unsigned short	monitor_mask;
-	double		delta;
+    double		delta;
 
         monitor_mask = recGblResetAlarms(prec);
-	/* check for value change */
+    /* check for value change */
-	delta = prec->mlst - prec->val;
+    delta = prec->mlst - prec->val;
-	if(delta<0.0) delta = -delta;
+    if(delta<0.0) delta = -delta;
-	if (delta > prec->mdel) {
+    if (delta > prec->mdel) {
-		/* post events for value change */
+        /* post events for value change */
-		monitor_mask |= DBE_VALUE;
+        monitor_mask |= DBE_VALUE;
-		/* update last value monitored */
+        /* update last value monitored */
-		prec->mlst = prec->val;
+        prec->mlst = prec->val;
-	}
+    }
 
-	/* check for archive change */
+    /* check for archive change */
-	delta = prec->alst - prec->val;
+    delta = prec->alst - prec->val;
-	if(delta<0.0) delta = -delta;
+    if(delta<0.0) delta = -delta;
-	if (delta > prec->adel) {
+    if (delta > prec->adel) {
-		/* post events on value field for archive change */
+        /* post events on value field for archive change */
-		monitor_mask |= DBE_LOG;
+        monitor_mask |= DBE_LOG;
-		/* update last archive value monitored */
+        /* update last archive value monitored */
-		prec->alst = prec->val;
+        prec->alst = prec->val;
-	}
+    }
 
-	/* send out monitors connected to the value field */
+    /* send out monitors connected to the value field */
-	if (monitor_mask){
+    if (monitor_mask){
-		db_post_events(prec,&prec->val,monitor_mask);
+        db_post_events(prec,&prec->val,monitor_mask);
-	}
+    }
-	return;
+    return;
 }

exampleApp/test/Makefile

@@ -0,0 +1,62 @@
+#*************************************************************************
+# Copyright (c) 2020 ITER Organization.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
+#*************************************************************************
+CURDIR := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
+TOP = ../..
+
+include $(TOP)/configure/CONFIG
+
+# use the new RSET definition
+USR_CPPFLAGS += -DUSE_TYPED_RSET
+
+TARGETS += $(COMMON_DIR)/exampleTest.dbd
+DBDDEPENDS_FILES += exampleTest.dbd$(DEP)
+exampleTest_DBD += example.dbd
+
+TESTFILES += $(COMMON_DIR)/exampleTest.dbd
+
+testHarness_SRCS += exampleTest_registerRecordDeviceDriver.cpp
+
+PROD_LIBS += exampleSupport
+ifneq ($(SNCSEQ),)
+    PROD_LIBS += seq pv
+endif
+PROD_LIBS += $(EPICS_BASE_IOC_LIBS)
+
+TESTPROD_HOST += exampleTest
+exampleTest_SRCS += exampleTest.c
+exampleTest_SRCS += exampleTest_registerRecordDeviceDriver.cpp
+testHarness_SRCS += exampleTest.c
+TESTFILES += ../../../db/dbExample1.db
+TESTS += exampleTest
+
+# This runs all the test programs in a known working order:
+testHarness_SRCS += epicsRunExampleTests.c
+
+exampleTestHarness_SRCS += $(testHarness_SRCS)
+exampleTestHarness_SRCS_RTEMS += rtemsTestHarness.c
+
+ifdef BASE_7_0
+PROD_SRCS_RTEMS += rtemsTestData.c
+endif
+
+PROD_vxWorks = exampleTestHarness
+PROD_RTEMS = exampleTestHarness
+
+TESTSPEC_vxWorks = exampleTestHarness.munch; epicsRunExampleTests
+TESTSPEC_RTEMS = exampleTestHarness.boot; epicsRunExampleTests
+
+TESTSCRIPTS_HOST += $(TESTS:%=%.t)
+ifneq ($(filter $(T_A),$(CROSS_COMPILER_RUNTEST_ARCHS)),)
+TESTPROD_RTEMS = $(TESTPROD_HOST)
+TESTSCRIPTS_RTEMS += $(TESTS:%=%.t)
+endif
+
+include $(TOP)/configure/RULES
+
+ifdef BASE_7_0
+rtemsTestData.c : $(TESTFILES) $(TOOLS)/epicsMakeMemFs.pl
+	$(PERL) $(TOOLS)/epicsMakeMemFs.pl $@ epicsRtemsFSImage $(TESTFILES)
+endif

exampleApp/test/epicsRunExampleTests.c

@@ -0,0 +1,28 @@
+/*************************************************************************\
+* Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
+*     National Laboratory.
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
+\*************************************************************************/
+
+/*
+ * Run Example tests as a batch.
+ *
+ */
+
+#include "epicsUnitTest.h"
+#include "epicsExit.h"
+#include "dbmf.h"
+
+int exampleTest(void);
+
+void epicsRunExampleTests(void)
+{
+    testHarness();
+
+    runTest(exampleTest);
+
+    dbmfFreeChunks();
+
+    epicsExit(0);   /* Trigger test harness */
+}

exampleApp/test/exampleTest.c

@@ -0,0 +1,58 @@
+/*************************************************************************\
+* Copyright (c) 2020 ITER Organization.
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
+\*************************************************************************/
+
+/*
+ *  Author: Ralph Lange <ralph.lange@gmx.de>
+ */
+
+#include <string.h>
+
+#include <epicsUnitTest.h>
+#include <testMain.h>
+
+#include <dbAccess.h>
+#include <dbStaticLib.h>
+#include <errlog.h>
+
+void exampleTest_registerRecordDeviceDriver(struct dbBase *);
+
+static dbCommon *prec;
+
+/* from Base 3.15 dbUnitTest.c */
+static
+dbCommon* testdbRecordPtr(const char* pv)
+{
+    DBADDR addr;
+
+    if (dbNameToAddr(pv, &addr))
+        testAbort("Missing record \"%s\"", pv);
+
+    return addr.precord;
+}
+
+static void testOnce(void)
+{
+    testDiag("check that tests work");
+
+    dbReadDatabase(&pdbbase, "exampleTest.dbd", "../O.Common", NULL);
+    exampleTest_registerRecordDeviceDriver(pdbbase);
+    dbReadDatabase(&pdbbase, "dbExample1.db", "../../../db", "user=test");
+
+    testDiag("Searching for records from example application");
+
+    prec = testdbRecordPtr("test:xxxExample");
+    testOk((prec != NULL), "record test:xxxExample");
+
+    prec = testdbRecordPtr("test:aiExample");
+    testOk((prec != NULL), "record test:aiExample");
+}
+
+MAIN(exampleTest)
+{
+    testPlan(2);
+    testOnce();
+    return testDone();
+}

exampleApp/test/rtemsTestHarness.c

@@ -0,0 +1,14 @@
+/*************************************************************************\
+* Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
+*     National Laboratory.
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
+\*************************************************************************/
+
+extern void epicsRunExampleTests(void);
+
+int main(int argc, char **argv)
+{
+    epicsRunExampleTests();  /* calls epicsExit(0) */
+    return 0;
+}

github-actions/README.md

@@ -0,0 +1,70 @@
+# GitHub Actions Scripts for EPICS Modules
+
+## Features
+
+ - 20 parallel runners on Linux/Windows (5 runners on MacOS)
+ - Ubuntu 16/18/20, MacOS 10.15, Windows Server 2016/2019
+ - Compile natively on Linux (gcc, clang)
+ - Compile natively on MacOS (clang)
+ - Compile natively on Windows (gcc/MinGW, Visual Studio 2017 & 2019)
+ - Cross-compile for Windows 32bit and 64bit using MinGW and WINE
+ - Cross-compile for RTEMS 4.9 and 4.10 (pc386, Base >= 3.15)
+ - Cross-compile for RTEMS 5 (10 BSPs, Base >= 7.0.5.1)
+ - Caching not supported yet.
+
+## How to Use these Scripts
+
+ 1. Add the ci-scripts respository as a Git Submodule
+    (see [README](../README.md) one level above).
+
+ 2. Add settings files defining which dependencies in which versions
+    you want to build against
+    (see [README](../README.md) one level above).
+
+ 3. Create a GitHub Actions configuration by copying one of the workflow 
+    examples into the directory `.github/workflows` of your module.
+    ```bash
+    $ mkdir -p .github/workflows
+    $ cp .ci/github-actions/ci-scripts-build.yml.example-full .github/workflows/ci-scripts-build.yml
+    ```
+	
+ 4. Edit the workflow configuration to include the build jobs you want
+    GitHub Actions to run.
+
+    Build jobs are specified in the `jobs: <job-name>: strategy:`
+    declaration. The `matrix:` element specifies the axes as configuration
+    parameters with their lists of values,
+    `env:` (on the build level) controls the setting of environment variables
+    (which can be matrix parameters).
+    The `runs-on:` setting specifies the image (operating system) of the
+    runner.
+    The `name:` is what shows up in the web interface for the workflow,
+    builds and jobs, and the elements under `steps:` describe the actions
+    executed for each job of the matrix.
+
+    Please check the comments in the examples for more hints, and the 
+    [GitHub Actions documentation](https://help.github.com/en/actions)
+    for a lot more options and details.
+
+ 5. Push your changes and click on the `Actions` tab of your GitHub repository
+    page to see your build results.
+
+## Specifics
+
+#### Quote Environment Variable Values
+
+Variable settings distinguish between numerical and string values.
+Better quote all branch and tag names. E.g.,
+```yaml
+env:
+  BASE: "7.0"
+```
+to avoid ci-scripts trying to `git clone` with `--branch 7`.
+
+## Caches
+
+GitHub Actions provides caching of dependencies.
+
+However, since their cache restore and create algorithm is fundamentally
+different from those used by Travis and AppVeyor, this will require some
+more changes in ci-scripts to work. Be patient.

github-actions/ci-scripts-build.yml.example-full

@@ -0,0 +1,199 @@
+# .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
+
+# Set the 'name:' properties to values that work for you (MYMODULE)
+
+name: MYMODULE
+
+# Trigger on pushes and PRs to any branch
+on:
+  push:
+    paths-ignore:
+      - 'documentation/*'
+      - '**/*.html'
+      - '**/*.md'
+  pull_request:
+
+env:
+  SETUP_PATH: .ci-local:.ci
+  # For the sequencer on Linux/Windows/MacOS
+  APT: re2c
+  CHOCO: re2c
+  BREW: re2c
+
+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 }}
+      RTEMS_TARGET: ${{ matrix.rtems_target }}
+      EXTRA: ${{ matrix.extra }}
+      TEST: ${{ matrix.test }}
+    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-20.04
+            cmp: gcc
+            configuration: default
+            rtems: "5"
+            rtems_target: RTEMS-pc686-qemu
+            name: "Ub-20 gcc-9 + RT-5.1 pc686"
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            rtems: "5"
+            rtems_target: RTEMS-beatnik
+            test: NO
+            name: "Ub-20 gcc-9 + RT-5.1 beatnik"
+
+          - os: ubuntu-16.04
+            cmp: gcc-4.8
+            utoolchain: true
+            configuration: default
+            name: "Ub-16 gcc-4.8"
+
+          - os: ubuntu-16.04
+            cmp: gcc-4.9
+            utoolchain: true
+            configuration: default
+            name: "Ub-16 gcc-4.9"
+
+          - os: ubuntu-18.04
+            cmp: gcc
+            configuration: default
+            name: "Ub-18 gcc-7"
+
+          - os: ubuntu-18.04
+            cmp: gcc-8
+            utoolchain: true
+            configuration: default
+            name: "Ub-18 gcc-8"
+
+          - os: ubuntu-20.04
+            cmp: gcc-8
+            utoolchain: true
+            configuration: default
+            name: "Ub-20 gcc-8"
+
+          - 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-2016
+            cmp: vs2017
+            configuration: default
+            name: "Win2016 MSC-17"
+
+          - os: windows-2016
+            cmp: vs2017
+            configuration: static
+            name: "Win2016 MSC-17, static"
+
+          - os: windows-2019
+            cmp: gcc
+            configuration: default
+            name: "Win2019 MinGW"
+
+          - os: windows-2019
+            cmp: gcc
+            configuration: static
+            name: "Win2019 MinGW, static"
+
+          - os: windows-2019
+            cmp: vs2019
+            configuration: default
+            name: "Win2019 MSC-19"
+
+          - os: windows-2019
+            cmp: vs2019
+            configuration: static
+            name: "Win2019 MSC-19, static"
+
+    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 -y install software-properties-common
+        sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+        sudo apt-get update
+        sudo apt-get -y install ${{ matrix.cmp }}
+      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 test
+    - name: Upload tapfiles Artifact
+      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

github-actions/ci-scripts-build.yml.example-mini

@@ -0,0 +1,81 @@
+# .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
+
+# Set the 'name:' properties to values that work for you
+
+name: MYMODULE
+
+# Trigger on pushes and PRs to any branch
+on:
+  push:
+    paths-ignore:
+      - 'documentation/*'
+      - '**/*.html'
+      - '**/*.md'
+  pull_request:
+
+env:
+  SETUP_PATH: .ci-local:.ci
+
+jobs:
+  build-linux:
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.os }}
+    # Set environment variables from matrix parameters
+    env:
+      CMP: ${{ matrix.cmp }}
+      BCFG: ${{ matrix.configuration }}
+      BASE: ${{ matrix.base }}
+    strategy:
+      fail-fast: false
+      matrix:
+        - os: ubuntu-18.04
+          cmp: gcc
+          configuration: default
+          base: "7.0"
+          name: "7.0 Ub-18 gcc-7"
+
+        - os: ubuntu-18.04
+          cmp: gcc
+          configuration: static
+          base: "7.0"
+          name: "7.0 Ub-18 gcc-7 static"
+
+        - os: ubuntu-20.04
+          cmp: gcc
+          configuration: default
+          base: "3.15"
+          name: "3.15 Ub-20 gcc-9"
+
+        - os: ubuntu-20.04
+          cmp: gcc
+          configuration: static
+          base: "3.15"
+          name: "3.15 Ub-20 gcc-9 static"
+
+        - os: ubuntu-20.04
+          cmp: gcc
+          configuration: debug
+          base: "3.15"
+          name: "3.15 Ub-20 gcc-9 debug"
+
+        - os: ubuntu-20.04
+          cmp: clang
+          configuration: default
+          base: "3.15"
+          name: "3.15 Ub-20 clang-10"
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - 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 test
+    - name: Collect and show test results
+      run: python .ci/cue.py test-results

gitlab/.gitlab-ci.yml.example-full

@@ -0,0 +1,121 @@
+# .gitlab-ci.yml for testing EPICS Base ci-scripts
+# (see: https://github.com/epics-base/ci-scripts)
+
+# This is YAML - indentation levels are crucial
+
+# GitLab runner can use any Docker container, we're using this one
+# to be comparable with the other CI services
+image: ubuntu:bionic
+
+cache:
+  key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
+  paths:
+    - .cache/
+
+variables:
+  GIT_SUBMODULE_STRATEGY: "recursive"
+  SETUP_PATH: ".ci-local:.ci"
+  BASE_RECURSIVE: "NO"
+  # Additional packages needed for
+  #     |   EPICS                            |clang|   Windows cross builds                |RTEMS testing  |sequencer
+  APT: "libreadline6-dev libncurses5-dev perl clang g++-mingw-w64-i686 g++-mingw-w64-x86-64 qemu-system-x86 re2c"
+  CMP: "gcc"
+  BGFC: "default"
+
+# Template for build jobs (hidden)
+.build:
+  stage: build
+  before_script:
+    - apt-get update -qq && apt-get install -y -qq build-essential git python curl p7zip-full
+    - python .ci/cue.py prepare
+  script:
+    - python .ci/cue.py build
+    - python .ci/cue.py test
+    - python .ci/cue.py test-results
+
+# If you need to do more during install and build,
+# add a local directory to your module and do e.g.
+#  - ./.ci-local/travis/install-extras.sh
+
+# Define build jobs
+
+# Well-known variables to use
+# SET         source setup file
+# ADD_MODULES extra modules (for a specific job)
+# BCFG        build configuration (static/debug/static-debug;
+#             default: shared-optimized)
+# TEST        set to NO to skip running the tests (default: YES)
+# VV          set to make build scripts verbose (default: unset)
+# EXTRA       content will be added to make command line
+# EXTRA1..5   more additional arguments for the make command
+#             (one argument per variable)
+
+# Usually from setup files, but may be specified or overridden
+#  on a job line
+# MODULES     list of dependency modules
+# BASE        branch or release tag name of the EPICS Base to use
+# <MODULE>    branch or release tag for a specific module
+# ...         see README for setup file syntax description
+
+# Different configurations of gcc and clang
+gcc_default:
+  extends: .build
+  variables:
+    BASE: "7.0"
+
+gcc_static:
+  extends: .build
+  variables:
+    BASE: "7.0"
+    BCFG: "static"
+
+clang_default:
+  extends: .build
+  variables:
+    BASE: "7.0"
+    CMP: "clang"
+
+clang_static_c++11:
+  extends: .build
+  variables:
+    BASE: "7.0"
+    CMP: "clang"
+    BCFG: "static"
+    EXTRA: "CMD_CXXFLAGS=-std=c++11"
+
+# Cross-compilations to Windows using gcc/MinGW and WINE
+wine32_default:
+  extends: .build
+  variables:
+    BASE: "3.15"
+    BCFG: "static"
+    WINE: "32"
+    TEST: "NO"
+
+wine64_debug:
+  extends: .build
+  variables:
+    BASE: "7.0"
+    BCFG: "debug"
+    WINE: "64"
+
+# Cross-builds to RTEMS 4.9, 4.10 and 5
+rtems4.9_default:
+  extends: .build
+  variables:
+    RTEMS: "4.9"
+    BASE: "3.15"
+
+rtems4.10_debug:
+  extends: .build
+  variables:
+    RTEMS: "4.10"
+    BASE: "7.0"
+    BCFG: "debug"
+
+rtems5_default:
+  extends: .build
+  image: ubuntu:focal
+  variables:
+    RTEMS: "5"
+    RTEMS_TARGET: "RTEMS-pc686-qemu"

gitlab/.gitlab-ci.yml.example-mini

@@ -0,0 +1,36 @@
+# .gitlab-ci.yml for testing EPICS Base ci-scripts
+# (see: https://github.com/epics-base/ci-scripts)
+
+image: ubuntu:bionic
+
+variables:
+  GIT_SUBMODULE_STRATEGY: "recursive"
+  SETUP_PATH: ".ci-local:.ci"
+  BASE_RECURSIVE: "NO"
+  # Minimal set of packages needed to compile EPICS Base
+  APT: "libreadline6-dev libncurses5-dev perl"
+  CMP: "gcc"
+  BGFC: "default"
+
+# Template for build jobs (hidden)
+.build:
+  stage: build
+  before_script:
+    - apt-get update -qq && apt-get install -y -qq build-essential git python curl p7zip-full
+    - python .ci/cue.py prepare
+  script:
+    - python .ci/cue.py build
+    - python .ci/cue.py test
+    - python .ci/cue.py test-results
+
+# Build on Linux using default gcc for Base branches 7.0 and 3.15
+
+gcc_base_7_0:
+  extends: .build
+  variables:
+    BASE: "7.0"
+
+gcc_base_3_15:
+  extends: .build
+  variables:
+    BASE: "3.15"

gitlab/README.md

@@ -0,0 +1,69 @@
+# GitLab CI/CD Scripts for EPICS Modules
+
+## Features
+
+ - Docker-based runners on Linux (one VM instance per job)
+ - Can use any Docker image from Dockerhub (the examples use
+  `ubuntu:bionic`)
+ - Compile natively using different compilers (gcc, clang)
+ - Cross-compile for Windows 32bit and 64bit using MinGW and WINE
+ - Cross-compile for RTEMS 4.9 and 4.10 (pc386, Base >= 3.15)
+ - Cross-compile for RTEMS 5 (10 BSPs, Base >= 7.0.5.1)
+ - Built dependencies are cached (for faster builds).
+
+## How to Use these Scripts
+
+ 1. Get an account on [GitLab](https://gitlab.com/), create a project
+    for your support module and have it mirror your upstream GitHub
+    repository. For more details, please refer to the
+    [GitLab CI/CD documentation](https://docs.gitlab.com/ee/README.html).
+    
+    (This applies when using the free tier offered to open source
+    projects. Things will be different using an "Enterprise"
+    installation on customer hardware.)
+
+ 2. Add the ci-scripts respository as a Git Submodule
+    (see [README](../README.md) one level above).
+
+ 3. Add settings files defining which dependencies in which versions
+    you want to build against
+    (see [README](../README.md) one level above).
+
+ 4. Create a GitLab configuration by copying one of the examples into
+    the root directory of your module.
+    ```
+    $ cp .ci/gitlab/.gitlab-ci.yml.example-full .gitlab-ci.yml
+    ```
+	
+ 5. Edit the `.gitlab-ci.yml` configuration to include the jobs you want
+    GitLab CI/CD to run.
+
+    Build jobs are declared in the list at the end of the file.
+    Each element (starting with the un-indented line) defines the
+    settings for one build job. `extends:` specifies a template to use as
+    a default structure, `variables:` controls the setting of environment
+    variables (overwriting settings from the template).
+    Also see the comments in the examples for more hints, and the
+    [GitLab CI/CD documentation](https://docs.gitlab.com/ee/README.html)
+    for more options and details.
+	
+ 6. Push your changes to GitHub, wait for the synchronization (every 5min)
+    and check [GitLab](https://gitlab.com/) for your build results.
+
+## Caches
+
+GitLab is configured to keep the caches separate for different jobs.
+
+However, changing the job description (in the `.gitlab-ci.yml` 
+configuration file) or its environment settings or changing a value
+inside a setup file will _not_ invalidate the cache - you will
+have to manually delete the caches through the GitLab web interface.
+
+Caches are automatically removed after approx. four weeks.
+Your jobs will have to rebuild them once in a while.
+
+## Miscellanea
+
+To use the feature to extract `.zip`/`.7z` archives by setting
+`*_HOOK` variables, the Linux and MacOS runners need the APT package
+`p7zip-full` resp. the Homebrew package `p7zip` installed.

synApps-6.0.set

@@ -0,0 +1,43 @@
+# Release tags for synApps modules as per synApps-6.0
+# see https://github.com/EPICS-synApps/support/blob/21f7fcd0f33cef5d34aacbd4e33511b43398a6dc/assemble_synApps.sh
+# also for additional configuration that could be done in hook scripts
+
+ALLENBRADLEY=2.3
+ALIVE=R1-1-0
+AREA_DETECTOR=R3-3-1
+ASYN=R4-33
+AUTOSAVE=R5-9
+BUSY=R1-7
+CALC=R3-7-1
+CAMAC=R2-7-1
+CAPUTRECORDER=R1-7-1
+DAC128V=R2-9
+DELAYGEN=R1-2-0
+DXP=R5-0
+DXPSITORO=R1-1
+DEVIOCSTATS=3.1.15
+#GALIL=V3-6
+IP=R2-19-1
+IPAC=2.15
+IP330=R2-9
+IPUNIDIG=R2-11
+LOVE=R3-2-6
+LUA=R1-2-2
+MCA=R7-7
+MEASCOMP=R2-1
+MODBUS=R2-11
+MOTOR=R6-10-1
+OPTICS=R2-13-1
+QUADEM=R9-1
+SNCSEQ=2.2.5
+SOFTGLUE=R2-8-1
+SOFTGLUEZYNQ=R2-0-1
+SSCAN=R2-11-1
+STD=R3-5
+STREAM=R2-7-7c
+VAC=R1-7
+VME=R2-9
+YOKOGAWA_DAS=R1-0-0
+XXX=R6-0
+
+include synApps-common

synApps-6.1.set

@@ -0,0 +1,44 @@
+# Release tags for synApps modules as per synApps-6.1
+# see https://github.com/EPICS-synApps/support/blob/cc5adba5b8848c9cb98ab96768d668ae927d8859/assemble_synApps.sh
+# also for additional configuration that could be done in hook scripts
+
+#ALLENBRADLEY=2.3
+ALIVE=R1-1-1
+AREA_DETECTOR=R3-7
+ASYN=R4-36
+AUTOSAVE=R5-10
+BUSY=R1-7-2
+CALC=R3-7-3
+CAMAC=R2-7-1
+CAPUTRECORDER=R1-7-2
+DAC128V=R2-9
+DELAYGEN=R1-2-1
+DXP=R6-0
+DXPSITORO=R1-2
+DEVIOCSTATS=3.1.16
+#ETHERIP=ether_ip-3-1
+#GALIL=V3-6
+IP=R2-20-1
+IPAC=2.15
+IP330=R2-9
+IPUNIDIG=R2-11
+LOVE=R3-2-7
+LUA=R2-0
+MCA=R7-8
+MEASCOMP=R2-3
+MODBUS=R3-0
+MOTOR=R7-1
+OPTICS=R2-13-3
+QUADEM=R9-2-1
+SNCSEQ=2.2.6
+SOFTGLUE=R2-8-2
+SOFTGLUEZYNQ=R2-0-2
+SSCAN=R2-11-3
+STD=R3-6
+STREAM=2.8.9
+VAC=R1-9
+VME=R2-9-2
+YOKOGAWA_DAS=R2-0-1
+XXX=R6-1
+
+include synApps-common

synApps-common.set

@@ -0,0 +1,7 @@
+# Common settings for all synApps releases
+
+DEVIOCSTATS_REPONAME=iocStats
+ETHERIP_REPOOWNER=EPICSTools
+GALIL_REPOOWNER=motorapp
+GALIL_REPONAME=Galil-3-0
+AREADETECTOR_REPOOWNER=areaDetector

test.patch

@@ -0,0 +1,14 @@
+diff -ruN a/bla.txt b/bla.txt
+--- a/bla.txt	2020-06-19 18:54:43.129076711 +0200
++++ b/bla.txt	2020-06-19 18:55:05.093948316 +0200
+@@ -1,3 +1,3 @@
+-LINE1=YES
++LINE1=NO
+ LINE2=NO
+ 
+diff -ruN a/dd/new.txt b/dd/new.txt
+--- a/dd/new.txt	1970-01-01 01:00:00.000000000 +0100
++++ b/dd/new.txt	2020-06-19 18:55:35.255032413 +0200
+@@ -0,0 +1,2 @@
++NEW LINE 1
++NEW LINE 2

test01.set

@@ -1,4 +1,4 @@
 MODULES="sncseq"
 
 BASE=7.0
-SNCSEQ=R2-2-7
+SNCSEQ=R2-2-8

travis-test.sh

@@ -5,6 +5,18 @@
 # SET=test00 in .travis.yml runs the tests in this script
 # all other jobs are started as compile jobs
 
+# The following if clause can be removed for ci-scripts major version 3
+if [ "$TRAVIS_OS_NAME" == osx -a "$BASH_VERSINFO" -lt 4 ]
+then
+    brew install bash
+    if [ $(/usr/local/bin/bash -c 'echo $BASH_VERSINFO') -lt 4 ]
+    then
+        echo "Failed to install a recent bash" >&2
+        exit 1
+    fi
+    exec /usr/local/bin/bash $0 "$@"
+fi
+
 # Set VV empty in .travis.yml to make scripts terse
 [ "${VV:-1}" ] && set -x
 
@@ -16,8 +28,8 @@ UTILS_UNITTEST=1
 readlinkf() { perl -MCwd -e 'print Cwd::abs_path shift' "$1"; }
 
 # test utilities
-die() {
+fail() {
-  echo "${ANSI_RED}$1${ANSI_RESET}"
+  echo -e "${ANSI_RED}$1${ANSI_RESET}"
   exit 1
 }
 
@@ -39,66 +51,68 @@ SETUP_DIRS=${SETUP_PATH//:/ }
 
 SCRIPTDIR=$(dirname $(readlinkf $0))/travis
 CURDIR="$PWD"
-CACHEDIR="$HOME/.cache"
+CACHEDIR=${CACHEDIR:-${HOME}/.cache}
+[ -e ${CACHEDIR} ] || mkdir -p ${CACHEDIR}
 
 echo "Testing contents of utils.sh"
 
-[ -d "$SCRIPTDIR" ] || die "SCRIPTDIR does not exist"
+[ -d "$SCRIPTDIR" ] || fail "SCRIPTDIR does not exist"
-[ -e "$SCRIPTDIR/utils.sh" ] || die "SCRIPTDIR/utils.sh does not exist"
+[ -e "$SCRIPTDIR/utils.sh" ] || fail "SCRIPTDIR/utils.sh does not exist"
 
 # source functions
 . $SCRIPTDIR/utils.sh
 
 # check for functions
-fn_exists fold_start || die "function fold_start missing from SCRIPTDIR/utils.sh"
+fn_exists fold_start || fail "function fold_start missing from SCRIPTDIR/utils.sh"
-fn_exists fold_end || die "function fold_end missing from SCRIPTDIR/utils.sh"
+fn_exists fold_end || fail "function fold_end missing from SCRIPTDIR/utils.sh"
-fn_exists source_set || die "function source_set missing from SCRIPTDIR/utils.sh"
+fn_exists source_set || fail "function source_set missing from SCRIPTDIR/utils.sh"
-fn_exists update_release_local || die "function update_release_local missing from SCRIPTDIR/utils.sh"
+fn_exists update_release_local || fail "function update_release_local missing from SCRIPTDIR/utils.sh"
-fn_exists add_dependency || die "function add_dependency missing from SCRIPTDIR/utils.sh"
+fn_exists add_dependency || fail "function add_dependency missing from SCRIPTDIR/utils.sh"
 
 # test source_set()
 ######################################################################
 
-SETUP_DIRS= source_set test01 | grep -q "(SETUP_PATH) is empty" || die "empty search path not detected"
+SETUP_PATH= source_set test01 | grep -q "(SETUP_PATH) is empty" || fail "empty search path not detected"
-source_set xxdoesnotexistxx | grep -q "does not exist" || die "missing setup file not detected"
+source_set xxdoesnotexistxx | grep -q "does not exist" || fail "missing setup file not detected"
-source_set test01 | grep -q "Loading setup file" || die "test01 setup file not found"
+source_set test01 | grep -q "Loading setup file" || fail "test01 setup file not found"
 unset SEEN_SETUPS
 export BASE=foo
 source_set test01
-[ "$BASE" = "foo" ] || die "preset module BASE version does not override test01 setup file (expected foo got $BASE)"
+[ "$BASE" = "foo" ] || fail "preset module BASE version does not override test01 setup file (expected foo got $BASE)"
 unset SEEN_SETUPS
 BASE=
 source_set test02
-[ "$BASE" = "foo" ] || die "BASE set in test02 does not override included test01 setup file (expected foo got $BASE)"
+[ "$BASE" = "foo" ] || fail "BASE set in test02 does not override included test01 setup file (expected foo got $BASE)"
-[ "$FOO" = "bar" ] || die "Setting of single word does not work"
+[ "$FOO" = "bar" ] || fail "Setting of single word does not work"
-[ "$FOO2" = "bar bar2" ] || die "Setting of multiple words does not work"
+[ "$FOO2" = "bar bar2" ] || fail "Setting of multiple words does not work"
-[ "$FOO3" = "bar bar2" ] || die "Indented setting of multiple words does not work"
+[ "$FOO3" = "bar bar2" ] || fail "Indented setting of multiple words does not work"
-[ "$SNCSEQ" = "R2-2-7" ] || die "Setup test01 was not included"
+[ "$SNCSEQ" = "R2-2-7" ] || fail "Setup test01 was not included"
 unset SEEN_SETUPS
-source_set test03 | grep -q "Ignoring already included setup file" || die "test01 setup file included twice"
+source_set test03 | grep -q "Ignoring already included setup file" || fail "test01 setup file included twice"
 
 # test default settings file
 ######################################################################
 
 echo "Testing default settings for completeness and valid git repo settings"
 
-[ -e ./defaults.set ] || die "defaults.set does not exist"
+[ -e ./defaults.set ] || fail "defaults.set does not exist"
 source_set defaults
 
-repo_exists BASE || die "Defaults for BASE do not point to a valid git repository at $repourl"
+repo_exists BASE || fail "Defaults for BASE do not point to a valid git repository at $repourl"
-repo_exists PVDATA || die "Defaults for PVDATA do not point to a valid git repository at $repourl"
+repo_exists PVDATA || fail "Defaults for PVDATA do not point to a valid git repository at $repourl"
-repo_exists PVACCESS || die "Defaults for PVACCESS do not point to a valid git repository at $repourl"
+repo_exists PVACCESS || fail "Defaults for PVACCESS do not point to a valid git repository at $repourl"
-repo_exists NTYPES || die "Defaults for NTYPES do not point to a valid git repository at $repourl"
+repo_exists NTYPES || fail "Defaults for NTYPES do not point to a valid git repository at $repourl"
-repo_exists SNCSEQ || die "Defaults for SNCSEQ do not point to a valid git repository at $repourl"
+repo_exists SNCSEQ || fail "Defaults for SNCSEQ do not point to a valid git repository at $repourl"
-repo_exists STREAM || die "Defaults for STREAM do not point to a valid git repository at $repourl"
+repo_exists STREAM || fail "Defaults for STREAM do not point to a valid git repository at $repourl"
-repo_exists ASYN || die "Defaults for STREAM do not point to a valid git repository at $repourl"
+repo_exists ASYN || fail "Defaults for ASYN do not point to a valid git repository at $repourl"
-repo_exists STD || die "Defaults for STD do not point to a valid git repository at $repourl"
+repo_exists STD || fail "Defaults for STD do not point to a valid git repository at $repourl"
-repo_exists CALC || die "Defaults for CALC do not point to a valid git repository at $repourl"
+repo_exists CALC || fail "Defaults for CALC do not point to a valid git repository at $repourl"
-repo_exists AUTOSAVE || die "Defaults for AUTOSAVE do not point to a valid git repository at $repourl"
+repo_exists AUTOSAVE || fail "Defaults for AUTOSAVE do not point to a valid git repository at $repourl"
-repo_exists BUSY || die "Defaults for BUSY do not point to a valid git repository at $repourl"
+repo_exists BUSY || fail "Defaults for BUSY do not point to a valid git repository at $repourl"
-repo_exists SSCAN || die "Defaults for SSCAN do not point to a valid git repository at $repourl"
+repo_exists SSCAN || fail "Defaults for SSCAN do not point to a valid git repository at $repourl"
-repo_exists IOCSTATS || die "Defaults for IOCSTATS do not point to a valid git repository at $repourl"
+repo_exists IOCSTATS || fail "Defaults for IOCSTATS do not point to a valid git repository at $repourl"
-repo_exists MOTOR || die "Defaults for MOTOR do not point to a valid git repository at $repourl"
+repo_exists MOTOR || fail "Defaults for MOTOR do not point to a valid git repository at $repourl"
+repo_exists IPAC || fail "Defaults for IPAC do not point to a valid git repository at $repourl"
 
 # test update_release_local()
 ######################################################################
@@ -112,34 +126,34 @@ rm -f $release_local
 # Set a module
 update_release_local MOD1 /tmp/mod1
 updated_line="MOD1=/tmp/mod1"
-grep -q "MOD1=" $release_local || die "Line for MOD1 not added to RELEASE.local"
+grep -q "MOD1=" $release_local || fail "Line for MOD1 not added to RELEASE.local"
 existing_line=$(grep "MOD1=" $release_local)
-[ "${existing_line}" = "${updated_line}" ] || die "Wrong line for MOD1 in RELEASE.local (expected=\"$updated_line\" found=\"$existing_line\")"
+[ "${existing_line}" = "${updated_line}" ] || fail "Wrong line for MOD1 in RELEASE.local (expected=\"$updated_line\" found=\"$existing_line\")"
 
 # Set base
 update_release_local EPICS_BASE /tmp/base
 updated_line="EPICS_BASE=/tmp/base"
-grep -q "EPICS_BASE=" $release_local || die "Line for EPICS_BASE not added to RELEASE.local"
+grep -q "EPICS_BASE=" $release_local || fail "Line for EPICS_BASE not added to RELEASE.local"
 
 # Set another module
 update_release_local MOD2 /tmp/mod2
 updated_line="MOD2=/tmp/mod2"
-grep -q "MOD2=" $release_local || die "Line for MOD2 not added to RELEASE.local"
+grep -q "MOD2=" $release_local || fail "Line for MOD2 not added to RELEASE.local"
 existing_line=$(grep "MOD2=" $release_local)
-[ "${existing_line}" = "${updated_line}" ] || die "Wrong line for MOD2 in RELEASE.local (expected=\"$updated_line\" found=\"$existing_line\")"
+[ "${existing_line}" = "${updated_line}" ] || fail "Wrong line for MOD2 in RELEASE.local (expected=\"$updated_line\" found=\"$existing_line\")"
-tail -n 1 $release_local | grep -q "EPICS_BASE=" || die "Line for EPICS_BASE not moved to the end of RELEASE.local"
+tail -n 1 $release_local | grep -q "EPICS_BASE=" || fail "Line for EPICS_BASE not moved to the end of RELEASE.local"
 
 # Update a module
 update_release_local MOD1 /tmp/mod1b
 updated_line="MOD1=/tmp/mod1b"
-grep -q "MOD1=" $release_local || die "Line for MOD1 not present in RELEASE.local"
+grep -q "MOD1=" $release_local || fail "Line for MOD1 not present in RELEASE.local"
 existing_line=$(grep "MOD1=" $release_local)
-[ "${existing_line}" = "${updated_line}" ] || die "Wrong line for MOD1 in RELEASE.local (expected=\"$updated_line\" found=\"$existing_line\")"
+[ "${existing_line}" = "${updated_line}" ] || fail "Wrong line for MOD1 in RELEASE.local (expected=\"$updated_line\" found=\"$existing_line\")"
-head -n 1 $release_local | grep -q "MOD1=" || die "Line for MOD1 not at the top of RELEASE.local"
+head -n 1 $release_local | grep -q "MOD1=" || fail "Line for MOD1 not at the top of RELEASE.local"
-tail -n 1 $release_local | grep -q "EPICS_BASE=" || die "Line for EPICS_BASE not moved to the end of RELEASE.local"
+tail -n 1 $release_local | grep -q "EPICS_BASE=" || fail "Line for EPICS_BASE not moved to the end of RELEASE.local"
 
 # Check that RELEASE.local only contains variable settings
-[ $(grep -v -c '[^ =]*=.*' $release_local) -ne 0 ] && die "RELEASE.local contains invalid lines"
+[ $(grep -v -c '[^ =]*=.*' $release_local) -ne 0 ] && fail "RELEASE.local contains invalid lines"
 
 rm -f $release_local
 
@@ -154,30 +168,65 @@ location=$CACHEDIR/base-R3.15.6
 # CAREFUL: order of the following check matters (speeds up the test)
 
 # dependency does not exist in the cache
-rm -fr $location
+rm -fr $location; modules_to_compile=
 add_dependency BASE R3.15.6
-[ -e $location/LICENSE ] || die "Missing dependency was not checked out"
+[ -e $location/LICENSE ] || fail "Missing dependency was not checked out"
 BUILT=$(cat "$location/built")
-[ "$BUILT" != "$hash_3_15_6" ] && die "Wrong commit of dependency checked out (expected=\"$hash_3_15_6\" found=\"$BUILT\")"
+[ "$BUILT" != "$hash_3_15_6" ] && fail "Wrong commit of dependency checked out (expected=\"$hash_3_15_6\" found=\"$BUILT\")"
-grep -q "include \$(TOP)/../RELEASE.local" $location/configure/RELEASE && die "RELEASE in Base includes RELEASE.local"
+grep -q "include \$(TOP)/../RELEASE.local" $location/configure/RELEASE && fail "RELEASE in Base includes RELEASE.local"
+[ "$do_recompile" ] || fail "do_recompile flag was not set for missing dependency"
+echo "$modules_to_compile" | grep -q "$location" || fail "Missing dependency was not set to compile"
 
 # up-to-date dependency does exist in the cache
 ( cd $CACHEDIR; git clone --quiet --depth 5 --recursive --branch R3.15.6 https://github.com/epics-base/epics-base.git base-R3.15.6 )
 rm -f $location/LICENSE
+unset do_recompile; modules_to_compile=
 add_dependency BASE R3.15.6
-[ -e $location/LICENSE ] && die "Existing correct dependency was checked out on top"
+[ -e $location/LICENSE ] && fail "Existing correct dependency was checked out on top"
+[ "$do_recompile" ] && fail "do_recompile flag was set for up-to-date dependency"
+echo "$modules_to_compile" | grep -q "$location" && fail "Up-to-date dependency was set to compile"
+
+do_recompile=yes
+add_dependency BASE R3.15.6
+echo "$modules_to_compile" | grep -q "$location" || fail "Up-to-date module was not set to compile wile do_recompile=yes"
 
 # dependency in the cache is outdated
 echo "nottherighthash" > "$location/built"
+unset do_recompile
 add_dependency BASE R3.15.6
-[ -e $location/LICENSE ] || die "Outdated dependency was not checked out"
+[ -e $location/LICENSE ] || fail "Outdated dependency was not checked out"
 BUILT=$(cat "$location/built")
-[ "$BUILT" != "$hash_3_15_6" ] && die "Wrong commit of dependency checked out (expected=\"$hash_3_15_6\" found=\"$BUILT\")"
+[ "$BUILT" != "$hash_3_15_6" ] && fail "Wrong commit of dependency checked out (expected=\"$hash_3_15_6\" found=\"$BUILT\")"
+[ "$do_recompile" ] || fail "do_recompile flag was not set for outdated dependency"
+echo "$modules_to_compile" | grep -q "$location" || fail "Outdated dependency was not set to compile"
 
-rm -fr $location
+# msi is automatically added to 3.14
+rm -fr $location; modules_to_compile=
+location=$CACHEDIR/base-R3.14.12.1
+rm -fr $location;
+add_dependency BASE R3.14.12.1
+[ -e $location/src/dbtools/msi.c ] || fail "MSI was not added to Base 3.14"
+
+rm -fr $CACHEDIR/*; modules_to_compile=
 
 # missing inclusion of RELEASE.local in configure/RELEASE
 location=$CACHEDIR/std-R3-4
 add_dependency STD R3-4
-grep -q "include \$(TOP)/../RELEASE.local" $location/configure/RELEASE || die "Inclusion of RELEASE.local not added to configure/RELEASE"
+grep -q "include \$(TOP)/../RELEASE.local" $location/configure/RELEASE || fail "Inclusion of RELEASE.local not added to configure/RELEASE"
-rm -fr $location
+rm -fr $location; modules_to_compile=
+
+# correct handling of FOO_RECURSIVE setting (https://github.com/epics-base/ci-scripts/issues/25 regression)
+export SSCAN_RECURSIVE=NO
+add_dependency SSCAN master
+add_dependency ASYN master
+[ -e $CACHEDIR/sscan-master/.ci/README.md ] && fail "Sscan was checked out recursively despite SSCAN_RECURSIVE=NO"
+[ -e $CACHEDIR/asyn-master/.ci/README.md ] || fail "Asyn was not checked out recursively"
+rm -fr $CACHEDIR/*; modules_to_compile=
+
+unset SSCAN_RECURSIVE
+export ASYN_RECURSIVE=NO
+add_dependency SSCAN master
+add_dependency ASYN master
+[ -e $CACHEDIR/sscan-master/.ci/README.md ] || fail "Sscan was not checked out recursively"
+[ -e $CACHEDIR/asyn-master/.ci/README.md ] && fail "Asyn was checked out recursively despite ASYN_RECURSIVE=NO"
+rm -fr $CACHEDIR/*

travis/.travis.yml.example-full

@@ -5,7 +5,7 @@
 
 language: cpp
 compiler: gcc
-dist: xenial
+dist: bionic
 
 cache:
   directories:
@@ -14,6 +14,8 @@ cache:
 env:
   global:
     - SETUP_PATH=.ci-local:.ci
+    # for the sequencer on Windows
+    - CHOCO=re2c
 
 addons:
   apt:
@@ -29,19 +31,22 @@ addons:
     - g++-mingw-w64-x86-64
     # for RTEMS cross builds
     - qemu-system-x86
+    # for .zip/.7z archive hooks
+    - p7zip-full
   homebrew:
     packages:
-    # for all EPICS builds
-    - bash
     # for the sequencer
     - re2c
-    update: true
+    # for .zip/.7z archive hooks
+    - p7zip
 
 install:
-  - ./.ci/travis/prepare.sh
+  - python .ci/cue.py prepare
 
 script:
-  - ./.ci/travis/build.sh
+  - python .ci/cue.py build
+  - python .ci/cue.py test
+  - python .ci/cue.py test-results
 
 # If you need to do more during install and build,
 # add a local directory to your module and do e.g.
@@ -50,18 +55,22 @@ script:
 # Define build jobs
 
 # Well-known variables to use
-# SET      source setup file
+# SET         source setup file
-# EXTRA    content will be added to make command line
+# ADD_MODULES extra modules (for a specific job)
-# STATIC   set to YES for static build (default: NO)
+# BCFG        build configuration (static/debug/static-debug;
-# TEST     set to NO to skip running the tests (default: YES)
+#             default: shared-optimized)
-# VV       set to make build scripts verbose (default: unset)
+# TEST        set to NO to skip running the tests (default: YES)
+# VV          set to make build scripts verbose (default: unset)
+# EXTRA       content will be added to make command line
+# EXTRA1..5   more additional arguments for the make command
+#             (one argument per variable)
 
 # Usually from setup files, but may be specified or overridden
 #  on a job line
-# MODULES  list of dependency modules
+# MODULES     list of dependency modules
-# BASE     branch or release tag name of the EPICS Base to use
+# BASE        branch or release tag name of the EPICS Base to use
-# <MODULE> branch or release tag for a specific module
+# <MODULE>    branch or release tag for a specific module
-# ...      see README for setup file syntax description
+# ...         see README for setup file syntax description
 
 jobs:
   include:
@@ -73,7 +82,7 @@ jobs:
   - env: BASE=7.0
     compiler: clang
 
-  - env: BASE=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
+  - env: BASE=7.0
 
   - env: BASE=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
     compiler: clang
@@ -86,19 +95,20 @@ jobs:
   - env: BASE=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
     dist: trusty
 
-# Cross-compilations to Windows using MinGW and WINE
+# Cross-compilations to Windows using gcc/MinGW and WINE
-    
-  - env: BASE=7.0 WINE=32 TEST=NO STATIC=YES
-    compiler: mingw
 
-  - env: BASE=7.0 WINE=64 TEST=NO STATIC=NO
+  - env: BASE=7.0 WINE=32 TEST=NO BCFG=static
-    compiler: mingw
+
+  - env: BASE=7.0 WINE=64 TEST=NO
 
 # Cross-compilation to RTEMS
 
-  - env: BASE=7.0 RTEMS=4.10 TEST=NO
+  - env: BASE=7.0 RTEMS=4.10 APT=usrmerge
 
-  - env: BASE=7.0 RTEMS=4.9 TEST=NO
+  - env: BASE=7.0 RTEMS=4.9 APT=usrmerge
+
+  - env: BASE=7.0 RTEMS=5 RTEMS_TARGET=RTEMS-pc686-qemu
+    dist: focal
 
 # Other gcc versions (added as an extra package)
 
@@ -114,4 +124,14 @@ jobs:
 
   - env: BASE=7.0
     os: osx
+    osx_image: xcode11.3
     compiler: clang
+
+# Windows builds
+
+  - env: BASE=7.0
+    os: windows
+    compiler: vs2017
+
+  - env: BASE=7.0
+    os: windows

travis/.travis.yml.example-mini

@@ -3,7 +3,7 @@
 
 language: cpp
 compiler: gcc
-dist: xenial
+dist: bionic
 
 # Minimal set of packages needed to compile EPICS Base
 
@@ -15,12 +15,14 @@ addons:
     - perl
 
 install:
-  - ./.ci/travis/prepare.sh
+  - python .ci/cue.py prepare
 
 script:
-  - ./.ci/travis/build.sh
+  - python .ci/cue.py build
+  - python .ci/cue.py test
+  - python .ci/cue.py test-results
 
-# Build using default gcc for Base branches 7.0 and 3.15
+# Build on Linux using default gcc for Base branches 7.0 and 3.15
 
 jobs:
   include:

travis/Add-RTEMS-pc368-qemu-target.patch

@@ -1,77 +0,0 @@
-From 00ee7bf7d3618c748491c88742c011a8353abeba Mon Sep 17 00:00:00 2001
-From: Andrew Johnson <anj@anl.gov>
-Date: Wed, 24 Oct 2018 14:27:15 -0500
-Subject: [PATCH] Add RTEMS-pc368-qemu target, use in Travis-CI builds
-
----
- configure/os/CONFIG.Common.RTEMS-pc386-qemu      | 11 +++++++++++
- configure/os/CONFIG_SITE.Common.RTEMS-pc386      |  5 -----
- configure/os/CONFIG_SITE.Common.RTEMS-pc386-qemu |  9 +++++++++
- src/libCom/RTEMS/Makefile                        |  2 +-
- src/tools/makeTestfile.pl                        |  2 +-
- 6 files changed, 24 insertions(+), 10 deletions(-)
- create mode 100644 configure/os/CONFIG.Common.RTEMS-pc386-qemu
- delete mode 100644 configure/os/CONFIG_SITE.Common.RTEMS-pc386
- create mode 100644 configure/os/CONFIG_SITE.Common.RTEMS-pc386-qemu
-
-diff --git a/configure/os/CONFIG.Common.RTEMS-pc386-qemu b/configure/os/CONFIG.Common.RTEMS-pc386-qemu
-new file mode 100644
-index 000000000..684f01a19
---- /dev/null
-+++ b/configure/os/CONFIG.Common.RTEMS-pc386-qemu
-@@ -0,0 +1,11 @@
-+# CONFIG.Common.RTEMS-pc386-qemu
-+#
-+# Definitions for the RTEMS-pc386-qemu target
-+# Site-specific overrides go in CONFIG_SITE.Common.RTEMS-pc386-qemu
-+#
-+#-------------------------------------------------------
-+
-+# Include definitions from RTEMS-pc386
-+include $(CONFIG)/os/CONFIG.Common.RTEMS-pc386
-+
-+RTEMS_QEMU_FIXUPS = YES
-diff --git a/configure/os/CONFIG_SITE.Common.RTEMS-pc386-qemu b/configure/os/CONFIG_SITE.Common.RTEMS-pc386-qemu
-new file mode 100644
-index 000000000..027dcf4ab
---- /dev/null
-+++ b/configure/os/CONFIG_SITE.Common.RTEMS-pc386-qemu
-@@ -0,0 +1,9 @@
-+# CONFIG_SITE.Common.RTEMS-pc386-qemu
-+#
-+# Site-specific overrides for the RTEMS-pc386-qemu target
-+#
-+
-+# If you're building this architecture you _probably_ want to
-+# run the tests for it under QEMU, but if not you can turn
-+# them off here by commenting out this line:
-+CROSS_COMPILER_RUNTEST_ARCHS += RTEMS-pc386-qemu
-diff --git a/src/libCom/RTEMS/Makefile b/src/libCom/RTEMS/Makefile
-index 2f12b7bf0..22a92733c 100644
---- a/src/libCom/RTEMS/Makefile
-+++ b/src/libCom/RTEMS/Makefile
-@@ -24,7 +24,7 @@ rtemsCom_SRCS += epicsRtemsInitHookPre.c
- rtemsCom_SRCS += epicsRtemsInitHookPost.c
- rtemsCom_SRCS += epicsMemFs.c
- 
--ifeq ($(T_A),RTEMS-pc386)
-+ifeq ($(RTEMS_BSP),pc386)
- rtemsCom_SRCS += ne2kpci.c
- endif
- 
-diff --git a/src/tools/makeTestfile.pl b/src/tools/makeTestfile.pl
-index 73f522034..fb431fe7a 100644
---- a/src/tools/makeTestfile.pl
-+++ b/src/tools/makeTestfile.pl
-@@ -37,7 +37,7 @@ if( $TA =~ /^win32-x86/ && $HA !~ /^win/ ) {
-   $exec = "wine64 $exe";
- 
- # Run pc386 test harness w/ QEMU
--} elsif( $TA =~ /^RTEMS-pc386$/ ) {
-+} elsif( $TA =~ /^RTEMS-pc386-qemu$/ ) {
-   $exec = "qemu-system-i386 -m 64 -no-reboot -serial stdio -display none -net nic,model=ne2k_pci -net user,restrict=yes -kernel $exe";
- 
- # Explicitly fail for other RTEMS targets
--- 
-2.21.0.windows.1
-

travis/README.md

@@ -2,12 +2,16 @@
 
 ## Features
 
+ - Two parallel runners on Linux/Windows (two runners on MacOS)
+ - Ubuntu 14/16/18/20, MacOS 10.13/14/15, Windows Server v1809
  - Use different compilers (gcc, clang)
  - Use different gcc versions
  - Cross-compile for Windows 32bit and 64bit using MinGW and WINE
- - Cross-compile for RTEMS 4.9 and 4.10
+ - Cross-compile for RTEMS 4.9 and 4.10 (pc386, Base >= 3.15)
- - Compile on MacOS
+ - Cross-compile for RTEMS 5 (10 BSPs, Base >= 7.0.5.1)
- - Released versions of dependencies are cached (for faster builds)
+ - Compile natively on MacOS (clang)
+ - Compile natively on Windows (gcc/MinGW, Visual Studio 2017)
+ - Built dependencies are cached (for faster builds).
 
 ## How to Use these Scripts
 
@@ -16,6 +20,10 @@
     repository. For more details, please refer to the
     [Travis-CI Tutorial](https://docs.travis-ci.com/user/tutorial/).
     Make sure to use `travis-ci.org` and not their `.com` site.
+    
+    (This applies when using the free tier offered to open source
+    projects. Things will be different using an "Enterprise"
+    installation on customer hardware.)
 
  2. Add the ci-scripts respository as a Git Submodule
     (see [README](../README.md) one level above).
@@ -34,7 +42,7 @@
     Travis to run.
 
     Build jobs are declared in the list following the `jobs: include:`
-    declaration. Each element (starting with `-` in column 3) defines the
+    declaration. Each element (starting with a dash) defines the
     settings for one build job. `env:` controls the setting of environment
     variables,`dist:` specifies the Linux distribution,
     `os:` the operating system.
@@ -43,3 +51,24 @@
 	
  6. Push your changes and check
     [travis-ci.org](https://travis-ci.org/) for your build results.
+
+## Caches
+
+Travis keeps the caches separate for different jobs. As soon as the job
+description (in the `.travis.yml` configuration file) or its environment
+settings change (adding a space character is enough), the cache is different
+and will be rebuilt when the job runs.
+
+This also means that changing a value inside a setup file will _not_
+invalidate the cache - in that case you will have to manually delete the cache
+through the Travis web interface. (Or add a space character in the job
+configuration.)
+
+Caches are automatically removed after approx. four weeks.
+Your jobs will have to rebuild them once in a while.
+
+## Miscellanea
+
+To use the feature to extract `.zip`/`.7z` archives by setting
+`*_HOOK` variables, the Linux and MacOS runners need the APT package
+`p7zip-full` resp. the Homebrew package `p7zip` installed.

travis/build.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-set -e
-
-# Set VV in .travis.yml to make scripts verbose
-[ "$VV" ] && set -x
-
-CACHEDIR="$HOME/.cache"
-
-eval $(grep "EPICS_BASE=" ${CACHEDIR}/RELEASE.local)
-export EPICS_BASE
-
-[ -z "$EPICS_HOST_ARCH" -a -f $EPICS_BASE/src/tools/EpicsHostArch.pl ] && EPICS_HOST_ARCH=$(perl $EPICS_BASE/src/tools/EpicsHostArch.pl)
-[ -z "$EPICS_HOST_ARCH" -a -f $EPICS_BASE/startup/EpicsHostArch.pl ] && EPICS_HOST_ARCH=$(perl $EPICS_BASE/startup/EpicsHostArch.pl)
-export EPICS_HOST_ARCH
-
-make -j2 $EXTRA
-
-if [ "$TEST" != "NO" ]
-then
-  make tapfiles
-  make -s test-results
-fi

travis/prepare.sh

@@ -1,216 +0,0 @@
-#!/bin/bash
-set -e
-
-# The following if clause can be removed for ci-scripts major version 3
-if [ "$TRAVIS_OS_NAME" == osx -a "$BASH_VERSINFO" -lt 4 ]
-then
-    brew install bash
-    if [ $(/usr/local/bin/bash -c 'echo $BASH_VERSINFO') -lt 4 ]
-    then
-        echo "Failed to install a recent bash" >&2
-        exit 1
-    fi
-    exec /usr/local/bin/bash $0 "$@"
-fi
-
-# Set VV in .travis.yml to make scripts verbose
-[ "$VV" ] && set -x
-
-# Perl version of "readlink -f" (which MacOS does not provide)
-readlinkf() { perl -MCwd -e 'print Cwd::abs_path shift' "$1"; }
-
-SCRIPTDIR=$(dirname $(readlinkf $0))
-CURDIR="$PWD"
-CACHEDIR="$HOME/.cache"
-
-# source functions
-. $SCRIPTDIR/utils.sh
-
-echo -e "${ANSI_YELLOW}Using bash version $BASH_VERSION${ANSI_RESET}"
-
-# Load settings
-# -------------
-
-fold_start load.settings "Loading settings"
-
-# load default settings for well-known modules
-source_set defaults
-
-# source configured settings
-[ -z "${SET+x}" ] || source_set $SET
-
-fold_end load.settings
-
-# Check out dependencies
-# ----------------------
-
-fold_start check.out.dependencies "Checking/cloning dependencies"
-
-for mod in BASE $MODULES
-do
-  mod_uc=${mod^^}
-  eval add_dependency $mod_uc \${${mod_uc}:=master}
-done
-[ -e ./configure ] && cp ${CACHEDIR}/RELEASE.local ./configure/RELEASE.local
-
-fold_end check.out.dependencies
-
-# Set up compiler
-# ---------------
-
-fold_start set.up.epics_build "Setting up EPICS build system"
-
-eval $(grep "EPICS_BASE=" ${CACHEDIR}/RELEASE.local)
-export EPICS_BASE
-echo "EPICS_BASE=$EPICS_BASE"
-
-[ -z "$EPICS_HOST_ARCH" -a -f $EPICS_BASE/src/tools/EpicsHostArch.pl ] && EPICS_HOST_ARCH=$(perl $EPICS_BASE/src/tools/EpicsHostArch.pl)
-[ -z "$EPICS_HOST_ARCH" -a -f $EPICS_BASE/startup/EpicsHostArch.pl ] && EPICS_HOST_ARCH=$(perl $EPICS_BASE/startup/EpicsHostArch.pl)
-export EPICS_HOST_ARCH
-echo "EPICS_HOST_ARCH=$EPICS_HOST_ARCH"
-
-if echo ${modules_to_compile} | grep -q "$EPICS_BASE"
-then
-
-  # requires wine and g++-mingw-w64-i686
-  if [ "$WINE" = "32" ]
-  then
-    echo "Cross mingw32"
-    sed -i -e '/CMPLR_PREFIX/d' $EPICS_BASE/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
-    cat << EOF >> $EPICS_BASE/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
-CMPLR_PREFIX=i686-w64-mingw32-
-EOF
-    cat << EOF >> $EPICS_BASE/configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS+=win32-x86-mingw
-EOF
-
-  elif [ "$WINE" = "64" ]
-  then
-    echo "Cross mingw64"
-    sed -i -e '/CMPLR_PREFIX/d' $EPICS_BASE/configure/os/CONFIG_SITE.linux-x86.windows-x64-mingw
-    cat << EOF >> $EPICS_BASE/configure/os/CONFIG_SITE.linux-x86.windows-x64-mingw
-CMPLR_PREFIX=x86_64-w64-mingw32-
-EOF
-    cat << EOF >> $EPICS_BASE/configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS+=windows-x64-mingw
-EOF
-  fi
-
-  if [ "$STATIC" = "YES" ]
-  then
-    echo "Build static libraries/executables"
-    cat << EOF >> $EPICS_BASE/configure/CONFIG_SITE
-SHARED_LIBRARIES=NO
-STATIC_BUILD=YES
-EOF
-  fi
-
-  HOST_CCMPLR_NAME=`echo "$TRAVIS_COMPILER" | sed -E 's/^([[:alpha:]][^-]*(-[[:alpha:]][^-]*)*)+(-[0-9\.]+)?$/\1/g'`
-  HOST_CMPLR_VER_SUFFIX=`echo "$TRAVIS_COMPILER" | sed -E 's/^([[:alpha:]][^-]*(-[[:alpha:]][^-]*)*)+(-[0-9\.]+)?$/\3/g'`
-  HOST_CMPLR_VER=`echo "$HOST_CMPLR_VER_SUFFIX" | cut -c 2-`
-
-  case "$HOST_CCMPLR_NAME" in
-  clang)
-    echo "Host compiler is clang"
-    HOST_CPPCMPLR_NAME=$(echo "$HOST_CCMPLR_NAME" | sed 's/clang/clang++/g')
-    cat << EOF >> $EPICS_BASE/configure/os/CONFIG_SITE.Common.$EPICS_HOST_ARCH
-GNU         = NO
-CMPLR_CLASS = clang
-CC          = ${HOST_CCMPLR_NAME}$HOST_CMPLR_VER_SUFFIX
-CCC         = ${HOST_CPPCMPLR_NAME}$HOST_CMPLR_VER_SUFFIX
-EOF
-
-    # hack
-    sed -i -e 's/CMPLR_CLASS = gcc/CMPLR_CLASS = clang/' $EPICS_BASE/configure/CONFIG.gnuCommon
-
-    ${HOST_CCMPLR_NAME}$HOST_CMPLR_VER_SUFFIX --version
-    ;;
-  gcc)
-    echo "Host compiler is GCC"
-    HOST_CPPCMPLR_NAME=$(echo "$HOST_CCMPLR_NAME" | sed 's/gcc/g++/g')
-    cat << EOF >> $EPICS_BASE/configure/os/CONFIG_SITE.Common.$EPICS_HOST_ARCH
-CC          = ${HOST_CCMPLR_NAME}$HOST_CMPLR_VER_SUFFIX
-CCC         = ${HOST_CPPCMPLR_NAME}$HOST_CMPLR_VER_SUFFIX
-EOF
-
-    ${HOST_CCMPLR_NAME}$HOST_CMPLR_VER_SUFFIX --version
-    ;;
-  *)
-    echo "Host compiler is default"
-    gcc --version
-    ;;
-  esac
-
-  cat <<EOF >> $EPICS_BASE/configure/CONFIG_SITE
-USR_CPPFLAGS += $USR_CPPFLAGS
-USR_CFLAGS += $USR_CFLAGS
-USR_CXXFLAGS += $USR_CXXFLAGS
-EOF
-
-  # set RTEMS to eg. "4.9" or "4.10"
-  # requires qemu, bison, flex, texinfo, install-info
-  if [ -n "$RTEMS" ]
-  then
-    echo "Cross RTEMS${RTEMS} for pc386"
-    sed -i -e '/^RTEMS_VERSION/d' -e '/^RTEMS_BASE/d' $EPICS_BASE/configure/os/CONFIG_SITE.Common.RTEMS
-    cat << EOF >> $EPICS_BASE/configure/os/CONFIG_SITE.Common.RTEMS
-RTEMS_VERSION=$RTEMS
-RTEMS_BASE=$HOME/.rtems
-EOF
-    cat << EOF >> $EPICS_BASE/configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS += RTEMS-pc386-qemu
-EOF
-  fi
-
-else
-  echo -e "${ANSI_GREEN}EPICS build system already set up (Base was loaded from cache)${ANSI_RESET}"
-fi
-
-# Download RTEMS cross compiler
-if [ -n "$RTEMS" ]
-then
-  echo "Downloading RTEMS${RTEMS} cross compiler for pc386"
-  curl -L "https://github.com/mdavidsaver/rsb/releases/download/20171203-${RTEMS}/i386-rtems${RTEMS}-trusty-20171203-${RTEMS}.tar.bz2" \
-  | tar -C / -xmj
-fi
-
-fold_end set.up.compiler
-
-echo "\$ make --version"
-make --version
-
-# Build required dependencies
-# ---------------------------
-
-fold_start build.dependencies "Build missing/outdated dependencies"
-
-[ "$VV" ] && silent="-s" || silent=
-
-[ -z "$modules_to_compile" ] && echo -e "${ANSI_GREEN}All dependency modules are up-to-date (nothing to do)${ANSI_RESET}"
-
-for module in ${modules_to_compile}
-do
-  eval name=\${module#${CACHEDIR}/}
-  fold_start build.$name "Build $name"
-  make -j2 $silent -C $module $EXTRA
-  fold_end build.$name
-done
-
-fold_end build.dependencies
-
-echo -e "${ANSI_BLUE}Dependency module information${ANSI_RESET}"
-
-echo "Module     Tag          Binaries    Commit"
-echo "-----------------------------------------------------------------------------------"
-for mod in base $MODULES
-do
-  mod_uc=${mod^^}
-  eval tag=\${${mod_uc}}
-  eval dir=${CACHEDIR}/\${${mod_uc}_DIRNAME}-$tag
-  echo "$modules_to_compile" | grep -q "$dir" && stat="rebuilt" || stat="from cache"
-  commit=$(git -C $dir log -n1 --oneline)
-  printf "%-10s %-12s %-11s %s\n" "$mod" "$tag" "$stat" "$commit"
-done
-
-echo -e "${ANSI_BLUE}Contents of RELEASE.local${ANSI_RESET}"
-cat ${CACHEDIR}/RELEASE.local

travis/utils.sh

@@ -1,206 +0,0 @@
-# Utility functions for Travis scripts in ci-scripts
-#
-# This file is sourced by the executable scripts
-
-# Portable version of 'sed -i'  (that MacOS doesn't provide)
-
-# sedi (cmd, file)
-# Do the equivalent of "sed -i cmd file"
-sedi () {
-  cat $2 | sed "$1" > $2.tmp$$; mv -f $2.tmp$$ $2
-}
-
-# Setup ANSI Colors
-export ANSI_RED="\033[31;1m"
-export ANSI_GREEN="\033[32;1m"
-export ANSI_YELLOW="\033[33;1m"
-export ANSI_BLUE="\033[34;1m"
-export ANSI_RESET="\033[0m"
-export ANSI_CLEAR="\033[0K"
-
-# Travis log fold control
-# from https://github.com/travis-ci/travis-rubies/blob/build/build.sh
-
-fold_start() {
-  echo -e "travis_fold:start:$1\\r${ANSI_YELLOW}$2${ANSI_RESET}"
-}
-
-fold_end() {
-  echo -en "travis_fold:end:$1\\r"
-}
-
-die() {
-  echo -e "${ANSI_RED}$1${ANSI_RESET}"
-  [ "$UTILS_UNITTEST" ] || exit 1
-}
-
-# source_set(settings)
-#
-# Source a settings file (extension .set) found in SETUP_PATH
-# May be called recursively (from within a settings file)
-declare -a SEEN_SETUPS
-source_set() {
-  local set_file=${1//[$'\r']}
-  local set_dir
-  local found=0
-  [ "${SETUP_PATH}" ] || die "Search path for setup files (SETUP_PATH) is empty"
-  for set_dir in ${SETUP_PATH//:/ }
-  do
-    if [ -e $set_dir/$set_file.set ]
-    then
-      if [[ " ${SEEN_SETUPS[@]} " =~ " $set_dir/$set_file.set " ]]
-      then
-        echo "Ignoring already included setup file $set_dir/$set_file.set"
-        return
-      fi
-      SEEN_SETUPS+=($set_dir/$set_file.set)
-      echo "Loading setup file $set_dir/$set_file.set"
-      local line
-      while read -r line
-      do
-        [ -z "$line" ] && continue
-        echo $line | grep -q "^#" && continue
-        if echo $line | grep -q "^include\W"
-        then
-          source_set $(echo $line | awk '{ print $2 }')
-          continue
-        fi
-        if echo "$line" | grep -q "^\w\+="
-        then
-          IFS== read var value <<< "${line//[$'\r']}"
-          value=$(sed "s/^\(\"\)\(.*\)\1\$/\2/g" <<< "$value") # remove surrounding quotes
-          eval [ "\${$var}" ] || eval "$var=\$value"
-        fi
-      done < $set_dir/$set_file.set
-      found=1
-      break
-    fi
-  done
-  [ $found -ne 0 ] || die "Setup file $set_file.set does not exist in SETUP_PATH search path ($SETUP_PATH)"
-}
-
-# update_release_local(varname, place)
-#   varname   name of the variable to set in RELEASE.local
-#   place     place (absolute path) of where variable should point to
-#
-# Manipulate RELEASE.local in the cache location:
-# - replace "$varname=$place" line if it exists and has changed
-# - otherwise add "$varname=$place" line and possibly move EPICS_BASE=... line to the end
-update_release_local() {
-  local var=$1
-  local place=$2
-  local release_local=${CACHEDIR}/RELEASE.local
-  local updated_line="${var}=${place}"
-
-  local ret=0
-  [ -e ${release_local} ] && grep -q "${var}=" ${release_local} || ret=$?
-  if [ $ret -eq 0 ]
-  then
-    existing_line=$(grep "${var}=" ${release_local})
-    if [ "${existing_line}" != "${updated_line}" ]
-    then
-      sedi "s|${var}=.*|${var}=${place}|g" ${release_local}
-    fi
-  else
-    echo "$var=$place" >> ${release_local}
-    ret=0
-    grep -q "EPICS_BASE=" ${release_local} || ret=$?
-    if [ $ret -eq 0 ]
-    then
-      base_line=$(grep "EPICS_BASE=" ${release_local})
-      sedi '\|EPICS_BASE=|d' ${release_local}
-      echo ${base_line} >> ${release_local}
-    fi
-  fi
-}
-
-# add_dependency(dep, tag)
-#
-# Add a dependency to the cache area:
-# - check out (recursive if configured) in the CACHE area unless it already exists and the
-#   required commit has been built
-# - Defaults:
-#   $dep_DIRNAME = lower case ($dep)
-#   $dep_REPONAME = lower case ($dep)
-#   $dep_REPOURL = GitHub / $dep_REPOOWNER (or $REPOOWNER or epics-modules) / $dep_REPONAME .git
-#   $dep_VARNAME = $dep
-#   $dep_DEPTH = 5
-#   $dep_RECURSIVE = 1/YES (0/NO to for a flat clone)
-# - Add $dep_VARNAME line to the RELEASE.local file in the cache area (unless already there)
-# - Add full path to $modules_to_compile
-add_dependency() {
-  curdir="$PWD"
-  DEP=$1
-  TAG=$2
-  dep_lc=${DEP,,}
-  eval dirname=\${${DEP}_DIRNAME:=${dep_lc}}
-  eval reponame=\${${DEP}_REPONAME:=${dep_lc}}
-  eval repourl=\${${DEP}_REPOURL:="https://github.com/\${${DEP}_REPOOWNER:=${REPOOWNER:-epics-modules}}/${reponame}.git"}
-  eval varname=\${${DEP}_VARNAME:=${DEP}}
-  eval recursive=\${${DEP}_RECURSIVE:=1}
-  recursive=${recursive,,}
-  [ "$recursive" != "0" -a "$recursive" != "no" ] && recurse="--recursive"
-
-  # determine if $DEP points to a valid release or branch
-  git ls-remote --quiet --exit-code --refs $repourl "$TAG" > /dev/null 2>&1 ||
-    die "$TAG is neither a tag nor a branch name for $DEP ($repourl)"
-
-  if [ -e $CACHEDIR/$dirname-$TAG ]
-  then
-    [ -e $CACHEDIR/$dirname-$TAG/built ] && BUILT=$(cat $CACHEDIR/$dirname-$TAG/built) || BUILT="never"
-    HEAD=$(cd "$CACHEDIR/$dirname-$TAG" && git log -n1 --pretty=format:%H)
-    if [ "$HEAD" != "$BUILT" ]
-    then
-      rm -fr $CACHEDIR/$dirname-$TAG
-    else
-      echo "Found $TAG of dependency $DEP in $CACHEDIR/$dirname-$TAG"
-    fi
-  fi
-
-  if [ ! -e $CACHEDIR/$dirname-$TAG ]
-  then
-    cd $CACHEDIR
-    eval depth=\${${DEP}_DEPTH:-"-1"}
-    case ${depth} in
-    -1 )
-      deptharg="--depth 5"
-      ;;
-    0 )
-      deptharg=""
-      ;;
-    * )
-      deptharg="--depth $depth"
-      ;;
-    esac
-    echo "Cloning $TAG of dependency $DEP into $CACHEDIR/$dirname-$TAG"
-    git clone --quiet $deptharg $recurse --branch "$TAG" $repourl $dirname-$TAG
-    ( cd $dirname-$TAG && git log -n1 )
-    modules_to_compile="${modules_to_compile} $CACHEDIR/$dirname-$TAG"
-    # fix non-base modules that do not include the .local files in configure/RELEASE
-    if [ $DEP != "BASE" ]
-    then
-      release=$CACHEDIR/$dirname-$TAG/configure/RELEASE
-      if [ -e $release ]
-      then
-        grep -q "include \$(TOP)/../RELEASE.local" $release || echo "-include \$(TOP)/../RELEASE.local" >> $release
-      fi
-    fi
-    # run hook
-    eval hook="\${${DEP}_HOOK}"
-    if [ "$hook" ]
-    then
-      if [ -x "$curdir/$hook" ]
-      then
-        echo "Running hook $hook in $CACHEDIR/$dirname-$TAG"
-        ( cd $CACHEDIR/$dirname-$TAG; "$curdir/$hook" )
-      else
-        die "Hook script $hook is not executable or does not exist."
-      fi
-    fi
-    HEAD=$(cd "$CACHEDIR/$dirname-$TAG" && git log -n1 --pretty=format:%H)
-    echo "$HEAD" > "$CACHEDIR/$dirname-$TAG/built"
-    cd "$curdir"
-  fi
-
-  update_release_local ${varname} $CACHEDIR/$dirname-$TAG
-}