travis-ci: update .travis.yml for ci-scripts

- use more EXTRAs on MacOS for make args

.travis.yml

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