diff --git a/Jamfile b/Jamfile index ebf64640d..e557478a8 100644 --- a/Jamfile +++ b/Jamfile @@ -9,6 +9,25 @@ # TODO: Remove -Wno-unused below once tests have been cleaned up, and no longer use of assert() macro, etc. +project boost-gil + : + requirements + # MSVC: Since VS2017, default is -std:c++14, so no explicit switch is required. + msvc:on + msvc:/W4 + msvc:/bigobj + msvc:_SCL_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE NOMINMAX + intel:off + # GCC default flags with warnings sugested by https://svn.boost.org/trac10/wiki/Guidelines/WarningsGuidelines + gcc:"-std=c++11 -pedantic -fstrict-aliasing -Wcast-align -Wconversion -Wextra -Wfloat-equal -Wshadow -Wsign-promo -Wstrict-aliasing -Wunused-parameter" + # GCC default flags extended with warnings suggested by https://svn.boost.org/trac10/ticket/4014 + #gcc:"-std=c++11 -pedantic -fstrict-aliasing -Wall -Wcast-align -Wconversion -Wctor-dtor-privacy -Wdisabled-optimization -Werror=non-virtual-dtor -Werror=return-type -Wextra -Wfloat-equal -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wmissing-noreturn -Wno-multichar -Woverloaded-virtual -Wpacked -Wredundant-decls -Wshadow -Wsign-promo -Wstrict-aliasing -Wswitch-default -Wundef -Wunused-parameter -Wwrite-strings" + # variant filter for clang is necessary to allow ubsan_* variants declare distinct set of + clang,debug:"-std=c++11 -pedantic -fstrict-aliasing -Wcast-align -Wconversion -Wextra -Wfloat-equal -Wshadow -Wsign-promo -Wstrict-aliasing -Wunused-parameter -Wsign-conversion" + clang,release:"-std=c++11 -pedantic -fstrict-aliasing -Wcast-align -Wconversion -Wextra -Wfloat-equal -Wshadow -Wsign-promo -Wstrict-aliasing -Wunused-parameter -Wsign-conversion" + darwin:"-std=c++11 -pedantic -fstrict-aliasing -Wcast-align -Wconversion -Wextra -Wfloat-equal -Wshadow -Wsign-promo -Wstrict-aliasing -Wunused-parameter " + ; + variant ubsan_integer : release : @@ -36,25 +55,6 @@ variant ubsan_undefined BOOST_USE_ASAN=1 ; -project boost-gil - : - requirements - # MSVC: Since VS2017, default is -std:c++14, so no explicit switch is required. - msvc:on - msvc:/W4 - msvc:/bigobj - msvc:_SCL_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE NOMINMAX - intel:off - # GCC default flags with warnings sugested by https://svn.boost.org/trac10/wiki/Guidelines/WarningsGuidelines - gcc:"-std=c++11 -pedantic -fstrict-aliasing -Wcast-align -Wconversion -Wextra -Wfloat-equal -Wshadow -Wsign-promo -Wstrict-aliasing -Wunused-parameter" - # GCC default flags extended with warnings suggested by https://svn.boost.org/trac10/ticket/4014 - #gcc:"-std=c++11 -pedantic -fstrict-aliasing -Wall -Wcast-align -Wconversion -Wctor-dtor-privacy -Wdisabled-optimization -Werror=non-virtual-dtor -Werror=return-type -Wextra -Wfloat-equal -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wmissing-noreturn -Wno-multichar -Woverloaded-virtual -Wpacked -Wredundant-decls -Wshadow -Wsign-promo -Wstrict-aliasing -Wswitch-default -Wundef -Wunused-parameter -Wwrite-strings" - # variant filter for clang is necessary to allow ubsan_* variants declare distinct set of - clang,debug:"-std=c++11 -pedantic -fstrict-aliasing -Wcast-align -Wconversion -Wextra -Wfloat-equal -Wshadow -Wsign-promo -Wstrict-aliasing -Wunused-parameter -Wsign-conversion" - clang,release:"-std=c++11 -pedantic -fstrict-aliasing -Wcast-align -Wconversion -Wextra -Wfloat-equal -Wshadow -Wsign-promo -Wstrict-aliasing -Wunused-parameter -Wsign-conversion" - darwin:"-std=c++11 -pedantic -fstrict-aliasing -Wcast-align -Wconversion -Wextra -Wfloat-equal -Wshadow -Wsign-promo -Wstrict-aliasing -Wunused-parameter " - ; - build-project example ; build-project test ; build-project numeric/test ; diff --git a/doc/Jamfile b/doc/Jamfile index 6a479be80..a1c6d3444 100644 --- a/doc/Jamfile +++ b/doc/Jamfile @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Stefan Seefeld +# Boost.GIL (Generic Image Library) - documentation # # 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) diff --git a/example/Jamfile b/example/Jamfile index b72149068..fe3d47c97 100644 --- a/example/Jamfile +++ b/example/Jamfile @@ -1,6 +1,5 @@ -# Boost.GIL (Generic Image Library) -# Controls building of Boost.GIL examples -# +# Boost.GIL (Generic Image Library) - examples +# # Copyright (c) 2018 Mateusz Loskot # # Use, modification and distribution is subject to the Boost Software License, diff --git a/io/doc/jamfile.v2 b/io/doc/Jamfile similarity index 86% rename from io/doc/jamfile.v2 rename to io/doc/Jamfile index 6bd00ecac..779628fbd 100644 --- a/io/doc/jamfile.v2 +++ b/io/doc/Jamfile @@ -1,4 +1,4 @@ -# Boost.GIL.IO +# Boost.GIL (Generic Image Library) - IO documentation # # Copyright (c) 2012 Christian Henning # @@ -6,10 +6,6 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) - -# Quickbook -# ----------------------------------------------------------------------------- - import quickbook ; using boostbook ; @@ -23,7 +19,7 @@ path-constant images_location : html ; boostbook standalone : io - : + : boost.root=../../../../.. boost.max.id.length=1024 toc.max.depth=4 diff --git a/io/test/Jamfile b/io/test/Jamfile index 5a31efba2..969c16db9 100644 --- a/io/test/Jamfile +++ b/io/test/Jamfile @@ -1,13 +1,13 @@ -# Boost.GIL.IO +# Boost.GIL (Generic Image Library) - IO tests +# +# Copyright (c) 2012 Christian Henning +# Copyright (c) 2017 Stefan Seefeld +# Copyright (c) 2012-2018 Mateusz Loskot # -# (C) Copyright 2012: Mateusz Loskot and Christian Henning -# (C) Copyright 2017: Stefan Seefeld # 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) +# (See accompanying file LICENSE_1_0.txt or +# copy at http://www.boost.org/LICENSE_1_0.txt) -# Please make sure to read readme.txt! - -# bring in rules for testing import testing ; import ac ; @@ -26,7 +26,7 @@ project /boost/filesystem//boost_filesystem ; -test-suite simple +alias simple : [ run all_formats_test.cpp : # args : # input files @@ -40,7 +40,7 @@ test-suite simple ] ; -test-suite full : +alias full : [ run bmp_test.cpp bmp_old_test.cpp bmp_read_test.cpp bmp_write_test.cpp ] [ run jpeg_test.cpp jpeg_old_test.cpp jpeg_read_test.cpp jpeg_write_test.cpp : diff --git a/numeric/doc/jamfile.v2 b/numeric/doc/Jamfile similarity index 54% rename from numeric/doc/jamfile.v2 rename to numeric/doc/Jamfile index 438686738..6d1786b9f 100644 --- a/numeric/doc/jamfile.v2 +++ b/numeric/doc/Jamfile @@ -1,4 +1,4 @@ -# Boost.GIL.Numeric +# Boost.GIL (Generic Image Library) - Numeric documentation # # Copyright (c) 2013 Christian Henning # @@ -6,10 +6,6 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) - -# Quickbook -# ----------------------------------------------------------------------------- - use-project boost : c:/boost ; using quickbook ; @@ -18,36 +14,36 @@ using boostbook ; # taken from http://boost.2283326.n4.nabble.com/Doxygen-Running-Doxygen-from-BB-td3657608.html doxygen reference.html - : - [ glob - ../../../../boost/gil/extension/numeric/*.hpp + : + [ glob + ../../../../boost/gil/extension/numeric/*.hpp ] - : + : "PROJECT_NAME=\"Boost GIL Numeric\"" "PROJECT_LOGO=\"$(BOOST_ROOT)/boost.png\"" #messages QUIET=YES WARN_IF_UNDOCUMENTED=YES WARN_IF_DOC_ERROR=YES - # input - JAVADOC_AUTOBRIEF=YES - EXTRACT_PRIVATE=NO - EXTRACT_STATIC=YES - HIDE_UNDOC_MEMBERS=YES - HIDE_UNDOC_CLASSES=YES - # output - HIDE_SCOPE_NAMES=YES - INLINE_INFO=NO - SORT_MEMBER_DOCS=NO - SHOW_DIRECTORIES=YES - SOURCE_BROWSER=YES - REFERENCED_BY_RELATION=NO - REFERENCES_RELATION=NO - REFERENCES_LINK_SOURCE=NO - VERBATIM_HEADERS=NO + # input + JAVADOC_AUTOBRIEF=YES + EXTRACT_PRIVATE=NO + EXTRACT_STATIC=YES + HIDE_UNDOC_MEMBERS=YES + HIDE_UNDOC_CLASSES=YES + # output + HIDE_SCOPE_NAMES=YES + INLINE_INFO=NO + SORT_MEMBER_DOCS=NO + SHOW_DIRECTORIES=YES + SOURCE_BROWSER=YES + REFERENCED_BY_RELATION=NO + REFERENCES_RELATION=NO + REFERENCES_LINK_SOURCE=NO + VERBATIM_HEADERS=NO HIDE_UNDOC_RELATIONS=NO "EXCLUDE_SYMBOLS = \"detail::*\"" - ; + ; xml toolbox : numeric.qbk ; diff --git a/numeric/test/Jamfile b/numeric/test/Jamfile index cec6469e2..c1b2b196e 100644 --- a/numeric/test/Jamfile +++ b/numeric/test/Jamfile @@ -1,11 +1,11 @@ -# Boost.GIL.Numeric +# Boost.GIL (Generic Image Library) - Numeric tests # -# (C) Copyright 2013: Christian Henning +# Copyright (c) 2013 Christian Henning # # 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) +# (See accompanying file LICENSE_1_0.txt or +# copy at http://www.boost.org/LICENSE_1_0.txt) -# bring in rules for testing import testing ; project @@ -14,11 +14,4 @@ project /boost/test//boost_unit_test_framework ; -test-suite "gil::numeric" - : - [ run - # sources - test.cpp - numeric.cpp - ] - ; +run numeric.cpp ; diff --git a/numeric/test/numeric.cpp b/numeric/test/numeric.cpp index 61a5e29bb..99cb1d9fb 100644 --- a/numeric/test/numeric.cpp +++ b/numeric/test/numeric.cpp @@ -13,6 +13,7 @@ #include #include +#define BOOST_TEST_MAIN #include using namespace boost; diff --git a/numeric/test/test.cpp b/numeric/test/test.cpp deleted file mode 100644 index 8034bf679..000000000 --- a/numeric/test/test.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#define BOOST_TEST_MAIN -#include diff --git a/test/Jamfile b/test/Jamfile index 6073bb6ef..8dfe441c9 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -1,32 +1,30 @@ -# Boost.GIL +# Boost.GIL (Generic Image Library) - tests # -# (C) Copyright 2008: Lubomir Bourdev and Hailin Jin +# Copyright (c) 2008 Lubomir Bourdev, Hailin Jin +# Copyright (c) 2018 Mateusz Loskot # # 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) -# bring in rules for testing import testing ; project : requirements $(BOOST_ROOT) . - /boost/filesystem//boost_filesystem ; -test-suite "boost-gil-test" : - [ run promote_integral.cpp ] - [ run image.cpp sample_image.cpp error_if.cpp - : - : gil_reference_checksums.txt - : - ] - [ run channel.cpp error_if.cpp ] - [ run pixel.cpp error_if.cpp ] - [ run pixel_iterator.cpp error_if.cpp ] +run promote_integral.cpp ; +run image.cpp sample_image.cpp error_if.cpp : : gil_reference_checksums.txt ; +run channel.cpp error_if.cpp ; +run pixel.cpp error_if.cpp ; +run pixel_iterator.cpp error_if.cpp ; + +alias perf : + [ run performance.cpp ] ; +explicit perf ; build-project channel ; build-project image_view ; diff --git a/test/channel/Jamfile b/test/channel/Jamfile index 63e64a2db..78d86f3f2 100644 --- a/test/channel/Jamfile +++ b/test/channel/Jamfile @@ -1,6 +1,6 @@ -# Boost.GIL +# Boost.GIL (Generic Image Library) - tests # -# Copyright (c) 2018 Mateusz Loskot +# Copyright (c) 2018 Mateusz Loskot # # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or @@ -14,15 +14,12 @@ project .. ; -test-suite "boost-gil-test-channel" - : - [ compile channel_concepts.cpp ] - [ run channel_test_fixture.cpp ] - [ run channel_traits.cpp ] - [ run scoped_channel_value.cpp ] - [ run algorithm_channel_arithmetic.cpp ] - [ run algorithm_channel_convert.cpp ] - [ run algorithm_channel_invert.cpp ] - [ run algorithm_channel_multiply.cpp ] - [ run algorithm_channel_relation.cpp ] - ; +compile channel_concepts.cpp ; +run channel_test_fixture.cpp ; +run channel_traits.cpp ; +run scoped_channel_value.cpp ; +run algorithm_channel_arithmetic.cpp ; +run algorithm_channel_convert.cpp ; +run algorithm_channel_invert.cpp ; +run algorithm_channel_multiply.cpp ; +run algorithm_channel_relation.cpp ; diff --git a/test/image_view/Jamfile b/test/image_view/Jamfile index dc4d235b5..7b77f0400 100644 --- a/test/image_view/Jamfile +++ b/test/image_view/Jamfile @@ -1,6 +1,6 @@ -# Boost.GIL +# Boost.GIL (Generic Image Library) - tests # -# Copyright (c) 2018 Mateusz Loskot +# Copyright (c) 2018 Mateusz Loskot # # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or @@ -14,8 +14,5 @@ project .. ; -test-suite "boost-gil-test-image-view" - : - [ compile image_view_concepts.cpp ] - [ run collection.cpp ] - ; +compile image_view_concepts.cpp ; +run collection.cpp ; diff --git a/toolbox/doc/jamfile.v2 b/toolbox/doc/Jamfile similarity index 59% rename from toolbox/doc/jamfile.v2 rename to toolbox/doc/Jamfile index a3226b574..33c5e59a9 100644 --- a/toolbox/doc/jamfile.v2 +++ b/toolbox/doc/Jamfile @@ -1,4 +1,4 @@ -# Boost.GIL.ToolBox +# Boost.GIL (Generic Image Library) - Toolbox documentation # # Copyright (c) 2012 Christian Henning # @@ -6,10 +6,6 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) - -# Quickbook -# ----------------------------------------------------------------------------- - use-project boost : c:/boost ; using quickbook ; @@ -18,40 +14,40 @@ using boostbook ; # taken from http://boost.2283326.n4.nabble.com/Doxygen-Running-Doxygen-from-BB-td3657608.html doxygen reference.html - : - [ glob - ../../../../boost/gil/extension/toolbox/*.hpp - ../../../../boost/gil/extension/toolbox/color_converters/*.hpp - ../../../../boost/gil/extension/toolbox/color_spaces/*.hpp + : + [ glob + ../../../../boost/gil/extension/toolbox/*.hpp + ../../../../boost/gil/extension/toolbox/color_converters/*.hpp + ../../../../boost/gil/extension/toolbox/color_spaces/*.hpp ../../../../boost/gil/extension/toolbox/image_types/*.hpp ../../../../boost/gil/extension/toolbox/metafunctions/*.hpp ] - : + : "PROJECT_NAME=\"Boost GIL Toolbox\"" "PROJECT_LOGO=\"$(BOOST_ROOT)/boost.png\"" #messages QUIET=YES WARN_IF_UNDOCUMENTED=YES WARN_IF_DOC_ERROR=YES - # input - JAVADOC_AUTOBRIEF=YES - EXTRACT_PRIVATE=NO - EXTRACT_STATIC=YES - HIDE_UNDOC_MEMBERS=YES - HIDE_UNDOC_CLASSES=YES - # output - HIDE_SCOPE_NAMES=YES - INLINE_INFO=NO - SORT_MEMBER_DOCS=NO - SHOW_DIRECTORIES=YES - SOURCE_BROWSER=YES - REFERENCED_BY_RELATION=NO - REFERENCES_RELATION=NO - REFERENCES_LINK_SOURCE=NO - VERBATIM_HEADERS=NO + # input + JAVADOC_AUTOBRIEF=YES + EXTRACT_PRIVATE=NO + EXTRACT_STATIC=YES + HIDE_UNDOC_MEMBERS=YES + HIDE_UNDOC_CLASSES=YES + # output + HIDE_SCOPE_NAMES=YES + INLINE_INFO=NO + SORT_MEMBER_DOCS=NO + SHOW_DIRECTORIES=YES + SOURCE_BROWSER=YES + REFERENCED_BY_RELATION=NO + REFERENCES_RELATION=NO + REFERENCES_LINK_SOURCE=NO + VERBATIM_HEADERS=NO HIDE_UNDOC_RELATIONS=NO "EXCLUDE_SYMBOLS = \"detail::*\"" - ; + ; xml toolbox : toolbox.qbk ; diff --git a/toolbox/test/Jamfile b/toolbox/test/Jamfile index ccb44e3e9..0cb62be3c 100644 --- a/toolbox/test/Jamfile +++ b/toolbox/test/Jamfile @@ -1,11 +1,11 @@ -# Boost.GIL.ToolBox +# Boost.GIL (Generic Image Library) - Toolbox tests # -# (C) Copyright 2012: Mateusz Loskot and Christian Henning +# Copyright (c) 2012 Christian Henning +# Copyright (c) 2012 Mateusz Loskot # # 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) -# bring in rules for testing import testing ; project @@ -14,31 +14,22 @@ project /boost/test//boost_unit_test_framework ; -test-suite "gil::toolbox" : - [ run - # sources - test.cpp - channel_type.cpp - channel_view.cpp - cmyka.cpp - get_num_bits.cpp - get_pixel_type.cpp - gray_alpha.cpp - gray_to_rgba.cpp - hsl_hsv_test.cpp - indexed_image_test.cpp - is_bit_aligned.cpp - is_homogeneous.cpp - is_similar.cpp - lab_test.cpp - pixel_bit_size.cpp - rgb_to_luminance.cpp - xyz_test.cpp - : # args - : # input-files - : # requirements - : # target-name - gil_io_new_tests - : # default-build - ] +run + test.cpp + channel_type.cpp + channel_view.cpp + cmyka.cpp + get_num_bits.cpp + get_pixel_type.cpp + gray_alpha.cpp + gray_to_rgba.cpp + hsl_hsv_test.cpp + indexed_image_test.cpp + is_bit_aligned.cpp + is_homogeneous.cpp + is_similar.cpp + lab_test.cpp + pixel_bit_size.cpp + rgb_to_luminance.cpp + xyz_test.cpp ;