From 3d415740ddff137b20c48cdf71539da3a6ee8d61 Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Mon, 15 Sep 2014 20:32:00 +0400 Subject: [PATCH 1/2] Make sure all headers are installed before build Add /boost//headers as a common dependency for all testing tools. The implicit dependency that was used before didn't work: http://boost.2283326.n4.nabble.com/testing-mpl-core-tests-not-visible-tt4667495.html#a4667510 --- tools/regression/build/Jamroot.jam | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/tools/regression/build/Jamroot.jam b/tools/regression/build/Jamroot.jam index 46719d41f88..a6b2d5527b5 100644 --- a/tools/regression/build/Jamroot.jam +++ b/tools/regression/build/Jamroot.jam @@ -1,4 +1,3 @@ -# Regression test status reporting tools build Jamfile # Copyright Rene Rivera @@ -16,28 +15,30 @@ else use-project /boost : [ MATCH --boost=(.*) : [ modules.peek : ARGV ] ] ; } +local source_location ; if ! [ glob ../src/process_jam_log.cpp ] { - project boost/regression - : - source-location .. - ; + source_location = .. ; } else { - project boost/regression - : - source-location ../src - ; + source_location = ../src ; } +project boost/regression + : + source-location $(source_location) + : + requirements + /boost//headers + ; + obj tiny_xml : detail/tiny_xml.cpp : BOOST_ALL_NO_LIB=1 _CRT_SECURE_NO_WARNINGS - /boost//headers : release ; @@ -51,7 +52,6 @@ exe process_jam_log : BOOST_ALL_NO_LIB=1 _CRT_SECURE_NO_WARNINGS - /boost//headers : release ; @@ -64,7 +64,6 @@ exe compiler_status /boost/filesystem//boost_filesystem/static : BOOST_ALL_NO_LIB=1 - /boost//headers : release ; @@ -77,7 +76,6 @@ exe library_status /boost/filesystem//boost_filesystem/static : BOOST_ALL_NO_LIB=1 - /boost//headers : release ; @@ -94,7 +92,6 @@ exe boost_report /boost//iostreams/static : BOOST_ALL_NO_LIB=1 - /boost//headers : release ; From 1389861d709907eb9019316015d17413ee80b496 Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Mon, 15 Sep 2014 20:35:18 +0400 Subject: [PATCH 2/2] Restore header comment --- tools/regression/build/Jamroot.jam | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/regression/build/Jamroot.jam b/tools/regression/build/Jamroot.jam index a6b2d5527b5..7ba2abae6c3 100644 --- a/tools/regression/build/Jamroot.jam +++ b/tools/regression/build/Jamroot.jam @@ -1,9 +1,10 @@ +# Regression test status reporting tools build Jamfile # Copyright Rene Rivera # Distributed under the Boost Software License, Version 1.0. # See http://www.boost.org/LICENSE_1_0.txt - + if [ glob ../../../boost-build.jam ] {