From e4e8154e3012788cc3c9aa159c82ecf28aed63ce Mon Sep 17 00:00:00 2001 From: Emil Dotchevski Date: Sun, 30 Aug 2020 13:36:58 -0700 Subject: [PATCH] boostorg compatibility changes --- .gitignore | 1 + .travis.yml | 10 +++++----- appveyor.yml | 2 +- doc/Jamfile | 4 ++-- index.html | 15 +++++++++++++++ meta/libraries.json | 14 ++++++++++++++ test/Jamfile.v2 | 7 ++++--- wasm.txt | 7 +++++++ 8 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 index.html create mode 100644 meta/libraries.json diff --git a/.gitignore b/.gitignore index 6838016..23360a2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ *.db *.opendb bld/* +doc/html/* snippets/* subprojects/*/ .vscode/ipch/* diff --git a/.travis.yml b/.travis.yml index 1622926..d1b7812 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/appveyor.yml b/appveyor.yml index 809ddd9..1b66d95 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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% diff --git a/doc/Jamfile b/doc/Jamfile index d378563..e51635d 100644 --- a/doc/Jamfile +++ b/doc/Jamfile @@ -9,10 +9,10 @@ project doc/leaf ; import asciidoctor ; html index.html : leaf.adoc : stylesheet=zajo-dark.css linkcss ; -install html_ : index.html LEAF-1.png LEAF-2.png skin.png zajo-dark.css zajo-light.css rouge-github.css : out ; +install html_ : index.html LEAF-1.png LEAF-2.png skin.png zajo-dark.css zajo-light.css rouge-github.css : html ; pdf leaf.pdf : leaf.adoc : book pdf-themesdir=doc pdf-theme=leaf ; -install pdf_ : leaf.pdf : out ; +install pdf_ : leaf.pdf : html ; alias boostdoc ; explicit boostdoc ; diff --git a/index.html b/index.html new file mode 100644 index 0000000..9eb9f0a --- /dev/null +++ b/index.html @@ -0,0 +1,15 @@ + + + + + +Automatic redirection failed, please go to +doc/html/index.html. + + + diff --git a/meta/libraries.json b/meta/libraries.json new file mode 100644 index 0000000..8475e73 --- /dev/null +++ b/meta/libraries.json @@ -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" + ] +} diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 2bd2b16..3f891db 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -5,12 +5,13 @@ import testing ; -variant debug-diagnostics0 : debug : BOOST_LEAF_DIAGNOSTICS=0 ; -variant release-diagnostics0 : release : BOOST_LEAF_DIAGNOSTICS=0 ; +variant leaf-debug-diag0 : debug : BOOST_LEAF_DIAGNOSTICS=0 ; +variant leaf-release-diag0 : release : BOOST_LEAF_DIAGNOSTICS=0 ; project - : requirements + : default-build 11 + : requirements single:BOOST_LEAF_NO_THREADS gcc:"-Wno-delete-non-virtual-dtor -Wno-parentheses" clang:"-Wno-dangling-else" diff --git a/wasm.txt b/wasm.txt index f677081..3fdf595 100644 --- a/wasm.txt +++ b/wasm.txt @@ -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++'