Merge branch 'develop'

.github/workflows/ci.yml

@@ -1,47 +1,56 @@
 # Copyright 2020 Evan Miller
 # Copyright 2020 Matt Borland
 # Copyright 2021 John Maddock
+# 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://boost.org/LICENSE_1_0.txt)
 
 name: CI
 on:
+  pull_request:
   push:
     branches:
       - master
       - develop
-  pull_request:
-  release:
-    types: [published, created, edited]
+      - feature/**
+      - modular
 jobs:
   ubuntu-jammy:
-    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        compiler: [ g++-12 ]
+        include:
+          - compiler: g++-12
+            toolset: gcc
+            os: ubuntu-latest
+    runs-on: ${{matrix.os}}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@main
         with:
           fetch-depth: '0'
       - uses: mstachniuk/ci-skip@v1
         with:
           commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[apple];[Apple];[APPLE]'
           commit-filter-separator: ';'
           fail-fast: true
-      - name: Set TOOLSET
-        run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV
       - name: Add repository
         run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test"
       - name: Install packages
         run: sudo apt install g++-12 git xsltproc docbook-xsl docbook-xml
       - name: Checkout main boost
-        run: git clone -b develop --depth 1 https://github.com/boostorg/boost.git ../boost-root
+        run: |
+          BOOST_GIT=https://github.com/${GITHUB_REPOSITORY/bcp/boost}.git
+          BOOST_BRANCH=develop && ( test "${GITHUB_REF_NAME}" == "master" || test "${GITHUB_REF_NAME}" == "modular" ) && BOOST_BRANCH=${GITHUB_REF_NAME} || true
+          echo "BOOST_GIT: ${BOOST_GIT}"
+          echo "BRANCH/TAG: ${BOOST_BRANCH}"
+          git clone -b "${BOOST_BRANCH}" --depth 1 "${BOOST_GIT}" '../boost-root'
       - name: Update tools/boostdep
         run: git submodule update --init
         working-directory: ../boost-root
       - name: Copy files
-        run: cp -r $GITHUB_WORKSPACE/* tools/bcp
+        run: |
+          rm -rf tools/bcp/*
+          cp -rv $GITHUB_WORKSPACE/* tools/bcp
         working-directory: ../boost-root
       - name: Bootstrap
         run: ./bootstrap.sh
@@ -50,7 +59,7 @@ jobs:
         run: ./b2 headers
         working-directory: ../boost-root
       - name: Generate user config
-        run: 'echo "using $TOOLSET : : ${{ matrix.compiler }} ;" > ~/user-config.jam'
+        run: 'echo "using ${{ matrix.toolset }} : : ${{ matrix.compiler }} ;" > ~/user-config.jam'
         working-directory: ../boost-root
       - name: Config info
         run: ./b2 libs/config/test//print_config_info

Jamfile.v2

@@ -1,36 +1,37 @@
 # (C) Copyright John Maddock 2006.
+# Copyright René Ferdinand Rivera Morell 2024
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
 
-exe bcp
-    :
-    add_dependent_lib.cpp add_path.cpp bcp_imp.cpp copy_path.cpp file_types.cpp
-    fileview.cpp main.cpp path_operations.cpp scan_cvs_path.cpp 
-    licence_info.cpp scan_licence.cpp output_licence_info.cpp
-    /boost/filesystem//boost_filesystem
-    /boost/regex//boost_regex
-    :
-    :
-    release
-    ;
+require-b2 5.2 ;
 
-install dist-bin
-    :
-    bcp
-    :
-    <install-type>EXE
-    <location>../../dist/bin
-    :
-    release
-    ;
+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/bcp ;
 
-install dist-lib
-    :
-    bcp
-    :
-    <install-type>LIB
-    <location>../../dist/lib
-    :
-    release
+explicit
+    [ exe bcp
+        :
+        add_dependent_lib.cpp add_path.cpp bcp_imp.cpp copy_path.cpp file_types.cpp
+        fileview.cpp main.cpp path_operations.cpp scan_cvs_path.cpp
+        licence_info.cpp scan_licence.cpp output_licence_info.cpp
+        /boost/filesystem//boost_filesystem
+        /boost/regex//boost_regex
+        :
+        : release ]
+    [ install dist-bin
+        : bcp/<link>static
+        : <install-type>EXE <location>$(DIST_DIR)/bin
+        : release ]
+    [ alias all : bcp test dist-bin ]
     ;
 
+# Install distribution files/execs by default.
+alias dist : dist-bin ;

add_dependent_lib.cpp

@@ -15,6 +15,7 @@
 #include "bcp_imp.hpp"
 #include "fileview.hpp"
 #include <boost/regex.hpp>
+#include <boost/filesystem/directory.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/exception.hpp>
 #include <iostream>
@@ -43,12 +44,12 @@ static void init_library_scanner(const fs::path& p, bool cvs_mode, const std::st
    //
    // Don't add files created by build system:
    //
-   if((p.leaf() == "bin") || (p.leaf() == "bin-stage"))
+   if((p.filename() == "bin") || (p.filename() == "bin-stage"))
       return; 
    //
    // Don't add version control directories:
    //
-   if((p.leaf() == "CVS") || (p.leaf() == ".svn"))
+   if((p.filename() == "CVS") || (p.filename() == ".svn"))
       return; 
    //
    // don't add directories not under version control: