| Index: testing/README.chromium
|
| diff --git a/testing/README.chromium b/testing/README.chromium
|
| index 67e64510e1c93c9ddeb397602f3bdad8f2a3e8ce..ed305ee52b089d62599150a7453cc4e424cb4830 100644
|
| --- a/testing/README.chromium
|
| +++ b/testing/README.chromium
|
| @@ -1,7 +1,7 @@
|
| We include a snapshot of gmock from http://googlemock.googlecode.com/svn/trunk
|
| with chromium.patch applied.
|
|
|
| -Current revision: 157
|
| +Current revision: 173
|
|
|
|
|
| -- HOW TO USE --
|
| @@ -21,38 +21,19 @@ In particular, the "For Dummies" guide is a good place to start. The
|
|
|
| -- RECREATING PACKAGE --
|
|
|
| -Gmock requires tr1 tuple. However, Visual Studio 2005 does not include
|
| -tr1 tuple, so a version of boost tuple was added into the third_party
|
| -tree for chromium. Our version of gmock has been patched to search for
|
| -this version of tuple inside our source tree.
|
| +Starting with r173, gmock began distributing a pared down version of tr1 tuple
|
| +that can be used on compilers without TR1. This means that we will no longer
|
| +need TR1 or boost on windows.
|
|
|
| -chromium.patch modifies gmock/include/gmock/internal/gmock-port.h so that
|
| -for _MSC_VER < 1500 (anything newer than Visual Studio 2008), boost tuple
|
| -is loaded from boost/tr1/tr1/tuple.
|
| +Recreating this package is now just exporting the wanted revision.
|
| +Example:
|
|
|
| -To recreate this install, do the following:
|
| + svn export --ignore-externals \
|
| + http://googlemock.googlecode.com/svn/trunk/ gmock
|
|
|
| - *1) Checkout a copy from svn trunk using --ignore-externals to avoid
|
| - getting an extra copy of gtest. Use the following command:
|
| - svn export --ignore-externals \
|
| - http://googlemock.googlecode.com/svn/trunk/ gmock
|
| - 2) Patch it with chromium.patch.
|
| +When checking out a copy from svn, --ignore-externals should be used to avoid
|
| +getting an extra copy of gtest.
|
|
|
| -* Pass -r [revision number] to svn export if you want a specific revision.
|
| -The current revision of the source is listed at the top of the README.
|
| -
|
| -
|
| --- ALTERNATIVES TO PATCHING --
|
| -
|
| -The patching of gmock to use boost in VS2005 was settled upon as the lowest
|
| -impact solution for getting gmock working in VS2005. Patching gmock trades
|
| -making some assumptions regarding the internal implementations of gmock
|
| -and boost for a simple, easy to underatnd, implementation that provides
|
| -relatively good insulation for the rest of the build from the boost dependency.
|
| -
|
| -Alternate soltuions are:
|
| - 1) Drop support for VS2005 -- too heavy-handed.
|
| - 2) Add a "tuple" file parallel to gmock-port.h -- still makes assumptions
|
| - about boost's structure.
|
| - 3) Add boost/tr1/tr1 into the include path -- dirties the include path for
|
| - all dependencies.
|
| +This command will grab the head of trunk. Optionally, -r [revision number] to
|
| +can be passed to svn export if you want a specific revision. The current
|
| +revision of the source is listed at the top of the README.
|
|
|