From 7e35a2dd442485a9f2e3cb7e8cbcda7e34525cd5 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 24 Mar 2024 18:24:56 -0500 Subject: [PATCH 1/5] Tweaks to normalize tool modular building. --- build.jam | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 00000000..a22561ba --- /dev/null +++ b/build.jam @@ -0,0 +1,29 @@ +# Copyright René Ferdinand Rivera Morell 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) + +import option ; +import path ; + +local DIST_DIR = [ option.get distdir ] ; +DIST_DIR ?= [ option.get build-dir ] ; +DIST_DIR ?= [ path.join $(BOOST_ROOT) dist ] ; +DIST_DIR ?= dist ; +DIST_DIR = [ path.root [ path.make $(DIST_DIR) ] [ path.pwd ] ] ; + +project /boost/boostbook + ; + +local patterns = *.dtd *.xml *.xsl LICENSE ; +local dirs = dtd xsl ; + +explicit + [ install dist-share + : [ glob $(dirs)/$(patterns) $(dirs)/*/$(patterns) + $(dirs)/*/*/$(patterns) ] + : $(DIST_DIR)/share . ] + [ alias dist : dist-share ] + [ alias boostbook ] + [ alias all : boostbook dist ] + ; From fd987fa521a5734d242578bf64a42df7f5ee466c Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Apr 2024 22:51:42 -0500 Subject: [PATCH 2/5] Build the dist target for tools by default. --- build.jam | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build.jam b/build.jam index a22561ba..bd162b06 100644 --- a/build.jam +++ b/build.jam @@ -12,8 +12,7 @@ DIST_DIR ?= [ path.join $(BOOST_ROOT) dist ] ; DIST_DIR ?= dist ; DIST_DIR = [ path.root [ path.make $(DIST_DIR) ] [ path.pwd ] ] ; -project /boost/boostbook - ; +project /boost/boostbook ; local patterns = *.dtd *.xml *.xsl LICENSE ; local dirs = dtd xsl ; @@ -23,7 +22,9 @@ explicit : [ glob $(dirs)/$(patterns) $(dirs)/*/$(patterns) $(dirs)/*/*/$(patterns) ] : $(DIST_DIR)/share . ] - [ alias dist : dist-share ] [ alias boostbook ] - [ alias all : boostbook dist ] + [ alias all : boostbook dist-share ] ; + +# Install distribution files/execs by default. +alias dist : dist-share ; From 7ea884e5d4cca4c141dac134f288f1e8a66bf4d1 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:01:16 -0500 Subject: [PATCH 3/5] Add requires-b2 check to top-level build file. --- build.jam | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.jam b/build.jam index bd162b06..906c60c9 100644 --- a/build.jam +++ b/build.jam @@ -3,6 +3,8 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +require-b2 5.1 ; + import option ; import path ; From 2de3b2b0e99e909f430722580fe6008d1ef382c0 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:52:12 -0500 Subject: [PATCH 4/5] Bump B2 require to 5.2 --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 906c60c9..53c323ce 100644 --- a/build.jam +++ b/build.jam @@ -3,7 +3,7 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) -require-b2 5.1 ; +require-b2 5.2 ; import option ; import path ; From afa2ebcdc5f1feb4c6dc362c05e80dda63185675 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Wed, 24 Jul 2024 07:56:07 -0500 Subject: [PATCH 5/5] Simplify xslt files install glob. --- build.jam | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/build.jam b/build.jam index 53c323ce..1b417673 100644 --- a/build.jam +++ b/build.jam @@ -16,13 +16,9 @@ DIST_DIR = [ path.root [ path.make $(DIST_DIR) ] [ path.pwd ] ] ; project /boost/boostbook ; -local patterns = *.dtd *.xml *.xsl LICENSE ; -local dirs = dtd xsl ; - explicit [ install dist-share - : [ glob $(dirs)/$(patterns) $(dirs)/*/$(patterns) - $(dirs)/*/*/$(patterns) ] + : [ glob-tree-ex dtd xsl : *.dtd *.xml *.xsl LICENSE ] : $(DIST_DIR)/share . ] [ alias boostbook ] [ alias all : boostbook dist-share ]