Lines 191-201
Link Here
|
191 |
if ( !fs::exists( dir_path ) ) return false; |
191 |
if ( !fs::exists( dir_path ) ) return false; |
192 |
for ( fs::directory_iterator itr( dir_path ); itr != end_itr; ++itr ) |
192 |
for ( fs::directory_iterator itr( dir_path ); itr != end_itr; ++itr ) |
193 |
if ( fs::is_directory( *itr ) |
193 |
if ( fs::is_directory( *itr ) |
194 |
&& itr->leaf() != ignore_dir_named ) |
194 |
&& itr->filename() != ignore_dir_named ) |
195 |
{ |
195 |
{ |
196 |
if ( find_file( *itr, name, path_found ) ) return true; |
196 |
if ( find_file( *itr, name, path_found ) ) return true; |
197 |
} |
197 |
} |
198 |
else if ( itr->leaf() == name ) |
198 |
else if ( itr->filename() == name ) |
199 |
{ |
199 |
{ |
200 |
path_found = *itr; |
200 |
path_found = *itr; |
201 |
return true; |
201 |
return true; |
Lines 281-296
Link Here
|
281 |
// SunCC creates an internal subdirectory everywhere it writes |
281 |
// SunCC creates an internal subdirectory everywhere it writes |
282 |
// object files. This confuses the target_directory() algorithm. |
282 |
// object files. This confuses the target_directory() algorithm. |
283 |
// This patch ignores the SunCC internal directory. Jens Maurer |
283 |
// This patch ignores the SunCC internal directory. Jens Maurer |
284 |
if ( (*itr).leaf() == "SunWS_cache" ) continue; |
284 |
if ( (*itr).filename() == "SunWS_cache" ) continue; |
285 |
// SGI does something similar for template instantiations. Jens Maurer |
285 |
// SGI does something similar for template instantiations. Jens Maurer |
286 |
if( (*itr).leaf() == "ii_files" ) continue; |
286 |
if( (*itr).filename() == "ii_files" ) continue; |
287 |
|
287 |
|
288 |
if ( child.empty() ) child = *itr; |
288 |
if ( child.empty() ) child = *itr; |
289 |
else |
289 |
else |
290 |
{ |
290 |
{ |
291 |
std::cout << "Warning: only first of two target possibilities will be reported for: \n " |
291 |
std::cout << "Warning: only first of two target possibilities will be reported for: \n " |
292 |
<< root.string() << ": " << child.leaf() |
292 |
<< root.string() << ": " << child.filename() |
293 |
<< " and " << (*itr).leaf() << "\n"; |
293 |
<< " and " << (*itr).filename() << "\n"; |
294 |
} |
294 |
} |
295 |
} |
295 |
} |
296 |
} |
296 |
} |
Lines 726-732
Link Here
|
726 |
{ |
726 |
{ |
727 |
results.push_back( std::string() ); |
727 |
results.push_back( std::string() ); |
728 |
do_row( *itr, |
728 |
do_row( *itr, |
729 |
itr->leaf().substr( 0, itr->leaf().size()-5 ), |
729 |
itr->filename().substr( 0, itr->filename().size()-5 ), |
730 |
results[results.size()-1] ); |
730 |
results[results.size()-1] ); |
731 |
} |
731 |
} |
732 |
} |
732 |
} |
Lines 812-826
Link Here
|
812 |
for (; compiler_itr != end_itr; ++compiler_itr ) |
812 |
for (; compiler_itr != end_itr; ++compiler_itr ) |
813 |
{ |
813 |
{ |
814 |
if ( fs::is_directory( *compiler_itr ) // check just to be sure |
814 |
if ( fs::is_directory( *compiler_itr ) // check just to be sure |
815 |
&& compiler_itr->leaf() != "test" ) // avoid strange directory (Jamfile bug?) |
815 |
&& compiler_itr->filename() != "test" ) // avoid strange directory (Jamfile bug?) |
816 |
{ |
816 |
{ |
817 |
if ( specific_compiler.size() != 0 |
817 |
if ( specific_compiler.size() != 0 |
818 |
&& specific_compiler != compiler_itr->leaf() ) continue; |
818 |
&& specific_compiler != compiler_itr->filename() ) continue; |
819 |
toolsets.push_back( compiler_itr->leaf() ); |
819 |
toolsets.push_back( compiler_itr->filename() ); |
820 |
string desc( compiler_desc( compiler_itr->leaf() ) ); |
820 |
string desc( compiler_desc( compiler_itr->filename() ) ); |
821 |
string vers( version_desc( compiler_itr->leaf() ) ); |
821 |
string vers( version_desc( compiler_itr->filename() ) ); |
822 |
report << "<td>" |
822 |
report << "<td>" |
823 |
<< (desc.size() ? desc : compiler_itr->leaf()) |
823 |
<< (desc.size() ? desc : compiler_itr->filename()) |
824 |
<< (vers.size() ? (string( "<br>" ) + vers ) : string( "" )) |
824 |
<< (vers.size() ? (string( "<br>" ) + vers ) : string( "" )) |
825 |
<< "</td>\n"; |
825 |
<< "</td>\n"; |
826 |
error_count.push_back( 0 ); |
826 |
error_count.push_back( 0 ); |
Lines 943-949
Link Here
|
943 |
if ( argc == 4 ) |
943 |
if ( argc == 4 ) |
944 |
{ |
944 |
{ |
945 |
fs::path links_path( argv[3], fs::native ); |
945 |
fs::path links_path( argv[3], fs::native ); |
946 |
links_name = links_path.leaf(); |
946 |
links_name = links_path.filename(); |
947 |
links_file.open( links_path ); |
947 |
links_file.open( links_path ); |
948 |
if ( !links_file ) |
948 |
if ( !links_file ) |
949 |
{ |
949 |
{ |