project: version 1.4 Update

* Remove our dependency on Boost tuple from the VC 8 project.
* Use vsprop sheets to enable creation of side-by-side Debug and
  Release build configs.
* Add gmock-spec-builders_test

- Build time noticeably increased with gmock 1.4, but since it
  is a build once and forget it should represent any problems.

[#3]

Signed-off-by: Thell Fowler <git@tbfowler.name>

CHANGES

@@ -1,3 +1,28 @@
+Changes for 1.4.0 (we skipped 1.2.* and 1.3.* to match the version of
+Google Test):
+
+ * Works in more environments: Symbian and minGW, Visual C++ 7.1.
+ * Lighter weight: comes with our own implementation of TR1 tuple (no
+   more dependency on Boost!).
+ * New feature: --gmock_catch_leaked_mocks for detecting leaked mocks.
+ * New feature: ACTION_TEMPLATE for defining templatized actions.
+ * New feature: the .After() clause for specifying expectation order.
+ * New feature: the .With() clause for for specifying inter-argument
+   constraints.
+ * New feature: actions ReturnArg<k>(), ReturnNew<T>(...), and
+   DeleteArg<k>().
+ * New feature: matchers Key(), Pair(), Args<...>(), AllArgs(), IsNull(),
+   and Contains().
+ * New feature: utility class MockFunction<F>, useful for checkpoints, etc.
+ * New feature: functions Value(x, m) and SafeMatcherCast<T>(m).
+ * New feature: copying a mock object is rejected at compile time.
+ * New feature: a script for fusing all Google Mock and Google Test
+   source files for easy deployment.
+ * Improved the Google Mock doctor to diagnose more diseases.
+ * Improved the Google Mock generator script.
+ * Compatibility fixes for Mac OS X and gcc.
+ * Bug fixes and implementation clean-ups.
+
 Changes for 1.1.0:
 
  * New feature: ability to use Google Mock with any testing framework.
@@ -7,7 +32,7 @@ Changes for 1.1.0:
  * New feature: actions for accessing function arguments and throwing
    exceptions.
  * Improved the Google Mock doctor script for diagnosing compiler errors.
- * Bug fixes and implementation clean-up.
+ * Bug fixes and implementation clean-ups.
 
 Changes for 1.0.0:
 

Makefile.am

@@ -34,6 +34,7 @@ pkginclude_HEADERS = include/gmock/gmock.h \
                      include/gmock/gmock-generated-matchers.h \
                      include/gmock/gmock-generated-nice-strict.h \
                      include/gmock/gmock-matchers.h \
+                     include/gmock/gmock-more-actions.h \
                      include/gmock/gmock-printers.h \
                      include/gmock/gmock-spec-builders.h
 
@@ -110,6 +111,11 @@ check_PROGRAMS += test/gmock-matchers_test
 test_gmock_matchers_test_SOURCES = test/gmock-matchers_test.cc
 test_gmock_matchers_test_LDADD = $(GTEST_LIBS) lib/libgmock_main.la
 
+TESTS += test/gmock-more-actions_test
+check_PROGRAMS += test/gmock-more-actions_test
+test_gmock_more_actions_test_SOURCES = test/gmock-more-actions_test.cc
+test_gmock_more_actions_test_LDADD = $(GTEST_LIBS) lib/libgmock_main.la
+
 TESTS += test/gmock-nice-strict_test
 check_PROGRAMS += test/gmock-nice-strict_test
 test_gmock_nice_strict_test_SOURCES = test/gmock-nice-strict_test.cc
@@ -128,13 +134,35 @@ test_gmock_printers_test_LDADD = $(GTEST_LIBS) lib/libgmock_main.la
 TESTS += test/gmock-spec-builders_test
 check_PROGRAMS += test/gmock-spec-builders_test
 test_gmock_spec_builders_test_SOURCES = test/gmock-spec-builders_test.cc
-test_gmock_spec_builders_test_LDADD = $(GTEST_LIBS) lib/libgmock_main.la
+test_gmock_spec_builders_test_LDADD = $(GTEST_LIBS) lib/libgmock.la
 
 TESTS += test/gmock_test
 check_PROGRAMS += test/gmock_test
 test_gmock_test_SOURCES = test/gmock_test.cc
 test_gmock_test_LDADD = $(GTEST_LIBS) lib/libgmock_main.la
 
+# A sanity test for verifying that Google Mock works when RTTI is
+# disabled.  We pick gmock-spec-builders_test.cc as it exercises all
+# components of Google Mock.
+TESTS += test/gmock_no_rtti_test
+check_PROGRAMS += test/gmock_no_rtti_test
+test_gmock_no_rtti_test_SOURCES = test/gmock-spec-builders_test.cc \
+                                  src/gmock-all.cc
+test_gmock_no_rtti_test_CXXFLAGS = $(AM_CXXFLAGS) -fno-rtti -DGTEST_HAS_RTTI=0
+test_gmock_no_rtti_test_LDADD = $(GTEST_LIBS)
+
+# A sanity test for verifying that Google Mock works with Google
+# Test's TR1 tuple implementation.  We pick
+# gmock-spec-builders_test.cc as it exercises all components of Google
+# Mock.
+TESTS += test/gmock_use_own_tuple_test
+check_PROGRAMS += test/gmock_use_own_tuple_test
+test_gmock_use_own_tuple_test_SOURCES = test/gmock-spec-builders_test.cc \
+                                        src/gmock-all.cc
+test_gmock_use_own_tuple_test_CXXFLAGS = \
+    $(AM_CXXFLAGS) -DGTEST_USE_OWN_TR1_TUPLE=1
+test_gmock_use_own_tuple_test_LDADD = $(GTEST_LIBS)
+
 # The following tests depend on the presence of a Python installation and are
 # keyed off of it. We only add them to the TESTS variable when a Python
 # interpreter is available. TODO(chandlerc@google.com): While we currently only
@@ -147,6 +175,11 @@ dist_check_SCRIPTS =
 # Python modules used by multiple Python tests below.
 dist_check_SCRIPTS += test/gmock_test_utils.py
 
+check_PROGRAMS += test/gmock_leak_test_
+test_gmock_leak_test__SOURCES = test/gmock_leak_test_.cc
+test_gmock_leak_test__LDADD = $(GTEST_LIBS) lib/libgmock_main.la
+dist_check_SCRIPTS += test/gmock_leak_test.py
+
 check_PROGRAMS += test/gmock_output_test_
 test_gmock_output_test__SOURCES = test/gmock_output_test_.cc
 test_gmock_output_test__LDADD = $(GTEST_LIBS) lib/libgmock_main.la
@@ -155,15 +188,17 @@ EXTRA_DIST += test/gmock_output_test_golden.txt
 
 # Enable all the python driven tests when we can run them.
 if HAVE_PYTHON
-TESTS += test/gmock_output_test.py
+TESTS += \
+    test/gmock_leak_test.py \
+    test/gmock_output_test.py
 endif
 
 # Nonstandard package files for distribution.
 EXTRA_DIST += \
-  CHANGES \
-  CONTRIBUTORS \
-  make/Makefile \
-  src/gmock-all.cc
+    CHANGES \
+    CONTRIBUTORS \
+    make/Makefile \
+    src/gmock-all.cc
 
 # Pump scripts for generating Google Mock headers.
 # TODO(chandlerc@google.com): automate the generation of *.h from *.h.pump.
@@ -173,6 +208,11 @@ EXTRA_DIST += include/gmock/gmock-generated-actions.h.pump \
               include/gmock/gmock-generated-nice-strict.h.pump \
               include/gmock/internal/gmock-generated-internal-utils.h.pump
 
+# Script for fusing Google Mock and Google Test source files.
+EXTRA_DIST += \
+    scripts/fuse_gmock_files.py \
+    scripts/test/Makefile
+
 # The Google Mock Generator tool from the cppclean project.
 EXTRA_DIST += \
     scripts/generator/COPYING \
@@ -194,4 +234,5 @@ EXTRA_DIST += \
     msvc/gmock_link_test.vcproj \
     msvc/gmock_main.vcproj \
     msvc/gmock_output_test_.vcproj \
+    msvc/gmock-spec-builders_test.vcproj \
     msvc/gmock_test.vcproj