|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r72817 - trunk/tools/regression/src
From: bdawes_at_[hidden]
Date: 2011-06-30 08:25:46
Author: bemandawes
Date: 2011-06-30 08:25:45 EDT (Thu, 30 Jun 2011)
New Revision: 72817
URL: http://svn.boost.org/trac/boost/changeset/72817
Log:
Revert 67733 changes, and add a comment indicating I'm the maintainer.
A more complete update will follow shortly.
Text files modified:
trunk/tools/regression/src/compiler_status.cpp | 67 ++++++++++++++++++++-------------------
1 files changed, 34 insertions(+), 33 deletions(-)
Modified: trunk/tools/regression/src/compiler_status.cpp
==============================================================================
--- trunk/tools/regression/src/compiler_status.cpp (original)
+++ trunk/tools/regression/src/compiler_status.cpp 2011-06-30 08:25:45 EDT (Thu, 30 Jun 2011)
@@ -1,16 +1,17 @@
// Generate Compiler Status HTML from jam regression test output -----------//
-// Copyright Bryce Lelbach 2011
-// Copyright Beman Dawes 2002-2011.
+// Copyright Beman Dawes 2002.
-// 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)
-// See http://www.boost.org/tools/regression/ for documentation.
+// Distributed under the Boost Software License, Version 1.0.
+// See http://www.boost.org/LICENSE_1_0.txt
// See http://www.boost.org/tools/regression/ for documentation.
/*******************************************************************************
+ Please contact the maintainer, bdawes <at> acm <dot> org, before making
+ any non-trivial changes.
+
This program was designed to work unchanged on all platforms and
configurations. All output which is platform or configuration dependent
is obtained from external sources such as the .xml file from
@@ -197,11 +198,11 @@
if ( !fs::exists( dir_path ) ) return false;
for ( fs::directory_iterator itr( dir_path ); itr != end_itr; ++itr )
if ( fs::is_directory( *itr )
- && itr->path().string() != ignore_dir_named )
+ && itr->filename() != ignore_dir_named )
{
if ( find_file( *itr, name, path_found ) ) return true;
}
- else if ( itr->path().string() == name )
+ else if ( itr->filename() == name )
{
path_found = *itr;
return true;
@@ -287,16 +288,16 @@
// SunCC creates an internal subdirectory everywhere it writes
// object files. This confuses the target_directory() algorithm.
// This patch ignores the SunCC internal directory. Jens Maurer
- if ( (*itr).path().string() == "SunWS_cache" ) continue;
+ if ( (*itr).filename() == "SunWS_cache" ) continue;
// SGI does something similar for template instantiations. Jens Maurer
- if( (*itr).path().string() == "ii_files" ) continue;
+ if( (*itr).filename() == "ii_files" ) continue;
if ( child.empty() ) child = *itr;
else
{
std::cout << "Warning: only first of two target possibilities will be reported for: \n "
- << root.string() << ": " << child.string()
- << " and " << (*itr).path().string() << "\n";
+ << root.string() << ": " << child.filename()
+ << " and " << (*itr).filename() << "\n";
}
}
}
@@ -368,7 +369,7 @@
std::cerr << "warning: could not find build results for '"
<< relative << "'.\n";
std::cerr << "warning: tried directory "
- << bin_path.parent_path().string() << "\n";
+ << bin_path.native_directory_string() << "\n";
bin_path = "";
}
}
@@ -741,11 +742,11 @@
for ( fs::directory_iterator itr( bin_dir ); itr != end_itr; ++itr )
{
if ( fs::is_directory( *itr )
- && itr->path().string().find( ".test" ) == (itr->path().string().size()-5) )
+ && itr->string().find( ".test" ) == (itr->string().size()-5) )
{
results.push_back( std::string() );
do_row( *itr,
- itr->path().string().substr( 0, itr->path().string().size()-5 ),
+ itr->filename().substr( 0, itr->filename().size()-5 ),
results[results.size()-1] );
}
}
@@ -761,15 +762,15 @@
for (; compiler_itr != end_itr; ++compiler_itr )
{
if ( fs::is_directory( *compiler_itr ) // check just to be sure
- && compiler_itr->path().string() != "test" ) // avoid strange directory (Jamfile bug?)
+ && compiler_itr->filename() != "test" ) // avoid strange directory (Jamfile bug?)
{
if ( specific_compiler.size() != 0
- && specific_compiler != compiler_itr->path().string() ) continue;
- toolsets.push_back( compiler_itr->path().string() );
- string desc( compiler_desc( compiler_itr->path().string() ) );
- string vers( version_desc( compiler_itr->path().string() ) );
+ && specific_compiler != compiler_itr->filename() ) continue;
+ toolsets.push_back( compiler_itr->filename() );
+ string desc( compiler_desc( compiler_itr->filename() ) );
+ string vers( version_desc( compiler_itr->filename() ) );
report << "<td>"
- << (desc.size() ? desc : compiler_itr->path().string())
+ << (desc.size() ? desc : compiler_itr->filename())
<< (vers.size() ? (string( "<br>" ) + vers ) : string( "" ))
<< "</td>\n";
error_count.push_back( 0 );
@@ -883,7 +884,7 @@
fs::recursive_directory_iterator ritr( bin_path );
fs::recursive_directory_iterator end_ritr;
while ( ritr != end_ritr
- && ((ritr->path().string().find( ".test" ) != (ritr->path().string().size()-5))
+ && ((ritr->string().find( ".test" ) != (ritr->string().size()-5))
|| !fs::is_directory( *ritr )))
++ritr; // bypass chaff
if ( ritr != end_ritr )
@@ -895,7 +896,7 @@
{
fs::directory_iterator itr( bin_path );
while ( itr != end_itr
- && ((itr->path().string().find( ".test" ) != (itr->path().string().size()-5))
+ && ((itr->string().find( ".test" ) != (itr->string().size()-5))
|| !fs::is_directory( *itr )))
++itr; // bypass chaff
if ( itr != end_itr )
@@ -940,19 +941,19 @@
if ( argc > 2 && std::strcmp( argv[1], "--compiler" ) == 0 )
{ specific_compiler = argv[2]; --argc; ++argv; }
else if ( argc > 2 && std::strcmp( argv[1], "--locate-root" ) == 0 )
- { locate_root = fs::path( argv[2] ); --argc; ++argv; }
+ { locate_root = fs::path( argv[2], fs::native ); --argc; ++argv; }
else if ( argc > 2 && std::strcmp( argv[1], "--comment" ) == 0 )
- { comment_path = fs::path( argv[2] ); --argc; ++argv; }
+ { comment_path = fs::path( argv[2], fs::native ); --argc; ++argv; }
else if ( argc > 2 && std::strcmp( argv[1], "--notes" ) == 0 )
- { notes_path = fs::path( argv[2] ); --argc; ++argv; }
+ { notes_path = fs::path( argv[2], fs::native ); --argc; ++argv; }
else if ( argc > 2 && std::strcmp( argv[1], "--notes-map" ) == 0 )
- { notes_map_path = fs::path( argv[2] ); --argc; ++argv; }
+ { notes_map_path = fs::path( argv[2], fs::native ); --argc; ++argv; }
else if ( std::strcmp( argv[1], "--ignore-pass" ) == 0 ) ignore_pass = true;
else if ( std::strcmp( argv[1], "--no-warn" ) == 0 ) no_warn = true;
else if ( std::strcmp( argv[1], "--v1" ) == 0 ) boost_build_v2 = false;
else if ( std::strcmp( argv[1], "--v2" ) == 0 ) boost_build_v2 = true;
else if ( argc > 2 && std::strcmp( argv[1], "--jamfile" ) == 0)
- { jamfile_path = fs::path( argv[2] ); --argc; ++argv; }
+ { jamfile_path = fs::path( argv[2], fs::native ); --argc; ++argv; }
else if ( std::strcmp( argv[1], "--compile-time" ) == 0 ) compile_time = true;
else if ( std::strcmp( argv[1], "--run-time" ) == 0 ) run_time = true;
else { std::cerr << "Unknown option: " << argv[1] << "\n"; argc = 1; }
@@ -993,7 +994,7 @@
return 1;
}
- boost_root = fs::path( argv[1] );
+ boost_root = fs::path( argv[1], fs::native );
if ( locate_root.empty() ) locate_root = boost_root;
if (jamfile_path.empty())
@@ -1001,15 +1002,15 @@
jamfile_path = "Jamfile.v2";
else
jamfile_path = "Jamfile";
- jamfile_path = fs::system_complete( jamfile_path );
+ jamfile_path = fs::complete( jamfile_path, fs::initial_path() );
jamfile.open( jamfile_path );
if ( !jamfile )
{
- std::cerr << "Could not open Jamfile: " << jamfile_path.string() << std::endl;
+ std::cerr << "Could not open Jamfile: " << jamfile_path.native_file_string() << std::endl;
return 1;
}
- report.open( fs::path( argv[2] ) );
+ report.open( fs::path( argv[2], fs::native ) );
if ( !report )
{
std::cerr << "Could not open report output file: " << argv[2] << std::endl;
@@ -1018,8 +1019,8 @@
if ( argc == 4 )
{
- fs::path links_path( argv[3] );
- links_name = links_path.string();
+ fs::path links_path( argv[3], fs::native );
+ links_name = links_path.filename();
links_file.open( links_path );
if ( !links_file )
{
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk