diff --git a/.gitignore b/.gitignore index f16ee331e4..450dee9c5e 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,5 @@ graph_info.json # clangd compile_commands.json .clangd/ + +!build.jam diff --git a/Jamfile b/Jamfile deleted file mode 100644 index ee18a21f23..0000000000 --- a/Jamfile +++ /dev/null @@ -1,11 +0,0 @@ -# Boost.GIL Library Jamfile -# -# Copyright (c) 2018 James E. King III -# -# 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 example ; -build-project test ; diff --git a/build.jam b/build.jam new file mode 100644 index 0000000000..d5f59650b1 --- /dev/null +++ b/build.jam @@ -0,0 +1,34 @@ +# Copyright René Ferdinand Rivera Morell 2023-2024 +# 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) + +require-b2 5.2 ; + +constant boost_dependencies : + /boost/assert//boost_assert + /boost/concept_check//boost_concept_check + /boost/config//boost_config + /boost/container_hash//boost_container_hash + /boost/core//boost_core + /boost/filesystem//boost_filesystem + /boost/integer//boost_integer + /boost/iterator//boost_iterator + /boost/mp11//boost_mp11 + /boost/preprocessor//boost_preprocessor + /boost/type_traits//boost_type_traits + /boost/variant2//boost_variant2 ; + +project /boost/gil + : common-requirements + include + ; + +explicit + [ alias boost_gil : : : : $(boost_dependencies) ] + [ alias all : boost_gil example test ] + ; + +call-if : boost-library gil + ; + diff --git a/example/Jamfile b/example/Jamfile index ba4a6e81c2..6953c1b66d 100644 --- a/example/Jamfile +++ b/example/Jamfile @@ -6,7 +6,8 @@ # 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-search /boost/config/checks ; +import config : requires ; import regex ; using libjpeg : : : : true ; # work around bug on master @@ -22,6 +23,7 @@ local msvc-cxxs-with-experimental-fs = 14 ; project : requirements + /boost/gil//boost_gil [ requires cxx14_constexpr cxx14_return_type_deduction diff --git a/test/Jamfile b/test/Jamfile index 5c674a587f..ec206405e6 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -9,7 +9,8 @@ # 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-search /boost/config/checks ; +import config : requires ; import os ; import path ; import regex ; @@ -26,6 +27,7 @@ local msvc-cxxs-with-experimental-fs = 14 ; project : requirements + /boost/gil//boost_gil [ requires cxx11_constexpr cxx11_defaulted_functions @@ -83,21 +85,14 @@ rule generate_self_contained_headers ( headers_subpath * : exclude_subpaths * ) # NOTE: All '/' in test names are replaced with '-' because apparently # test scripts have a problem with test names containing slashes. - local top_headers_path = [ path.make $(BOOST_ROOT)/libs/gil/include/boost/gil ] ; - local headers_path = $(top_headers_path) ; - if $(headers_subpath) - { - headers_path = $(top_headers_path)/$(headers_subpath) ; - } - - for local file in [ path.glob-tree $(headers_path) : *.hpp : $(exclude_subpaths) ] + for local file in [ glob-tree-ex ../include/boost/gil : *.hpp : $(exclude_subpaths) ] { local target_no = [ sequence.length $(targets) ] ; - local rel_file = [ path.relative-to $(top_headers_path) $(file) ] ; + local rel_file = [ path.relative-to ../include/boost/gil $(file) ] ; local target_name = [ regex.replace h/$(target_no)/$(rel_file) "/" "-" ] ; local target_name = [ regex.replace $(target_name) "\.hpp" "" ] ; targets += [ - compile $(BOOST_ROOT)/libs/gil/test/header/main.cpp + compile header/main.cpp : "BOOST_GIL_TEST_HEADER=$(rel_file)" $(file) : $(target_name) ] ; diff --git a/test/core/algorithm/Jamfile b/test/core/algorithm/Jamfile index 99436eca72..aa51fa435f 100644 --- a/test/core/algorithm/Jamfile +++ b/test/core/algorithm/Jamfile @@ -10,6 +10,6 @@ import testing ; run for_each_pixel.cpp ; -run std_fill.cpp ; +run std_fill.cpp : : : /boost/array//boost_array ; run std_uninitialized_fill.cpp ; run extend_boundary.cpp ; diff --git a/test/legacy/Jamfile b/test/legacy/Jamfile index 048ab8c496..c987dd6312 100644 --- a/test/legacy/Jamfile +++ b/test/legacy/Jamfile @@ -17,7 +17,7 @@ import testing ; -run image.cpp sample_image.cpp error_if.cpp : : gil_reference_checksums.txt ; +run image.cpp sample_image.cpp error_if.cpp : : gil_reference_checksums.txt : /boost/crc//boost_crc ; run channel.cpp error_if.cpp ; run pixel.cpp error_if.cpp ; run pixel_iterator.cpp error_if.cpp ;