Compare commits

...

18 Commits

Author SHA1 Message Date
ae4fde2e2a Removed --depth 1 2017-10-29 21:41:25 -04:00
4f247c06e4 Merge pull request #6 from boostorg/pr/depinst-include-example
Add `-I example` to depinst invocation
2017-10-25 22:03:25 -04:00
78dabb2dd8 Add -I example to depinst invocation 2017-10-26 01:13:09 +03:00
f542321082 Remove comments in appveyor and travis files. 2017-10-14 19:54:13 -04:00
842b853351 Use boostdep to find dependencies in the example subdirectory. 2017-10-14 18:57:40 -04:00
b7e56e1c35 More appveyor/travis dependencies. 2017-10-14 12:14:09 -04:00
9699db7e6c Added concept_check as a travis/appveyor dependency. 2017-10-14 11:16:57 -04:00
4c250985a1 Merge branch 'develop' of https://github.com/boostorg/function_types into develop
# Conflicts:
#	.travis.yml
#	appveyor.yml
2017-10-14 10:47:02 -04:00
ed059784b9 Corrected numeric_conversion to numeric/conversion 2017-10-14 10:44:50 -04:00
1e434eff75 Added more travis/appveyor dependencies. 2017-10-14 07:09:03 -04:00
27aeab935b Add timer and iterator dependencies for examples. 2017-10-13 22:10:49 -04:00
fd39273e0d Add tokenizer library manually since it is used when testing the examples. 2017-10-13 19:31:13 -04:00
b3e185a544 Disable custom calling conventions test for 64-bit address model. 2017-10-13 16:14:25 -04:00
85cf2ccd77 Better appveyor file setup. 2017-10-09 12:06:15 -04:00
d81450d8ca Added Appveyor file and Travis CI file. 2017-10-09 08:13:29 -04:00
915d444667 Merge branch 'master' into develop 2017-04-24 12:20:28 -04:00
77dffdafff Add, and update, documentation build targets. 2016-10-10 11:39:49 -05:00
e74cb4aa4a Add, and update, documentation build targets. 2016-10-07 23:07:34 -05:00
4 changed files with 86 additions and 4 deletions

40
.travis.yml Normal file
View File

@ -0,0 +1,40 @@
# Copyright 2016 Edward Diener
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
language: cpp
sudo: false
python: "2.7"
os:
- linux
- osx
branches:
only:
- master
- develop
install:
- cd ..
- git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
- cd boost-root
- git submodule update --init tools/build
- git submodule update --init libs/config
- git submodule update --init tools/boostdep
- cp -r $TRAVIS_BUILD_DIR/* libs/function_types
- python tools/boostdep/depinst/depinst.py -I example function_types
- ./bootstrap.sh
- ./b2 headers
script:
- TOOLSET=gcc,clang
- if [ $TRAVIS_OS_NAME == osx ]; then TOOLSET=clang; fi
- ./b2 --verbose-test libs/config/test//config_info toolset=$TOOLSET || true
- ./b2 libs/function_types/test toolset=$TOOLSET
notifications:
email:
on_success: always

36
appveyor.yml Normal file
View File

@ -0,0 +1,36 @@
# Copyright 2017 Edward Diener
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
version: 1.0.{build}-{branch}
shallow_clone: true
branches:
only:
- master
- develop
environment:
matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0,msvc-12.0,msvc-14.0
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
TOOLSET: msvc-14.1
install:
- cd ..
- git clone -b %APPVEYOR_REPO_BRANCH% https://github.com/boostorg/boost.git boost-root
- cd boost-root
- git submodule update --init tools/build
- git submodule update --init libs/config
- git submodule update --init tools/boostdep
- xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\function_types
- python tools/boostdep/depinst/depinst.py -I example function_types
- bootstrap
- b2 headers
build: off
test_script:
- b2 libs/function_types/test toolset=%TOOLSET%

View File

@ -19,3 +19,9 @@ boostbook standalone
<xsl:param>toc.max.depth=1
;
###############################################################################
alias boostdoc ;
explicit boostdoc ;
alias boostrelease : standalone ;
explicit boostrelease ;

View File

@ -64,10 +64,10 @@ import testing ;
# Custom calling conventions
[ compile custom_ccs/nonmember_ccs.cpp ]
[ compile custom_ccs/nonmember_ccs_exact.cpp ]
[ compile custom_ccs/member_ccs.cpp ]
[ compile custom_ccs/member_ccs_exact.cpp ]
[ compile custom_ccs/nonmember_ccs.cpp : <address-model>64:<build>no ]
[ compile custom_ccs/nonmember_ccs_exact.cpp : <address-model>64:<build>no ]
[ compile custom_ccs/member_ccs.cpp : <address-model>64:<build>no ]
[ compile custom_ccs/member_ccs_exact.cpp : <address-model>64:<build>no ]
# Code from the examples