Merge pull request #394 from mloskot/ml/emergency-master-fix-for-docs…

…-build-bug-351 Emergency cherry-picks to fix documentation build in master Fixes #351
boostorg · Sep 30, 2019 · 1d9fe2c · 1d9fe2c
2 parents 715d760 + f2697e6
commit 1d9fe2c
Show file tree

Hide file tree

Showing 206 changed files with 502 additions and 277 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -148,11 +148,10 @@ before_build:
 build: off
 
 build_script:
-  - cd c:\projects\boost
-  - if NOT DEFINED GENERATOR b2 address-model=%AM% toolset=%TOOLSET% variant=%VARIANT% cxxstd=%CXXSTD% libs/gil/test
-  - if NOT DEFINED GENERATOR b2 address-model=%AM% toolset=%TOOLSET% variant=%VARIANT% cxxstd=%CXXSTD% libs/gil/toolbox/test
-  - if NOT DEFINED GENERATOR b2 address-model=%AM% toolset=%TOOLSET% variant=%VARIANT% cxxstd=%CXXSTD% libs/gil/numeric/test
-  - if NOT DEFINED GENERATOR b2 address-model=%AM% toolset=%TOOLSET% variant=%VARIANT% cxxstd=%CXXSTD% include=%VCPKG_I% library-path=%VCPKG_L% libs/gil/io/test//simple
+  - if NOT DEFINED GENERATOR b2 --abbreviate-paths address-model=%AM% toolset=%TOOLSET% variant=%VARIANT% cxxstd=%CXXSTD% libs/gil/test/core
+  - if NOT DEFINED GENERATOR b2 --abbreviate-paths address-model=%AM% toolset=%TOOLSET% variant=%VARIANT% cxxstd=%CXXSTD% libs/gil/test/extension/numeric
+  - if NOT DEFINED GENERATOR b2 --abbreviate-paths address-model=%AM% toolset=%TOOLSET% variant=%VARIANT% cxxstd=%CXXSTD% libs/gil/test/extension/toolbox
+  - if NOT DEFINED GENERATOR b2 --abbreviate-paths address-model=%AM% toolset=%TOOLSET% variant=%VARIANT% cxxstd=%CXXSTD% include=%VCPKG_I% library-path=%VCPKG_L% libs/gil/test/extension/io//simple
   - if DEFINED GENERATOR cd libs\gil && md build && cd build
   - if DEFINED GENERATOR cmake -G "%GENERATOR%" -DCMAKE_CXX_STANDARD=%CXXSTD% -DBoost_DETAILED_FAILURE_MSG=ON -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake ..
   - if DEFINED GENERATOR cmake --build . --config %CMAKE_CONFIG %

diff --git a/.ci/build-and-test.sh b/.ci/build-and-test.sh
@@ -38,7 +38,7 @@ fi
 echo "Running ./b2 -j $JOBS $B2_OPTIONS toolset=$TOOLSET variant=$VARIANT"
 
 set -euv
-./b2 -j $JOBS $B2_OPTIONS toolset=$TOOLSET variant=$VARIANT cxxstd=$CXXSTD libs/gil/test
-./b2 -j $JOBS $B2_OPTIONS toolset=$TOOLSET variant=$VARIANT cxxstd=$CXXSTD libs/gil/toolbox/test
-./b2 -j $JOBS $B2_OPTIONS toolset=$TOOLSET variant=$VARIANT cxxstd=$CXXSTD libs/gil/numeric/test
-./b2 -j $JOBS $B2_OPTIONS toolset=$TOOLSET variant=$VARIANT cxxstd=$CXXSTD libs/gil/io/test//simple
+./b2 -j $JOBS $B2_OPTIONS toolset=$TOOLSET variant=$VARIANT cxxstd=$CXXSTD libs/gil/test/core
+./b2 -j $JOBS $B2_OPTIONS toolset=$TOOLSET variant=$VARIANT cxxstd=$CXXSTD libs/gil/test/extension/numeric
+./b2 -j $JOBS $B2_OPTIONS toolset=$TOOLSET variant=$VARIANT cxxstd=$CXXSTD libs/gil/test/extension/toolbox
+./b2 -j $JOBS $B2_OPTIONS toolset=$TOOLSET variant=$VARIANT cxxstd=$CXXSTD libs/gil/test/extension/io//simple
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -273,25 +273,25 @@ steps_test_core: &steps_test_core
   steps:
     - *attach_workspace
     - *run_compiler_version
-    - run: cd boost && ./b2 toolset=$TOOLSET $VARIANT $OPTIMIZ cxxstd="$CXXSTD" libs/gil/test
+    - run: cd boost-root && ./b2 toolset=$TOOLSET $VARIANT $OPTIMIZ cxxstd="$CXXSTD" libs/gil/test/core
 
-steps_test_toolbox: &steps_test_toolbox
+steps_test_numeric: &steps_test_numeric
   steps:
     - *attach_workspace
     - *run_compiler_version
-    - run: cd boost && ./b2 toolset=$TOOLSET $VARIANT $OPTIMIZ cxxstd="$CXXSTD" libs/gil/toolbox/test
+    - run: cd boost-root && ./b2 toolset=$TOOLSET $VARIANT $OPTIMIZ cxxstd="$CXXSTD" libs/gil/test/extension/numeric
 
-steps_test_numeric: &steps_test_numeric
+steps_test_toolbox: &steps_test_toolbox
   steps:
     - *attach_workspace
     - *run_compiler_version
-    - run: cd boost && ./b2 toolset=$TOOLSET $VARIANT $OPTIMIZ cxxstd="$CXXSTD" libs/gil/numeric/test
+    - run: cd boost-root && ./b2 toolset=$TOOLSET $VARIANT $OPTIMIZ cxxstd="$CXXSTD" libs/gil/test/extension/toolbox
 
 steps_test_io: &steps_test_io
   steps:
     - *attach_workspace
     - *run_compiler_version
-    - run: cd boost && ./b2 toolset=$TOOLSET $VARIANT $OPTIMIZ cxxstd="$CXXSTD" libs/gil/io/test//simple
+    - run: cd boost-root && ./b2 toolset=$TOOLSET $VARIANT $OPTIMIZ cxxstd="$CXXSTD" libs/gil/test/extension/io//simple
 
 ##############################################################################
 # Build jobs

diff --git a/.travis.yml b/.travis.yml
@@ -130,49 +130,47 @@ matrix:
             - llvm-toolchain-precise-3.9
 
     - os: linux
-      env: COMPILER=clang++-5.0 VARIANT=gil_ubsan_integer TOOLSET=clang CXXSTD=11 B2_OPTIONS="visibility=global" UBSAN_OPTIONS='print_stacktrace=1'
+      env: COMPILER=clang++-6.0 VARIANT=gil_ubsan_integer TOOLSET=clang CXXSTD=11 B2_OPTIONS="visibility=global" UBSAN_OPTIONS='print_stacktrace=1'
       addons:
         apt:
           packages:
-            - clang-5.0
+            - clang-6.0
             - libstdc++-7-dev
             - libpng-dev
             - libjpeg-dev
             - libtiff5-dev
             - libraw-dev
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-5.0
+            - llvm-toolchain-trusty-6.0
 
     - os: linux
-      env: COMPILER=clang++-5.0 VARIANT=gil_ubsan_nullability TOOLSET=clang CXXSTD=11 B2_OPTIONS="visibility=global" UBSAN_OPTIONS='print_stacktrace=1'
+      env: COMPILER=clang++-6.0 VARIANT=gil_ubsan_nullability TOOLSET=clang CXXSTD=11 B2_OPTIONS="visibility=global" UBSAN_OPTIONS='print_stacktrace=1'
       addons:
         apt:
           packages:
-            - clang-5.0
+            - clang-6.0
             - libstdc++-7-dev
             - libpng-dev
             - libjpeg-dev
             - libtiff5-dev
             - libraw-dev
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-5.0
 
     - os: linux
-      env: COMPILER=clang++-5.0 VARIANT=gil_ubsan_undefined TOOLSET=clang CXXSTD=11 B2_OPTIONS="visibility=global" UBSAN_OPTIONS='print_stacktrace=1'
+      env: COMPILER=clang++-6.0 VARIANT=gil_ubsan_undefined TOOLSET=clang CXXSTD=11 B2_OPTIONS="visibility=global" UBSAN_OPTIONS='print_stacktrace=1'
       addons:
         apt:
           packages:
-            - clang-5.0
+            - clang-6.0
             - libstdc++-7-dev
             - libpng-dev
             - libjpeg-dev
             - libtiff5-dev
             - libraw-dev
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-5.0
 
     - os: osx
       env: COMPILER=clang++ VARIANT=debug TOOLSET=clang CXXSTD=11
@@ -187,7 +185,7 @@ matrix:
             - doxygen
 
   allow_failures:
-    - env: COMPILER=clang++-5.0 VARIANT=gil_ubsan_integer TOOLSET=clang CXXSTD=11 B2_OPTIONS="visibility=global" UBSAN_OPTIONS='print_stacktrace=1'
+    - env: COMPILER=clang++-6.0 VARIANT=gil_ubsan_integer TOOLSET=clang CXXSTD=11 B2_OPTIONS="visibility=global" UBSAN_OPTIONS='print_stacktrace=1'
 
 install:
   - |-

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 3.10)
 # Options
 #-----------------------------------------------------------------------------
 option(GIL_BUILD_EXAMPLES "Build examples" ON)
-option(GIL_BUILD_HEADERS_TESTS "Enable self-contained header tests" ON)
+option(GIL_BUILD_HEADER_TESTS "Enable self-contained header tests" ON)
 option(GIL_ENABLE_EXT_IO "Enable IO extension, tests and examples (require libjpeg, libpng, libtiff)" ON)
 option(GIL_ENABLE_EXT_NUMERIC "Enable Numeric extension, tests and examples" ON)
 option(GIL_ENABLE_EXT_TOOLBOX "Enable Toolbox extension, tests and examples" ON)
@@ -264,21 +264,10 @@ enable_testing()
 # On Boost regression builds, CMake does not run, but Boost.Build,
 # so the header tests are not enabled there either.
 if(DEFINED ENV{CI})
-  set(GIL_BUILD_HEADERS_TESTS OFF)
-endif()
-add_subdirectory(test)
-
-if(GIL_ENABLE_EXT_IO)
-  add_subdirectory(io/test)
+  set(GIL_BUILD_HEADER_TESTS OFF)
 endif()
 
-if(GIL_ENABLE_EXT_NUMERIC)
-  add_subdirectory(numeric/test)
-endif()
-
-if(GIL_ENABLE_EXT_TOOLBOX)
-  add_subdirectory(toolbox/test)
-endif()
+add_subdirectory(test)
 
 #-----------------------------------------------------------------------------
 # Examples

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -308,21 +308,21 @@ Run core tests only specifying location of directory with tests:
 
 ```shell
 cd libs/gil
-../../b2 -j8 test
+../../b2 -j8 test/core
 ```
 
 Run all tests for selected extension (from Boost root directory, as alternative):
 
 ```shell
-./b2 -j8 libs/gil/io/test
-./b2 -j8 libs/gil/numeric/test
-./b2 -j8 libs/gil/toolbox/test
+./b2 -j8 libs/gil/test/io
+./b2 -j8 libs/gil/test/numeric
+./b2 -j8 libs/gil/test/toolbox
 ```
 
 Run I/O extension tests bundled in target called `simple`:
 
 ```shell
-./b2 libs/gil/io/test//simple
+./b2 libs/gil/test/io//simple
 ```
 
 *TODO:* _Explain I/O dependencies (libjpeg, etc.)_

diff --git a/Jamfile b/Jamfile
@@ -1,80 +1,10 @@
-# Boost.GIL (Generic Image Library)
+#  Boost.Assign Library Jamfile
 #
-# Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
-# Copyright (c) 2018-2019 Mateusz Loskot <mateusz@loskot.net>
+#  Copyright (c) 2018 James E. King III
 #
-# Use, modification and distribution is subject to 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)
-
-import ../config/checks/config : requires ;
-import os ;
-
-# Avoid warnings flood on Travis CI, AppVeyor, CircleCI, Azure Pipelines
-if ! [ os.environ CI ] && ! [ os.environ AGENT_JOBSTATUS ]
-{
-    DEVELOPMENT_EXTRA_WARNINGS =
-      <toolset>msvc:<cxxflags>/W4
-      <toolset>gcc:<cxxflags>"-pedantic -Wcast-align -Wconversion -Wfloat-equal -Wshadow -Wsign-promo -Wstrict-aliasing -Wunused-parameter"
-      <toolset>clang,<variant>debug:<cxxflags>"-pedantic -Wcast-align -Wconversion -Wfloat-equal -Wshadow -Wsign-promo -Wstrict-aliasing -Wunused-parameter -Wsign-conversion"
-      <toolset>clang,<variant>release:<cxxflags>"-pedantic -Wcast-align -Wconversion -Wfloat-equal -Wshadow -Wsign-promo -Wstrict-aliasing -Wunused-parameter -Wsign-conversion"
-      <toolset>darwin:<cxxflags>"-pedantic -Wcast-align -Wconversion -Wfloat-equal -Wshadow -Wsign-promo -Wstrict-aliasing -Wunused-parameter"
-      ;
-}
-
-project
-    :
-    requirements
-        <toolset>msvc:<asynch-exceptions>on
-        <toolset>msvc:<cxxflags>/bigobj
-        <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
-        <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS
-        <toolset>msvc:<define>_CRT_NONSTDC_NO_DEPRECATE
-        <toolset>msvc:<define>NOMINMAX
-        <toolset>intel:<debug-symbols>off
-        <toolset>gcc:<cxxflags>"-fstrict-aliasing -Wextra"
-        <toolset>darwin:<cxxflags>"-fstrict-aliasing -Wextra"
-        # variant filter for clang is necessary to allow ubsan_* variants declare distinct set of <cxxflags>
-        <toolset>clang,<variant>debug:<cxxflags>"-fstrict-aliasing -Wextra"
-        <toolset>clang,<variant>release:<cxxflags>"-fstrict-aliasing -Wextra"
-        $(DEVELOPMENT_EXTRA_WARNINGS)
-        [ requires
-            cxx11_constexpr
-            cxx11_defaulted_functions
-            cxx11_template_aliases
-            cxx11_trailing_result_types  # implies decltype and auto
-            cxx11_variadic_templates
-        ]
-    ;
-
-variant gil_ubsan_integer
-    : release
-    :
-    <cxxflags>"-Wno-unused -fstrict-aliasing -fno-omit-frame-pointer -fsanitize=integer -fno-sanitize-recover=integer -fsanitize-blacklist=libs/gil/.ci/blacklist.supp"
-    <linkflags>"-fsanitize=integer"
-    <debug-symbols>on
-    <define>BOOST_USE_ASAN=1
-    ;
-
-variant gil_ubsan_nullability
-    : release
-    :
-    <cxxflags>"-Wno-unused -fstrict-aliasing -fno-omit-frame-pointer -fsanitize=nullability -fno-sanitize-recover=nullability -fsanitize-blacklist=libs/gil/.ci/blacklist.supp"
-    <linkflags>"-fsanitize=nullability"
-    <debug-symbols>on
-    <define>BOOST_USE_ASAN=1
-    ;
-
-variant gil_ubsan_undefined
-    : release
-    :
-    <cxxflags>"-Wno-unused -fstrict-aliasing -fno-omit-frame-pointer -fsanitize=undefined -fno-sanitize-recover=undefined -fsanitize-blacklist=libs/gil/.ci/blacklist.supp"
-    <linkflags>"-fsanitize=undefined"
-    <debug-symbols>on
-    <define>BOOST_USE_ASAN=1
-    ;
+#  Use, modification, and distribution are subject to 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)
 
+# please order by name to ease maintenance
 build-project test ;
-build-project numeric/test ;
-build-project toolbox/test ;
-build-project io/test ;
diff --git a/doc/io.rst b/doc/io.rst
@@ -267,7 +267,7 @@ The following code sample shows the usage::
                             , tag_t
                             > reader_t;
 
-    reader_t reader = make_scanline_reader( "C:/boost/libs/gil/io/test_images/tiff/test.tif", tag_t() );
+    reader_t reader = make_scanline_reader( "C:/boost/libs/gil/test/extension/io/images/tiff/test.tif", tag_t() );
 
     typedef rgba8_image_t image_t;
 

diff --git a/example/cmake/CMakeSettings.json b/example/cmake/CMakeSettings.json
@@ -20,11 +20,12 @@
       "ctestCommandArgs": "",
       "variables": [
         { "name": "Boost_ARCHITECTURE", "value": "-x64" },
-        { "name": "GIL_ENABLE_EXT_IO", "value": "OFF" },
-        { "name": "GIL_ENABLE_EXT_NUMERIC", "value": "OFF" },
-        { "name": "GIL_ENABLE_EXT_TOOLBOX", "value": "OFF" },
-        { "name": "GIL_BUILD_EXAMPLES", "value": "OFF" },
-        { "name": "GIL_BUILD_HEADERS_TESTS", "value": "OFF" },
+        { "name": "Boost_COMPILER", "value": "-vc142;-vc141" },
+        { "name": "GIL_ENABLE_EXT_IO", "value": "ON" },
+        { "name": "GIL_ENABLE_EXT_NUMERIC", "value": "ON" },
+        { "name": "GIL_ENABLE_EXT_TOOLBOX", "value": "ON" },
+        { "name": "GIL_BUILD_EXAMPLES", "value": "ON" },
+        { "name": "GIL_BUILD_HEADER_TESTS", "value": "OFF" },
         { "name": "GIL_DOWNLOAD_FINDBOOST", "value": "ON" },
         { "name": "GIL_USE_CONAN", "value": "ON" }
       ]
@@ -45,7 +46,7 @@
         { "name": "GIL_ENABLE_EXT_NUMERIC", "value": "OFF" },
         { "name": "GIL_ENABLE_EXT_TOOLBOX", "value": "OFF" },
         { "name": "GIL_BUILD_EXAMPLES", "value": "OFF" },
-        { "name": "GIL_BUILD_HEADERS_TESTS", "value": "OFF" },
+        { "name": "GIL_BUILD_HEADER_TESTS", "value": "OFF" },
         { "name": "GIL_DOWNLOAD_FINDBOOST", "value": "ON" },
         { "name": "GIL_USE_CONAN", "value": "ON" }
       ]
@@ -61,11 +62,15 @@
       "buildCommandArgs": "-v",
       "ctestCommandArgs": "",
       "variables": [
-        { "name": "GIL_ENABLE_EXT_IO", "value": "OFF" },
-        { "name": "GIL_ENABLE_EXT_NUMERIC", "value": "OFF" },
-        { "name": "GIL_ENABLE_EXT_TOOLBOX", "value": "OFF" },
-        { "name": "GIL_BUILD_EXAMPLES", "value": "OFF" },
-        { "name": "GIL_BUILD_HEADERS_TESTS", "value": "OFF" },
+        { "name": "Boost_DEBUG", "value": "ON" },
+        { "name": "Boost_ADDITIONAL_VERSIONS", "value": "1.71" },
+        { "name": "Boost_ARCHITECTURE", "value": "-x32" },
+        { "name": "Boost_COMPILER", "value": "-vc142;-vc141" },
+        { "name": "GIL_ENABLE_EXT_IO", "value": "ON" },
+        { "name": "GIL_ENABLE_EXT_NUMERIC", "value": "ON" },
+        { "name": "GIL_ENABLE_EXT_TOOLBOX", "value": "ON" },
+        { "name": "GIL_BUILD_EXAMPLES", "value": "ON" },
+        { "name": "GIL_BUILD_HEADER_TESTS", "value": "ON" },
         { "name": "GIL_DOWNLOAD_FINDBOOST", "value": "ON" },
         { "name": "GIL_USE_CONAN", "value": "ON" }
       ]
@@ -81,11 +86,15 @@
       "buildCommandArgs": "-v",
       "ctestCommandArgs": "",
       "variables": [
-        { "name": "GIL_ENABLE_EXT_IO", "value": "OFF" },
-        { "name": "GIL_ENABLE_EXT_NUMERIC", "value": "OFF" },
-        { "name": "GIL_ENABLE_EXT_TOOLBOX", "value": "OFF" },
-        { "name": "GIL_BUILD_EXAMPLES", "value": "OFF" },
-        { "name": "GIL_BUILD_HEADERS_TESTS", "value": "OFF" },
+        { "name": "Boost_DEBUG", "value": "ON" },
+        { "name": "Boost_ADDITIONAL_VERSIONS", "value": "1.71" },
+        { "name": "Boost_ARCHITECTURE", "value": "-x32" },
+        { "name": "Boost_COMPILER", "value": "-vc142;-vc141" },
+        { "name": "GIL_ENABLE_EXT_IO", "value": "ON" },
+        { "name": "GIL_ENABLE_EXT_NUMERIC", "value": "ON" },
+        { "name": "GIL_ENABLE_EXT_TOOLBOX", "value": "ON" },
+        { "name": "GIL_BUILD_EXAMPLES", "value": "ON" },
+        { "name": "GIL_BUILD_HEADER_TESTS", "value": "ON" },
         { "name": "GIL_DOWNLOAD_FINDBOOST", "value": "ON" },
         { "name": "GIL_USE_CONAN", "value": "ON" }
       ]

diff --git a/io/index.html b/io/index.html