Bump gtest to 1.4.0 and add gmock 1.4.0

Bump gtest to 1.4.0 and add gmock 1.4.0

[Will Drewry, 2010-01-14 00:06:11]

I'm still cleaning up a little bit of noise I noticed on last build of gmock,
but both seem to build and install correct packages.

After review but before submit, I'll send a notice to let people know just in
case the gtest upgrade cause any trouble.

thanks!
will

[Chris Masone, 2010-01-14 03:29:07]

the best I can do :-)  It all looks sensible to me, but I have no idea if it's
right as far as the new build stuff in concerned.

http://codereview.chromium.org/536056/diff/1/12
File src/third_party/gmock/debian/rules (right):

http://codereview.chromium.org/536056/diff/1/12#newcode18
src/third_party/gmock/debian/rules:18: #cp $(CURDIR)/libcryptohome.so
$(CURDIR)/debian/chromeos-cryptohome/usr/lib/libcryptohome.so
delete this?

http://codereview.chromium.org/536056/diff/1/13
File src/third_party/gmock/make_pkg.sh (right):

http://codereview.chromium.org/536056/diff/1/13#newcode2
src/third_party/gmock/make_pkg.sh:2: # Copyright (c) 2009 The Chromium OS
Authors. All rights reserved.
feel free to join me in this decade.

The turnabout, it is fair play.

http://codereview.chromium.org/536056/diff/1/13#newcode15
src/third_party/gmock/make_pkg.sh:15: # Load common constants.  This should be
the first executable line.
weird to leave this here.  it certainly is not the first executable line.

http://codereview.chromium.org/536056/diff/1/13#newcode20
src/third_party/gmock/make_pkg.sh:20: # Export variables so that configure will
use the install gtest instead of a custom build.
is this a todo?  Also, 80char

[Will Drewry, 2010-01-14 17:08:57]

Doing one last build to confirm it all works as expected.

Any other thoughts/comments?

http://codereview.chromium.org/536056/diff/1/12
File src/third_party/gmock/debian/rules (right):

http://codereview.chromium.org/536056/diff/1/12#newcode18
src/third_party/gmock/debian/rules:18: #cp $(CURDIR)/libcryptohome.so
$(CURDIR)/debian/chromeos-cryptohome/usr/lib/libcryptohome.so
On 2010/01/14 03:29:07, cmasone wrote:
> delete this?

Done.

http://codereview.chromium.org/536056/diff/1/13
File src/third_party/gmock/make_pkg.sh (right):

http://codereview.chromium.org/536056/diff/1/13#newcode2
src/third_party/gmock/make_pkg.sh:2: # Copyright (c) 2009 The Chromium OS
Authors. All rights reserved.
On 2010/01/14 03:29:07, cmasone wrote:
> feel free to join me in this decade.
> 
> The turnabout, it is fair play.

Done.

http://codereview.chromium.org/536056/diff/1/13#newcode15
src/third_party/gmock/make_pkg.sh:15: # Load common constants.  This should be
the first executable line.
On 2010/01/14 03:29:07, cmasone wrote:
> weird to leave this here.  it certainly is not the first executable line.

It is the first line once again.

http://codereview.chromium.org/536056/diff/1/13#newcode20
src/third_party/gmock/make_pkg.sh:20: # Export variables so that configure will
use the install gtest instead of a custom build.
This was never supposed to stay in the file - it was just a note to myself in
case I needed to override some gmock config stuff.  Turned out, instead I needed
to bump gtest to 1.4.0.

[Chris Masone, 2010-01-14 17:39:34]

lgtm.  Colin?

[cjwatson, 2010-01-14 21:18:30]

On 2010/01/14 17:39:34, cmasone wrote:
> lgtm.  Colin?

LGTM except these nits:

[cjwatson, 2010-01-14 21:18:58]

LGTM except these nits:

(sorry, I misdrove the web interface last time round)

http://codereview.chromium.org/536056/diff/4002/4010
File src/third_party/gmock/debian/control (right):

http://codereview.chromium.org/536056/diff/4002/4010#newcode16
src/third_party/gmock/debian/control:16: Depends: ${shlibs:Depends},
${misc:Depends}, libgtest0 (<= 1.4.0), libgtest-dev
Does libgmock (run-time) really need to depend on libgtest-dev?  That seems like
something more likely to belong on libgmock-dev.

http://codereview.chromium.org/536056/diff/4002/4011
File src/third_party/gmock/debian/libgmock-dev.install (right):

http://codereview.chromium.org/536056/diff/4002/4011#newcode6
src/third_party/gmock/debian/libgmock-dev.install:6: usr/include/gmock
I wouldn't bother listing the containing directories here.

http://codereview.chromium.org/536056/diff/4002/4012
File src/third_party/gmock/debian/libgmock.install (right):

http://codereview.chromium.org/536056/diff/4002/4012#newcode2
src/third_party/gmock/debian/libgmock.install:2: usr/lib/libgmock*.so
Conventionally the .so link (as opposed to .so.SONAME) goes in the -dev package,
since it's only needed for build-time linking.

http://codereview.chromium.org/536056/diff/4002/4013
File src/third_party/gmock/debian/rules (right):

http://codereview.chromium.org/536056/diff/4002/4013#newcode7
src/third_party/gmock/debian/rules:7: dh --buildsystem=autoconf $@
The --buildsystem=autoconf bit should normally be detected automatically. 
Unless it's misdetected for some reason, it's usual to omit it.

http://codereview.chromium.org/536056/diff/4002/4013#newcode17
src/third_party/gmock/debian/rules:17: dh_install
This override does nothing.

[Will Drewry, 2010-01-14 21:28:25]

Thanks for catching all that. Much cleaner now!

http://codereview.chromium.org/536056/diff/4002/4010
File src/third_party/gmock/debian/control (right):

http://codereview.chromium.org/536056/diff/4002/4010#newcode16
src/third_party/gmock/debian/control:16: Depends: ${shlibs:Depends},
${misc:Depends}, libgtest0 (<= 1.4.0), libgtest-dev
On 2010/01/14 21:18:58, cjwatson wrote:
> Does libgmock (run-time) really need to depend on libgtest-dev?  That seems
like
> something more likely to belong on libgmock-dev.

Done.

http://codereview.chromium.org/536056/diff/4002/4011
File src/third_party/gmock/debian/libgmock-dev.install (right):

http://codereview.chromium.org/536056/diff/4002/4011#newcode6
src/third_party/gmock/debian/libgmock-dev.install:6: usr/include/gmock
On 2010/01/14 21:18:58, cjwatson wrote:
> I wouldn't bother listing the containing directories here.

Done.

http://codereview.chromium.org/536056/diff/4002/4012
File src/third_party/gmock/debian/libgmock.install (right):

http://codereview.chromium.org/536056/diff/4002/4012#newcode2
src/third_party/gmock/debian/libgmock.install:2: usr/lib/libgmock*.so
On 2010/01/14 21:18:58, cjwatson wrote:
> Conventionally the .so link (as opposed to .so.SONAME) goes in the -dev
package,
> since it's only needed for build-time linking.

Done.

http://codereview.chromium.org/536056/diff/4002/4013
File src/third_party/gmock/debian/rules (right):

http://codereview.chromium.org/536056/diff/4002/4013#newcode7
src/third_party/gmock/debian/rules:7: dh --buildsystem=autoconf $@
On 2010/01/14 21:18:58, cjwatson wrote:
> The --buildsystem=autoconf bit should normally be detected automatically. 
> Unless it's misdetected for some reason, it's usual to omit it.

Done.

http://codereview.chromium.org/536056/diff/4002/4013#newcode17
src/third_party/gmock/debian/rules:17: dh_install
On 2010/01/14 21:18:58, cjwatson wrote:
> This override does nothing.

Done.