organicmaps/boost
13
Fork 0
mirror of https://github.com/boostorg/boost.git synced 2025-04-14 17:03:38 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Fix target directory calculation for libraries that have test sources in a subdirectory. The compile actions were (incorrectly) being separated from the link and run actions in regex, spirit and others.

Browse source 
[SVN r83612]
This commit is contained in:
Steven Watanabe 2013-03-27 20:59:52 +00:00
parent e226cfd2ba
commit 94904f9725
1 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
tools/regression/src/process_jam_log.cpp
View file

@ -144,6 +144,10 @@ namespace
}
string test_path_to_library_name( string const& path );
string test_name( const string & s );
// extract a target directory path from a jam target string ----------------//
// s may be relative to the initial_path:
// ..\..\..\libs\foo\build\bin\libfoo.lib\vc7\debug\runtime-link-dynamic\boo.obj
@ -160,6 +164,34 @@ namespace
temp = split( trim_left( temp ) ).back();
if ( temp[0] == '.' ) temp.erase( 0, temp.find_first_not_of( "./" ) );
else temp.erase( 0, locate_root.string().size()+1 );
std::string testid = test_path_to_library_name( temp ) + "/" + test_name( temp );
test2info_map::const_iterator info = test2info.find(testid);
if ( info != test2info.end() )
{
// Only keep path components that are part of the
// build variant.
string source_directory = info->second.file_path;
string::size_type last = source_directory.find_last_of( "/" );
if ( last == string::npos )
source_directory.clear();
else
source_directory.erase( last );
// find the start of the shared tail
string::size_type source_pos = source_directory.size(), temp_pos = temp.size();
for ( ; source_pos != 0 && temp_pos != 0; --source_pos, --temp_pos )
{
if ( source_directory[ source_pos - 1 ] != temp[ temp_pos - 1 ] ) break;
}
// erase all path components in the shared tail
temp_pos = temp.find( '/', temp_pos );
if ( temp_pos != string::npos )
temp.erase( temp_pos );
}
if ( echo )
std::cout << "\ttarget_directory( \"" << s << "\") -> \"" << temp << "\"" << std::endl;
return temp;