Subject: [Boost-commit] svn:boost r64697 - branches/release/tools/bcp
From: john_at_[hidden]
Date: 2010-08-09 12:45:22
Author: johnmaddock
Date: 2010-08-09 12:45:17 EDT (Mon, 09 Aug 2010)
New Revision: 64697
URL: http://svn.boost.org/trac/boost/changeset/64697
Log:
Merges patches from Trunk.
Text files modified:
branches/release/tools/bcp/add_path.cpp | 43 ++++++++++++++++---------------
branches/release/tools/bcp/copy_path.cpp | 55 ++++++++++++++++++++++++++++++++-------
branches/release/tools/bcp/fileview.cpp | 2
3 files changed, 68 insertions(+), 32 deletions(-)
Modified: branches/release/tools/bcp/add_path.cpp
==============================================================================
--- branches/release/tools/bcp/add_path.cpp (original)
+++ branches/release/tools/bcp/add_path.cpp 2010-08-09 12:45:17 EDT (Mon, 09 Aug 2010)
@@ -71,10 +71,11 @@
std::string s(i->string());
if(m_boost_path.string().size())
s.erase(0, m_boost_path.string().size() + 1);
- if(!m_dependencies.count(fs::path(s)))
+ fs::path np = s;
+ if(!m_dependencies.count(np))
{
- m_dependencies[fs::path(s)] = p; // set up dependency tree
- add_path(fs::path(s));
+ m_dependencies[np] = p; // set up dependency tree
+ add_path(np);
}
++i;
}
@@ -290,6 +291,24 @@
continue;
}
include_file = i->str();
+ fs::path test_file(m_boost_path / p.branch_path() / include_file);
+ if(fs::exists(test_file) && !fs::is_directory(test_file) && (p.branch_path().string() != "boost"))
+ {
+ if(!m_dependencies.count(p.branch_path() / include_file))
+ {
+ m_dependencies[p.branch_path() / include_file] = p;
+ add_path(p.branch_path() / include_file);
+ }
+ }
+ else if(fs::exists(m_boost_path / include_file))
+ {
+ if(!m_dependencies.count(include_file))
+ {
+ m_dependencies[include_file] = p;
+ add_path(include_file);
+ }
+ }
+ ++i;
}
catch(const fs::filesystem_error&)
{
@@ -297,24 +316,6 @@
++i;
continue;
}
- fs::path test_file(m_boost_path / p.branch_path() / include_file);
- if(fs::exists(test_file) && !fs::is_directory(test_file) && (p.branch_path().string() != "boost"))
- {
- if(!m_dependencies.count(p.branch_path() / include_file))
- {
- m_dependencies[p.branch_path() / include_file] = p;
- add_path(p.branch_path() / include_file);
- }
- }
- else if(fs::exists(m_boost_path / include_file))
- {
- if(!m_dependencies.count(include_file))
- {
- m_dependencies[include_file] = p;
- add_path(include_file);
- }
- }
- ++i;
}
//
// Now we need to scan for Boost.Preprocessor includes that
Modified: branches/release/tools/bcp/copy_path.cpp
==============================================================================
--- branches/release/tools/bcp/copy_path.cpp (original)
+++ branches/release/tools/bcp/copy_path.cpp 2010-08-09 12:45:17 EDT (Mon, 09 Aug 2010)
@@ -58,7 +58,33 @@
//
// do text based copy if requested:
//
- if(m_namespace_name.size() && m_lib_names.size() && is_jam_file(p))
+ if(p.leaf() == "Jamroot")
+ {
+ static std::vector<char> v1, v2;
+ v1.clear();
+ v2.clear();
+ std::ifstream is((m_boost_path / p).native_file_string().c_str());
+ std::copy(std::istreambuf_iterator<char>(is), std::istreambuf_iterator<char>(), std::back_inserter(v1));
+
+ static boost::regex libname_matcher;
+ if(libname_matcher.empty())
+ {
+ libname_matcher.assign("boost_");
+ }
+
+ regex_replace(std::back_inserter(v2), v1.begin(), v1.end(), libname_matcher, m_namespace_name + "_");
+ std::swap(v1, v2);
+ v2.clear();
+
+ std::ofstream os;
+ if(m_unix_lines)
+ os.open((m_dest_path / p).native_file_string().c_str(), std::ios_base::binary | std::ios_base::out);
+ else
+ os.open((m_dest_path / p).native_file_string().c_str(), std::ios_base::out);
+ os.write(&*v1.begin(), v1.size());
+ os.close();
+ }
+ else if(m_namespace_name.size() && m_lib_names.size() && is_jam_file(p))
{
static std::vector<char> v1, v2;
v1.clear();
@@ -106,25 +132,33 @@
static const boost::regex namespace_matcher(
"(?|"
- "(namespace\\s+)boost(_\\w+)?"
+ "(namespace\\s+)boost(_\\w+)?(?:(\\s*::\\s*)phoenix)?"
"|"
"(namespace\\s+)(adstl|phoenix|rapidxml)\\>"
"|"
- "()boost((?:_\\w+)?\\s*(?:::|,|\\)))"
+ "()\\<boost((?:_(?!intrusive_tags)\\w+)?\\s*(?:::))(?:(\\s*)phoenix)?"
"|"
- "()((?:adstl|phoenix|rapidxml)\\s*(?:::|,|\\)))"
+ "()\\<((?:adstl|phoenix|rapidxml)\\s*(?:::))"
"|"
- "(namespace\\s+\\w+\\s*=\\s*(?:::\\s*)?)boost(_\\w+)?"
+ "(namespace\\s+\\w+\\s*=\\s*(?:::\\s*)?)boost(_\\w+)?(?:(\\s*::\\s*)phoenix)?"
"|"
- "(namespace\\s+\\w+\\s*=\\s*(?:::\\s*)?)(adstl|phoenix|rapidxml)\\>"
+ "(namespace\\s+\\w+\\s*=\\s*(?:::\\s*)?(?:\\w+\\s*::\\s*)?)(adstl|phoenix|rapidxml)\\>"
"|"
- "(^\\s*#\\s*define[^\\n]+)boost((?:_\\w+)?\\s*)$"
+ "(^\\s*#\\s*define\\s+\\w+\\s+)boost((?:_\\w+)?\\s*)$"
"|"
"(^\\s*#\\s*define[^\\n]+)((?:adstl|phoenix|rapidxml)\\s*)$"
+ "|"
+ "()boost(_asio_detail_posix_thread_function|_regex_free_static_mutex)"
+ "|"
+ "()(lw_thread_routine|at_thread_exit|on_process_enter|on_process_exit|on_thread_enter|on_thread_exit|tss_cleanup_implemented)"
+ "|"
+ "(BOOST_CLASS_REQUIRE4?[^;]*)boost((?:_\\w+)?\\s*,)"
+ "|"
+ "(\\(\\s*)boost(\\s*\\))"
")"
- );
+ );
- regex_replace(std::back_inserter(v2), v1.begin(), v1.end(), namespace_matcher, "$1" + m_namespace_name + "$2");
+ regex_replace(std::back_inserter(v2), v1.begin(), v1.end(), namespace_matcher, "$1" + m_namespace_name + "$2(?3$3" + m_namespace_name + "phoenix)", boost::regex_constants::format_all);
std::swap(v1, v2);
v2.clear();
@@ -171,7 +205,8 @@
os.open((m_dest_path / p).native_file_string().c_str(), std::ios_base::binary | std::ios_base::out);
else
os.open((m_dest_path / p).native_file_string().c_str(), std::ios_base::out);
- os.write(&*v1.begin(), v1.size());
+ if(v1.size())
+ os.write(&*v1.begin(), v1.size());
os.close();
}
else if(m_unix_lines && !is_binary_file(p))
Modified: branches/release/tools/bcp/fileview.cpp
==============================================================================
--- branches/release/tools/bcp/fileview.cpp (original)
+++ branches/release/tools/bcp/fileview.cpp 2010-08-09 12:45:17 EDT (Mon, 09 Aug 2010)
@@ -73,7 +73,7 @@
// iterators:
fileview::const_iterator fileview::begin() const
{
- return &(pimpl->m_data[0]);
+ return pimpl->m_data.size() ? &(pimpl->m_data[0]) : 0;
}
fileview::const_iterator fileview::end() const