[C++-sig] Renaming indexing_v2 directory [was Re: Merging indexing_v2 to mainline]

[Raoul Gough]

Raoul Gough wrote:
> I've been looking into making my indexing suite co-exist with the 
> original suite by Joel de Guzman. I think the easiest way is to move 
> my headers into a different directory called 
> boost/python/suite/indexing_v2. This would mean anybody already using 
> the "new" suite would have to change their #include directives, e.g.
>
> #include <boost/python/suite/indexing/container_suite.hpp>
> #include <boost/python/suite/indexing/vector.hpp>
>
> -->
>
> #include <boost/python/suite/indexing_v2/container_suite.hpp>
> #include <boost/python/suite/indexing_v2/vector.hpp>

OK, this turned out to be more work than I expected, but it should now 
be possible to add the indexing_v2 suite to an existing svn checkout of 
the boost trunk using the commands listed below. Note that this includes 
a new fix for the extract_return_type problem reported by John Reid back 
in October 2007.

The indexing_v2 directories are completely new, so don't involve 
modifying any existing files in the trunk. However, you also need some 
modifications to the Jamfile.v2 files in libs/python/build and 
libs/python/test to make it build. I'm not sure what is the ideal way to 
do this in an existing checkout of the trunk, but the merge commands 
below seem to work. Remember not to try committing these to the trunk by 
mistake!

I've tested this against trunk r45491 with i686-apple-darwin8-g++-4.0.1

Commands below assume you're in the top-level of the checkout, i.e. 
where LICENSE_1_0.txt is located

----8<------ commands start here

svn co 
http://svn.boost.org/svn/boost/sandbox/python_indexing_v2/boost/python/suite/indexing_v2 
boost/python/suite/indexing_v2
svn co 
http://svn.boost.org/svn/boost/sandbox/python_indexing_v2/libs/python/src/indexing_v2 
libs/python/src/indexing_v2
svn co 
http://svn.boost.org/svn/boost/sandbox/python_indexing_v2/libs/python/test/indexing_v2 
libs/python/test/indexing_v2

svn merge -r45485:HEAD 
http://svn.boost.org/svn/boost/sandbox/python_indexing_v2/libs/python/build/Jamfile.v2 
libs/python/build/Jamfile.v2

svn merge -r45486:HEAD 
http://svn.boost.org/svn/boost/sandbox/python_indexing_v2/libs/python/test/Jamfile.v2 
libs/python/test/Jamfile.v2

----8<------ commands end here

To undo the changes to the Jamfiles, the following should be sufficient:

svn revert libs/python/build/Jamfile.v2 libs/python/test/Jamfile.v2

-- 
Cheers,
Raoul.