epics/ci-scripts
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Add EXTRA definitions to the example builds

Browse Source
This commit is contained in:
Ralph Lange
2020-06-08 11:04:41 +02:00
parent 590e0e4d26
commit fd4bc0397a
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.appveyor.yml
View File

@@ -86,6 +86,9 @@ environment:
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
- CMP: vs2017 - CMP: vs2017
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
EXTRA: EXTRA_DEF="extra"
EXTRA1: EXTRA1_DEF="extra 1"
EXTRA2: EXTRA2_DEF="extra 2"
- CMP: vs2015 - CMP: vs2015
- CMP: vs2013 - CMP: vs2013
- CMP: vs2012 - CMP: vs2012

30
.travis.yml
View File

@@ -50,18 +50,20 @@ script:
# Define build jobs # Define build jobs
# Well-known variables to use # 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 # Usually from setup files, but may be specified or overridden
# on a job line # 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: jobs:
include: include:
@@ -96,7 +98,7 @@ jobs:
- env: SET=test01 BCFG=static-debug - env: SET=test01 BCFG=static-debug
dist: trusty dist: trusty
- env: SET=test01 - env: SET=test01 EXTRA="CMD_CXXFLAGS=-std=c++11"
- env: SET=test01 BCFG=static - env: SET=test01 BCFG=static
- env: SET=test01 BCFG=debug - env: SET=test01 BCFG=debug
- env: SET=test01 BCFG=static-debug - env: SET=test01 BCFG=static-debug
@@ -107,8 +109,12 @@ jobs:
- env: SET=test01 BCFG=static-debug - env: SET=test01 BCFG=static-debug
compiler: clang compiler: clang
- env: SET=test01 - os: osx
os: osx 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 compiler: clang
- env: SET=test01 BCFG=debug - env: SET=test01 BCFG=debug