Subject: [Boost-commit] svn:boost r67493 - in trunk/tools/inspect: . build
From: bdawes_at_[hidden]
Date: 2010-12-29 15:24:08
Author: bemandawes
Date: 2010-12-29 15:23:58 EST (Wed, 29 Dec 2010)
New Revision: 67493
URL: http://svn.boost.org/trac/boost/changeset/67493
Log:
Upgrade inspect for Filesystem V3
Text files modified:
trunk/tools/inspect/apple_macro_check.cpp | 2 +-
trunk/tools/inspect/assert_macro_check.cpp | 2 +-
trunk/tools/inspect/build/Jamfile.v2 | 15 +++++++++++++--
trunk/tools/inspect/cvs_iterator.hpp | 2 +-
trunk/tools/inspect/inspect.cpp | 11 +++++------
trunk/tools/inspect/link_check.cpp | 4 ++--
trunk/tools/inspect/path_name_check.cpp | 2 +-
7 files changed, 24 insertions(+), 14 deletions(-)
Modified: trunk/tools/inspect/apple_macro_check.cpp
==============================================================================
--- trunk/tools/inspect/apple_macro_check.cpp (original)
+++ trunk/tools/inspect/apple_macro_check.cpp 2010-12-29 15:23:58 EST (Wed, 29 Dec 2010)
@@ -64,7 +64,7 @@
// Only check files in the boost directory, as we can avoid including the
// apple test headers elsewhere.
- path relative( relative_to( full_path, fs::initial_path() ), fs::no_check );
+ path relative( relative_to( full_path, fs::initial_path() ) );
if ( relative.empty() || *relative.begin() != "boost") return;
boost::sregex_iterator cur(contents.begin(), contents.end(), apple_macro_regex), end;
Modified: trunk/tools/inspect/assert_macro_check.cpp
==============================================================================
--- trunk/tools/inspect/assert_macro_check.cpp (original)
+++ trunk/tools/inspect/assert_macro_check.cpp 2010-12-29 15:23:58 EST (Wed, 29 Dec 2010)
@@ -70,7 +70,7 @@
// Check files iff (a) they are in the boost directory, or (b) they
// are in the src directory under libs.
if (m_from_boost_root) {
- path relative( relative_to( full_path, fs::initial_path() ), fs::no_check );
+ path relative( relative_to( full_path, fs::initial_path() ) );
path::const_iterator pbeg = relative.begin(), pend = relative.end();
if (pbeg != std::find(pbeg, pend, "boost") &&
!(pbeg == std::find(pbeg, pend, "libs") && pend != std::find(pbeg, pend, "src")))
Modified: trunk/tools/inspect/build/Jamfile.v2
==============================================================================
--- trunk/tools/inspect/build/Jamfile.v2 (original)
+++ trunk/tools/inspect/build/Jamfile.v2 2010-12-29 15:23:58 EST (Wed, 29 Dec 2010)
@@ -14,8 +14,19 @@
exe inspect
:
- inspect.cpp license_check.cpp link_check.cpp path_name_check.cpp tab_check.cpp crlf_check.cpp end_check.cpp unnamed_namespace_check.cpp ascii_check.cpp
- copyright_check.cpp minmax_check.cpp apple_macro_check.cpp assert_macro_check.cpp
+ apple_macro_check.cpp
+ ascii_check.cpp
+ assert_macro_check.cpp
+ copyright_check.cpp
+ crlf_check.cpp
+ end_check.cpp
+ inspect.cpp
+ license_check.cpp
+ link_check.cpp
+ minmax_check.cpp
+ path_name_check.cpp
+ tab_check.cpp
+ unnamed_namespace_check.cpp
/boost//filesystem/<link>static
/boost//regex/<link>static
:
Modified: trunk/tools/inspect/cvs_iterator.hpp
==============================================================================
--- trunk/tools/inspect/cvs_iterator.hpp (original)
+++ trunk/tools/inspect/cvs_iterator.hpp 2010-12-29 15:23:58 EST (Wed, 29 Dec 2010)
@@ -62,7 +62,7 @@
} while ( contents == "D" );
if ( contents[0] == 'D' ) contents.erase( 0, 1 );
value_path = dir_path
- / boost::filesystem::path( contents.substr( 1, contents.find( '/', 1 ) ), boost::filesystem::no_check );
+ / boost::filesystem::path( contents.substr( 1, contents.find( '/', 1 ) ) );
// in case entries file is mistaken, do until value_path actually found
} while ( !boost::filesystem::exists( value_path ) );
Modified: trunk/tools/inspect/inspect.cpp
==============================================================================
--- trunk/tools/inspect/inspect.cpp (original)
+++ trunk/tools/inspect/inspect.cpp 2010-12-29 15:23:58 EST (Wed, 29 Dec 2010)
@@ -145,7 +145,7 @@
bool visit_predicate( const path & pth )
{
string local( boost::inspect::relative_to( pth, fs::initial_path() ) );
- string leaf( pth.leaf() );
+ string leaf( pth.leaf().string() );
return
// so we can inspect a checkout
leaf != "CVS"
@@ -202,7 +202,7 @@
bool find_signature( const path & file_path,
const boost::inspect::string_set & signatures )
{
- string name( file_path.leaf() );
+ string name( file_path.leaf().string() );
if ( signatures.find( name ) == signatures.end() )
{
string::size_type pos( name.rfind( '.' ) );
@@ -675,13 +675,12 @@
// may return an empty string [gps]
string impute_library( const path & full_dir_path )
{
- path relative( relative_to( full_dir_path, fs::initial_path() ),
- fs::no_check );
+ path relative( relative_to( full_dir_path, fs::initial_path() ) );
if ( relative.empty() ) return "boost-root";
- string first( *relative.begin() );
+ string first( (*relative.begin()).string() );
string second = // borland 5.61 requires op=
++relative.begin() == relative.end()
- ? string() : *++relative.begin();
+ ? string() : (*++relative.begin()).string();
if ( first == "boost" )
return second;
Modified: trunk/tools/inspect/link_check.cpp
==============================================================================
--- trunk/tools/inspect/link_check.cpp (original)
+++ trunk/tools/inspect/link_check.cpp 2010-12-29 15:23:58 EST (Wed, 29 Dec 2010)
@@ -424,7 +424,7 @@
// url is relative source_path.branch()
// convert to target_path, which is_complete()
path target_path;
- try { target_path = source_path.branch_path() /= path( decoded_path, fs::no_check ); }
+ try { target_path = source_path.branch_path() /= path( decoded_path ); }
catch ( const fs::filesystem_error & )
{
if(!no_link_errors) {
@@ -476,7 +476,7 @@
&& itr->first.rfind( "index.htm" ) == string::npos )
{
++m_unlinked_errors;
- path full_path( fs::initial_path() / path(itr->first, fs::no_check) );
+ path full_path( fs::initial_path() / path(itr->first) );
error( impute_library( full_path ), full_path, "Unlinked file" );
}
}
Modified: trunk/tools/inspect/path_name_check.cpp
==============================================================================
--- trunk/tools/inspect/path_name_check.cpp (original)
+++ trunk/tools/inspect/path_name_check.cpp 2010-12-29 15:23:58 EST (Wed, 29 Dec 2010)
@@ -40,7 +40,7 @@
string::size_type pos;
// called for each file and directory, so only the leaf need be tested
- string const leaf( full_path.leaf() );
+ string const leaf( full_path.leaf().string() );
// includes only allowable characters
if ( (pos = leaf.find_first_not_of( allowable )) != string::npos )