boostorg/bcp
1
0
Fork 0
mirror of https://github.com/boostorg/bcp.git synced 2026-07-21 13:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add dep scanning for modular top lib jamfile.

Browse Source
This commit is contained in:
Rene Rivera
2024-03-27 00:55:52 -05:00
parent 6384f9078d
commit 56f4d37e2c
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
add_path.cpp
+18 -1
View File
@@ -1,6 +1,7 @@
/*
*
* Copyright (c) 2003 Dr John Maddock
* Copyright René Ferdinand Rivera Morell 2023
* Use, modification and distribution is 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)
@@ -107,7 +108,23 @@ void bcp_implementation::add_file(const fs::path& p)
{
add_file_dependencies(p, false);
}
if(is_jam_file(p) && m_namespace_name.size() && ((std::distance(p.begin(), p.end()) < 3) || (*p.begin() != "tools") || (*++p.begin() != "build")))
if(is_jam_file(p) && *p.begin() == "libs" && (std::distance(p.begin(), p.end()) == 3))
{
//
// Modular libs top jamfile has references to all the user level
// dependent libraries to also include.
//
static const boost::regex e(">/boost/([a-zA-Z_]+)");
fileview view(m_boost_path / p);
boost::regex_token_iterator<const char*> i(view.begin(), view.end(), e, 1);
boost::regex_token_iterator<const char*> j;
while(i != j)
{
m_lib_names.insert(*i);
++i;
}
}
else if(is_jam_file(p) && m_namespace_name.size() && ((std::distance(p.begin(), p.end()) < 3) || (*p.begin() != "tools") || (*++p.begin() != "build")))
{
//
// We're doing a rename of namespaces and library names
file_types.cpp
+4 -4
View File
@@ -1,8 +1,8 @@
/*
*
* Copyright (c) 2003 Dr John Maddock
* Use, modification and distribution is subject to the
* Boost Software License, Version 1.0. (See accompanying file
* Use, modification and distribution is 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)
*
* This file implements the following:
@@ -20,7 +20,7 @@ bool bcp_implementation::is_source_file(const fs::path& p)
".*\\."
"(?:"
"c|cxx|h|hxx|inc|inl|.?pp|yy?"
")",
")",
boost::regex::perl | boost::regex::icase
);
return boost::regex_match(p.filename().generic_string(), e);
@@ -64,7 +64,7 @@ bool bcp_implementation::is_jam_file(const fs::path& p)
"jam|v2"
")"
"|"
"(Jamfile|Jamroot)\\.?",
"(Jamfile|Jamroot)\\.?",
boost::regex::perl | boost::regex::icase
);
return boost::regex_match(p.filename().generic_string(), e);