2
0
mirror of https://github.com/boostorg/leaf.git synced 2026-01-19 04:22:08 +00:00

boostorg compatibility changes

This commit is contained in:
Emil Dotchevski
2020-08-30 13:36:58 -07:00
parent c886cb10ee
commit e4e8154e30
8 changed files with 49 additions and 11 deletions

1
.gitignore vendored
View File

@@ -8,6 +8,7 @@
*.db
*.opendb
bld/*
doc/html/*
snippets/*
subprojects/*/
.vscode/ipch/*

View File

@@ -71,7 +71,7 @@ matrix:
echo "using asciidoctor ;" > ~/user-config.jam
- ../../b2 doc
deploy:
local-dir: ../boost-root/libs/leaf/doc/out
local-dir: ../boost-root/libs/leaf/doc/html
provider: pages
skip-cleanup: true
github-token: $GH_PAGES_TOKEN
@@ -387,10 +387,10 @@ install:
script:
- |-
echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
- ../../b2 test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release,debug-diagnostics0,release-diagnostics0 ${UBSAN:+cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined linkflags=-fsanitize=undefined debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS}
- ../../b2 exception-handling=off rtti=off test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release,debug-diagnostics0,release-diagnostics0 ${UBSAN:+cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined linkflags=-fsanitize=undefined debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS}
- ../../b2 threading=single test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release,debug-diagnostics0,release-diagnostics0 ${UBSAN:+cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined linkflags=-fsanitize=undefined debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS}
- ../../b2 threading=single exception-handling=off rtti=off test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release,debug-diagnostics0,release-diagnostics0 ${UBSAN:+cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined linkflags=-fsanitize=undefined debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS}
- ../../b2 test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release,leaf-debug-diag0,leaf-release-diag0 ${UBSAN:+cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined linkflags=-fsanitize=undefined debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS}
- ../../b2 exception-handling=off rtti=off test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release,leaf-debug-diag0,leaf-release-diag0 ${UBSAN:+cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined linkflags=-fsanitize=undefined debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS}
- ../../b2 threading=single test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release,leaf-debug-diag0,leaf-release-diag0 ${UBSAN:+cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined linkflags=-fsanitize=undefined debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS}
- ../../b2 threading=single exception-handling=off rtti=off test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release,leaf-debug-diag0,leaf-release-diag0 ${UBSAN:+cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined linkflags=-fsanitize=undefined debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS}
notifications:
email:

View File

@@ -42,4 +42,4 @@ build: off
test_script:
- if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
- b2 -j3 libs/leaf/test toolset=%TOOLSET% exception-handling=on,off variant=debug,release,debug-diagnostics0,release-diagnostics0 %CXXSTD%
- b2 -j3 libs/leaf/test toolset=%TOOLSET% exception-handling=on,off variant=debug,release,leaf-debug-diag0,leaf-release-diag0 %CXXSTD%

View File

@@ -9,10 +9,10 @@ project doc/leaf ;
import asciidoctor ;
html index.html : leaf.adoc : <asciidoctor-attribute>stylesheet=zajo-dark.css <asciidoctor-attribute>linkcss ;
install html_ : index.html LEAF-1.png LEAF-2.png skin.png zajo-dark.css zajo-light.css rouge-github.css : <location>out ;
install html_ : index.html LEAF-1.png LEAF-2.png skin.png zajo-dark.css zajo-light.css rouge-github.css : <location>html ;
pdf leaf.pdf : leaf.adoc : <asciidoctor-doctype>book <asciidoctor-attribute>pdf-themesdir=doc <asciidoctor-attribute>pdf-theme=leaf ;
install pdf_ : leaf.pdf : <location>out ;
install pdf_ : leaf.pdf : <location>html ;
alias boostdoc ;
explicit boostdoc ;

15
index.html Normal file
View File

@@ -0,0 +1,15 @@
<html>
<head>
<meta http-equiv="refresh" content="0; URL=doc/html/index.html">
</head>
<body>
Automatic redirection failed, please go to
<a href="doc/html/index.html">doc/html/index.html</a>.
</body>
</html>
<!--
<09> Copyright Beman Dawes, 2001
Distributed under the Boost Software License, Version 1.0.
See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt
-->

14
meta/libraries.json Normal file
View File

@@ -0,0 +1,14 @@
{
"key": "leaf",
"name": "LEAF",
"authors": [
"Emil Dotchevski"
],
"maintainers": [
"Emil Dotchevski"
],
"description": "A lightweight error-handling library for C++11.",
"category": [
"Error-handling"
]
}

View File

@@ -5,12 +5,13 @@
import testing ;
variant debug-diagnostics0 : debug : <define>BOOST_LEAF_DIAGNOSTICS=0 ;
variant release-diagnostics0 : release : <define>BOOST_LEAF_DIAGNOSTICS=0 ;
variant leaf-debug-diag0 : debug : <define>BOOST_LEAF_DIAGNOSTICS=0 ;
variant leaf-release-diag0 : release : <define>BOOST_LEAF_DIAGNOSTICS=0 ;
project
: requirements
: default-build
<cxxstd>11
: requirements
<threading>single:<define>BOOST_LEAF_NO_THREADS
<toolset>gcc:<cxxflags>"-Wno-delete-non-virtual-dtor -Wno-parentheses"
<toolset>clang:<cxxflags>"-Wno-dangling-else"

View File

@@ -1,3 +1,10 @@
# Copyright (c) 2018-2020 Emil Dotchevski and Reverge Studios, Inc.
# Distributed under the Boost Software License, Version 1.0. (See accompanying
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
# Crossfile for Meson / emscripten
[binaries]
c = 'emcc'
cpp = 'em++'