Support for better integration between OCMock and gtest.

third_party/ocmock/ocmock.gyp

Index: third_party/ocmock/ocmock.gyp
===================================================================
--- third_party/ocmock/ocmock.gyp	(revision 85510)
+++ third_party/ocmock/ocmock.gyp	(working copy)
@@ -11,35 +11,42 @@
         {
           'target_name' : 'ocmock',
           'type': '<(library)',
-          'include_dirs':[ '.',],
+          'include_dirs': [ '.', '../..', ],

[Mark Mentovai, 2011/05/16 22:16:38]

Surprised you needed this. I assume it was for the gtest include. gtest doesn’t
put the right thing into its own direct_dependent_settings?

[TVL, 2011/05/17 14:57:16]

Almost every projects start be setting the include_dirs to the root of the tree.
 I think base is one of the few that does set it so a few things that directly
depend on base end up not needing it, but that's it.

           'direct_dependent_settings': {
             'include_dirs': [ '.', ],
           },
+          'dependencies': [
+            '<(DEPTH)/testing/gtest.gyp:gtest',

[Mark Mentovai, 2011/05/16 22:16:38]

Don’t use DEPTH unless you need it. Just write a relative path here.

[TVL, 2011/05/17 14:57:16]

Done.

+          ],
           'sources': [
+            # Helper for using with gtest.
+            'gtest_support.h',
+            'gtest_support.mm',
+            # OCMock sources.

[Mark Mentovai, 2011/05/16 22:16:38]

Blank before.

[TVL, 2011/05/17 14:57:16]

Done.

             'OCMock/NSInvocation+OCMAdditions.h',
             'OCMock/OCMObserverRecorder.m',
             'OCMock/NSInvocation+OCMAdditions.m',
-            'OCMock/NSMethodSignature+OCMAdditions.h',	

[Mark Mentovai, 2011/05/16 22:16:38]

Heh, who let the tabs in here?

-            'OCMock/NSMethodSignature+OCMAdditions.m',	
-            'OCMock/NSNotificationCenter+OCMAdditions.h',	
-            'OCMock/NSNotificationCenter+OCMAdditions.m',	
-            'OCMock/OCClassMockObject.h',			
-            'OCMock/OCClassMockObject.m',			
-            'OCMock/OCMArg.h',				
-            'OCMock/OCMArg.m',				
+            'OCMock/NSMethodSignature+OCMAdditions.h',
+            'OCMock/NSMethodSignature+OCMAdditions.m',
+            'OCMock/NSNotificationCenter+OCMAdditions.h',
+            'OCMock/NSNotificationCenter+OCMAdditions.m',
+            'OCMock/OCClassMockObject.h',
+            'OCMock/OCClassMockObject.m',
+            'OCMock/OCMArg.h',
+            'OCMock/OCMArg.m',
             'OCMock/OCMBlockCaller.h',
             'OCMock/OCMBlockCaller.m',
-            'OCMock/OCMBoxedReturnValueProvider.h',		
-            'OCMock/OCMBoxedReturnValueProvider.m',		
-            'OCMock/OCMConstraint.h',				
-            'OCMock/OCMConstraint.m',				
-            'OCMock/OCMExceptionReturnValueProvider.h',	
-            'OCMock/OCMExceptionReturnValueProvider.m',	
-            'OCMock/OCMIndirectReturnValueProvider.h',	
-            'OCMock/OCMIndirectReturnValueProvider.m',	
-            'OCMock/OCMNotificationPoster.h',			
-            'OCMock/OCMNotificationPoster.m',			
-            'OCMock/OCMObserverRecorder.h',			
+            'OCMock/OCMBoxedReturnValueProvider.h',
+            'OCMock/OCMBoxedReturnValueProvider.m',
+            'OCMock/OCMConstraint.h',
+            'OCMock/OCMConstraint.m',
+            'OCMock/OCMExceptionReturnValueProvider.h',
+            'OCMock/OCMExceptionReturnValueProvider.m',
+            'OCMock/OCMIndirectReturnValueProvider.h',
+            'OCMock/OCMIndirectReturnValueProvider.m',
+            'OCMock/OCMNotificationPoster.h',
+            'OCMock/OCMNotificationPoster.m',
+            'OCMock/OCMObserverRecorder.h',
             'OCMock/OCMPassByRefSetter.h',
             'OCMock/OCMPassByRefSetter.m',
             'OCMock/OCMRealObjectForwarder.h',