Skip to content

Commit b12a189

Browse files
ericnieblerericniebler
authored
Merge pull request #30 from boostorg/develop
Merge 'develop' to 'master'
2 parents bfcbfe3 + ff9432f commit b12a189

File tree

84 files changed

+2230
-156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+2230
-156
lines changed

‎.travis.yml‎

Lines changed: 272 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,272 @@
1+
# Copyright 2018 Cromwell D. Enage
2+
# Distributed under the Boost Software License, Version 1.0.
3+
# (See accompanying file LICENSE_1_0.txt or copy at
4+
# http://boost.org/LICENSE_1_0.txt)
5+
6+
language: cpp
7+
8+
python: "2.7"
9+
10+
branches:
11+
only:
12+
- master
13+
- develop
14+
- /feature\/.*/
15+
16+
env:
17+
matrix:
18+
- BOGUS_JOB=true
19+
20+
matrix:
21+
22+
exclude:
23+
- env: BOGUS_JOB=true
24+
25+
include:
26+
- os: linux
27+
compiler: g++-4.4
28+
env: TOOLSET=gcc COMPILER=g++-4.4 CXXSTD=98,0x
29+
addons:
30+
apt:
31+
packages:
32+
- g++-4.4
33+
sources:
34+
- ubuntu-toolchain-r-test
35+
36+
- os: linux
37+
compiler: g++-4.6
38+
env: TOOLSET=gcc COMPILER=g++-4.6 CXXSTD=03,0x
39+
addons:
40+
apt:
41+
packages:
42+
- g++-4.6
43+
sources:
44+
- ubuntu-toolchain-r-test
45+
46+
- os: linux
47+
env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11
48+
addons:
49+
apt:
50+
packages:
51+
- g++-4.7
52+
sources:
53+
- ubuntu-toolchain-r-test
54+
55+
- os: linux
56+
env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=03,11
57+
addons:
58+
apt:
59+
packages:
60+
- g++-4.8
61+
sources:
62+
- ubuntu-toolchain-r-test
63+
64+
- os: linux
65+
env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=03,11
66+
addons:
67+
apt:
68+
packages:
69+
- g++-4.9
70+
sources:
71+
- ubuntu-toolchain-r-test
72+
73+
- os: linux
74+
env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=03,11,14
75+
addons:
76+
apt:
77+
packages:
78+
- g++-5
79+
sources:
80+
- ubuntu-toolchain-r-test
81+
82+
- os: linux
83+
env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=03,11,14,1z
84+
addons:
85+
apt:
86+
packages:
87+
- g++-6
88+
sources:
89+
- ubuntu-toolchain-r-test
90+
91+
- os: linux
92+
env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=03,11,14,1z CXXSTD_DIALECT=cxxstd-dialect=gnu
93+
addons:
94+
apt:
95+
packages:
96+
- g++-6
97+
sources:
98+
- ubuntu-toolchain-r-test
99+
100+
- os: linux
101+
dist: trusty
102+
compiler: g++-7
103+
env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=03,11,14,17
104+
addons:
105+
apt:
106+
packages:
107+
- g++-7
108+
sources:
109+
- ubuntu-toolchain-r-test
110+
111+
- os: linux
112+
dist: trusty
113+
compiler: g++-7
114+
env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=03,11,14,17 CXXSTD_DIALECT=cxxstd-dialect=gnu
115+
addons:
116+
apt:
117+
packages:
118+
- g++-7
119+
sources:
120+
- ubuntu-toolchain-r-test
121+
122+
- os: linux
123+
compiler: g++-8
124+
env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17
125+
addons:
126+
apt:
127+
packages:
128+
- g++-8
129+
sources:
130+
- ubuntu-toolchain-r-test
131+
132+
- os: linux
133+
env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11
134+
addons:
135+
apt:
136+
packages:
137+
- clang-3.5
138+
sources:
139+
- ubuntu-toolchain-r-test
140+
- llvm-toolchain-precise-3.5
141+
142+
- os: linux
143+
env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=03,11
144+
addons:
145+
apt:
146+
packages:
147+
- clang-3.6
148+
sources:
149+
- ubuntu-toolchain-r-test
150+
- llvm-toolchain-precise-3.6
151+
152+
- os: linux
153+
env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11
154+
addons:
155+
apt:
156+
packages:
157+
- clang-3.7
158+
sources:
159+
- ubuntu-toolchain-r-test
160+
- llvm-toolchain-precise-3.7
161+
162+
- os: linux
163+
env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=03,11,14,1z
164+
addons:
165+
apt:
166+
packages:
167+
- clang-3.8
168+
- libstdc++-4.9-dev
169+
sources:
170+
- ubuntu-toolchain-r-test
171+
- llvm-toolchain-precise-3.8
172+
173+
- os: linux
174+
env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=03,11,14,1z
175+
addons:
176+
apt:
177+
packages:
178+
- clang-3.9
179+
- libstdc++-4.9-dev
180+
sources:
181+
- ubuntu-toolchain-r-test
182+
- llvm-toolchain-precise-3.9
183+
184+
- os: linux
185+
compiler: clang++-4.0
186+
env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=03,11,14,1z
187+
addons:
188+
apt:
189+
packages:
190+
- clang-4.0
191+
sources:
192+
- ubuntu-toolchain-r-test
193+
- llvm-toolchain-trusty-4.0
194+
195+
- os: linux
196+
compiler: clang++-5.0
197+
env: TOOLSET=clang COMPILER=clang++-5.0 CXXSTD=03,11,14,1z
198+
addons:
199+
apt:
200+
packages:
201+
- clang-5.0
202+
sources:
203+
- ubuntu-toolchain-r-test
204+
- llvm-toolchain-trusty-5.0
205+
206+
- os: linux
207+
compiler: clang++-6.0
208+
env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=03,11,14,1z
209+
addons:
210+
apt:
211+
packages:
212+
- clang-6.0
213+
sources:
214+
- ubuntu-toolchain-r-test
215+
- llvm-toolchain-trusty-6.0
216+
217+
- os: linux
218+
compiler: clang++
219+
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
220+
addons:
221+
apt:
222+
packages:
223+
- libstdc++-5-dev
224+
sources:
225+
- ubuntu-toolchain-r-test
226+
227+
- os: linux
228+
compiler: clang++-libc++
229+
env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=03,11,14,1z
230+
addons:
231+
apt:
232+
packages:
233+
- libc++-dev
234+
235+
- os: osx
236+
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
237+
osx_image: xcode7.3
238+
239+
- os: osx
240+
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
241+
osx_image: xcode8.3
242+
243+
- os: osx
244+
env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
245+
osx_image: xcode9.4.1
246+
247+
install:
248+
- BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
249+
- cd ..
250+
- git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
251+
- cd boost-root
252+
- git submodule update --init tools/boost_install
253+
- git submodule update --init libs/headers
254+
- git submodule update --init tools/build
255+
- git submodule update --init libs/config
256+
- git submodule update --init tools/boostdep
257+
- cp -r $TRAVIS_BUILD_DIR/* libs/accumulators
258+
- python tools/boostdep/depinst/depinst.py accumulators
259+
- ./bootstrap.sh
260+
- ./b2 headers
261+
262+
script:
263+
- |-
264+
echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
265+
- ./b2 --verbose-test libs/config/test//config_info toolset=$TOOLSET cxxstd=$CXXSTD || true
266+
- cd libs/accumulators/test
267+
- ../../../b2 -j`(nproc || sysctl -n hw.ncpu) 2> /dev/null` toolset=$TOOLSET cxxstd=$CXXSTD $CXXSTD_DIALECT
268+
- cd ../../..
269+
270+
notifications:
271+
email:
272+
on_success: always

‎appveyor.yml‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# Copyright 2018 Cromwell D. Enage
2+
# Distributed under the Boost Software License, Version 1.0.
3+
# (See accompanying file LICENSE_1_0.txt or copy at
4+
# http://boost.org/LICENSE_1_0.txt)
5+
6+
version: 1.0.{build}-{branch}
7+
8+
shallow_clone: true
9+
10+
branches:
11+
only:
12+
- master
13+
- develop
14+
15+
environment:
16+
matrix:
17+
- ARGS: --toolset=gcc address-model=32
18+
PATH: C:\mingw-w64\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin;%PATH%
19+
- ARGS: --toolset=gcc address-model=32 linkflags=-Wl,-allow-multiple-definition
20+
PATH: C:\MinGW\bin;%PATH%
21+
- ARGS: --toolset=gcc address-model=64
22+
PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%
23+
- ARGS: --toolset=gcc address-model=64 cxxflags=-std=gnu++1z
24+
PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%
25+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
26+
ARGS: --toolset=msvc-9.0 address-model=32
27+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
28+
ARGS: --toolset=msvc-10.0 address-model=32
29+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
30+
ARGS: --toolset=msvc-11.0 address-model=32
31+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
32+
ARGS: --toolset=msvc-12.0 address-model=32
33+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
34+
ARGS: --toolset=msvc-12.0 address-model=64
35+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
36+
ARGS: --toolset=msvc-14.0 address-model=32
37+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
38+
ARGS: --toolset=msvc-14.0 address-model=64
39+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
40+
ARGS: --toolset=msvc-14.0 address-model=64 cxxflags=-std:c++latest
41+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
42+
ARGS: --toolset=msvc-14.1 address-model=32
43+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
44+
ARGS: --toolset=msvc-14.1 address-model=64
45+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
46+
ARGS: --toolset=msvc-14.1 address-model=64 cxxflags=-std:c++latest
47+
48+
install:
49+
- cd ..
50+
- git clone -b %APPVEYOR_REPO_BRANCH% https://github.com/boostorg/boost.git boost-root
51+
- cd boost-root
52+
- git submodule update --init tools/boost_install
53+
- git submodule update --init libs/headers
54+
- git submodule update --init tools/build
55+
- git submodule update --init libs/config
56+
- git submodule update --init tools/boostdep
57+
- xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\accumulators
58+
- python tools/boostdep/depinst/depinst.py accumulators
59+
- bootstrap
60+
- b2 headers
61+
62+
build: off
63+
64+
test_script:
65+
- cd libs\accumulators\test
66+
- ..\..\..\b2 -j%NUMBER_OF_PROCESSORS% --hash %ARGS%
67+
- cd ..\..\..

‎example/Jamfile.v2‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@ exe example
88
:
99
<include>../../..
1010
<include>$(BOOST_ROOT)
11+
<library>/boost/serialization
12+
<cxxflags>"-Wno-deprecated-declarations"
1113
;

0 commit comments

Comments
 (0)