boost/outcome
2
0
Fork 0
mirror of https://github.com/boostorg/outcome.git synced 2026-01-19 04:22:13 +00:00
Code Issues Projects Releases Wiki Activity

Merged from develop branch as CDash reports all green

Browse Source
This commit is contained in:
Jenkins nedprod CI
2019-10-22 00:00:18 +01:00
parent 1520386e4f 335f009519
commit 6d45806413
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.boostify
View File

@@ -55,9 +55,9 @@ source_macros = {
r'DOXYGEN_': r'BOOST_OUTCOME_DOXYGEN_',
r'STANDARDESE_': r'BOOST_OUTCOME_STANDARDESE_',
r'\.\./include/outcome' : r'../include/boost/outcome',
r'#include "quickcpplib/include/boost/test/unit_test.hpp"' : r'#include <boost/test/unit_test.hpp>\n#include <boost/test/unit_test_monitor.hpp>',
r'#include "quickcpplib/boost/test/unit_test.hpp"' : r'#include <boost/test/unit_test.hpp>\n#include <boost/test/unit_test_monitor.hpp>',
r'BOOST_OUTCOME_AUTO_TEST_CASE\((.*)' : fix_auto_test_case,
r'#include "quickcpplib/include/execinfo_win64.h"' : r'#error This example can only compile on POSIX',
r'#include "quickcpplib/execinfo_win64.h"' : r'#error This example can only compile on POSIX',
r'#ifdef __cpp_exceptions' : r'#ifndef BOOST_NO_EXCEPTIONS',
}
source_macros.update(core_macros)

7
boostify/.travis.yml
View File

@@ -32,11 +32,11 @@ cache:
before_install:
- if [ ! -f "boost/bootstrap.sh" ]; then
wget -O boost.tar.bz2 https://dl.bintray.com/boostorg/release/1.69.0/source/boost_1_69_0.tar.bz2;
wget -O boost.tar.bz2 https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2;
tar xf boost.tar.bz2 -C boost;
mv boost/boost_1_69_0 .;
mv boost/boost_1_71_0 .;
rm -rf boost;
mv boost_1_69_0 boost;
mv boost_1_71_0 boost;
ls -l;
ls -l boost;
cd boost;
@@ -44,6 +44,7 @@ before_install:
cd ..;
fi;
- rm -rf bin.v2/libs/outcome
- rm -rf boost/boost/outcome
- rm -rf boost/libs/outcome
- ln -s ../.. boost/libs/outcome
- ls -l boost/libs/outcome/

4
doc/src/content/changelog/_index.md
View File

@@ -4,7 +4,7 @@ weight = 80
+++
---
## v2.1.2 ? (Boost 1.72) [[release]](https://github.com/ned14/outcome/releases/tag/v2.1.2)
## v2.1.2 6th November 2019 (Boost 1.72) [[release]](https://github.com/ned14/outcome/releases/tag/v2.1.2)
### Enhancements:
@@ -19,7 +19,7 @@ has been replaced with a cmake superbuild of dependencies mechanism instead. Upo
configure, an internal copy of quickcpplib will be git cloned, built and installed into the
build directory from where an internal `find_package()` uses it. This breaks the use of
the unconfigured Outcome repo as an implementation of Outcome, one must now do one of:
1. Add Outcome as subdirectory to cmake build
1. Add Outcome as subdirectory to cmake build.
2. Use cmake superbuild (i.e. `ExternalProject_Add()`) to build and install Outcome into
a local installation.
3. Use one of the single header editions.