Skip to content

Commit

Permalink
Merged changes from pull request #44.
Browse files Browse the repository at this point in the history
  • Loading branch information
@erikdoe
erikdoe committed Nov 12, 2013
2 parents 8d501dc + fd91113 commit fef65ec
Show file tree
Hide file tree
Showing 17 changed files with 499 additions and 72 deletions.
221 changes: 219 additions & 2 deletions Source/OCMock.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,20 @@
2FA281C641E64586FE9A506D /* NSMethodSignatureOCMAdditionsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2FA28DEDB9163597B7C49F3D /* NSMethodSignatureOCMAdditionsTests.m */; };
2FA2859DB0F5EF004A3FD0D3 /* OCMockObjectProtocolMocksTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2FA286BFBD8B9D068B41E7EF /* OCMockObjectProtocolMocksTests.m */; };
2FA28896D9AFD309D59C9CFB /* OCMArgTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2FA28EDBF243639C57F88A1B /* OCMArgTests.m */; };
D31108B01828DB8700737925 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D31108AF1828DB8700737925 /* SenTestingKit.framework */; };
D31108B21828DB8700737925 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D31108B11828DB8700737925 /* Foundation.framework */; };
D31108B41828DB8700737925 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D31108B31828DB8700737925 /* UIKit.framework */; };
D31108BA1828DB8700737925 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D31108B81828DB8700737925 /* InfoPlist.strings */; };
D31108C31828DBD600737925 /* OCMockObjectTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 03B316251463350E0052CD09 /* OCMockObjectTests.m */; };
D31108C41828DBD600737925 /* OCMockObjectPartialMocksTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 03AC5C1416DF9FA500D82ECD /* OCMockObjectPartialMocksTests.m */; };
D31108C51828DBD600737925 /* OCMockObjectClassMethodMockingTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 039F91C516EFB493006C3D70 /* OCMockObjectClassMethodMockingTests.m */; };
D31108C61828DBD600737925 /* OCMockObjectForwardingTargetTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 0354D71F16F23AF5001766BB /* OCMockObjectForwardingTargetTests.m */; };
D31108C71828DBD600737925 /* OCMConstraintTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 03B316211463350E0052CD09 /* OCMConstraintTests.m */; };
D31108C81828DBD600737925 /* OCMockRecorderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 03B316271463350E0052CD09 /* OCMockRecorderTests.m */; };
D31108C91828DBD600737925 /* OCObserverMockObjectTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 03B316291463350E0052CD09 /* OCObserverMockObjectTests.m */; };
D31108CA1828DBD600737925 /* NSInvocationOCMAdditionsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 03B3161F1463350E0052CD09 /* NSInvocationOCMAdditionsTests.m */; };
D31108CB1828DC1300737925 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 030EF0DC14632FF700B04273 /* libOCMock.a */; };
D31108CD1828DC1900737925 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D31108CC1828DC1900737925 /* CoreGraphics.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -129,6 +143,13 @@
remoteGlobalIDString = 030EF0A714632FD000B04273;
remoteInfo = OCMock;
};
D31108BE1828DB8700737925 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 030EF09E14632FD000B04273 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 030EF0DB14632FF700B04273;
remoteInfo = OCMockLib;
};
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -214,6 +235,14 @@
2FA28CDB493350BF1DD26DC3 /* OCMockObjectProtocolMocksTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMockObjectProtocolMocksTests.h; sourceTree = "<group>"; };
2FA28DEDB9163597B7C49F3D /* NSMethodSignatureOCMAdditionsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSMethodSignatureOCMAdditionsTests.m; sourceTree = "<group>"; };
2FA28EDBF243639C57F88A1B /* OCMArgTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OCMArgTests.m; sourceTree = "<group>"; };
D31108AD1828DB8700737925 /* OCMockLibTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OCMockLibTests.octest; sourceTree = BUILT_PRODUCTS_DIR; };
D31108AF1828DB8700737925 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
D31108B11828DB8700737925 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
D31108B31828DB8700737925 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
D31108B71828DB8700737925 /* OCMockLibTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "OCMockLibTests-Info.plist"; sourceTree = "<group>"; };
D31108B91828DB8700737925 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
D31108BD1828DB8700737925 /* OCMockLibTests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OCMockLibTests-Prefix.pch"; sourceTree = "<group>"; };
D31108CC1828DC1900737925 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -244,6 +273,18 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
D31108AA1828DB8700737925 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
D31108CD1828DC1900737925 /* CoreGraphics.framework in Frameworks */,
D31108CB1828DC1300737925 /* libOCMock.a in Frameworks */,
D31108B01828DB8700737925 /* SenTestingKit.framework in Frameworks */,
D31108B41828DB8700737925 /* UIKit.framework in Frameworks */,
D31108B21828DB8700737925 /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
Expand All @@ -255,6 +296,7 @@
030EF0B114632FD000B04273 /* OCMock */,
030EF0C714632FD000B04273 /* OCMockTests */,
030EF0DF14632FF700B04273 /* OCMockLib */,
D31108B51828DB8700737925 /* OCMockLibTests */,
030EF0A914632FD000B04273 /* Products */,
);
sourceTree = "<group>";
Expand All @@ -265,6 +307,7 @@
030EF0A814632FD000B04273 /* OCMock.framework */,
030EF0C014632FD000B04273 /* OCMockTests.octest */,
030EF0DC14632FF700B04273 /* libOCMock.a */,
D31108AD1828DB8700737925 /* OCMockLibTests.octest */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -472,6 +515,37 @@
name = "Invocation Handler";
sourceTree = "<group>";
};
D31108AE1828DB8700737925 /* Frameworks */ = {
isa = PBXGroup;
children = (
D31108CC1828DC1900737925 /* CoreGraphics.framework */,
D31108AF1828DB8700737925 /* SenTestingKit.framework */,
D31108B11828DB8700737925 /* Foundation.framework */,
D31108B31828DB8700737925 /* UIKit.framework */,
);
name = Frameworks;
path = ..;
sourceTree = "<group>";
};
D31108B51828DB8700737925 /* OCMockLibTests */ = {
isa = PBXGroup;
children = (
D31108B61828DB8700737925 /* Supporting Files */,
D31108AE1828DB8700737925 /* Frameworks */,
);
path = OCMockLibTests;
sourceTree = "<group>";
};
D31108B61828DB8700737925 /* Supporting Files */ = {
isa = PBXGroup;
children = (
D31108B71828DB8700737925 /* OCMockLibTests-Info.plist */,
D31108B81828DB8700737925 /* InfoPlist.strings */,
D31108BD1828DB8700737925 /* OCMockLibTests-Prefix.pch */,
);
name = "Supporting Files";
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand Down Expand Up @@ -597,6 +671,24 @@
productReference = 030EF0DC14632FF700B04273 /* libOCMock.a */;
productType = "com.apple.product-type.library.static";
};
D31108AC1828DB8700737925 /* OCMockLibTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = D31108C01828DB8700737925 /* Build configuration list for PBXNativeTarget "OCMockLibTests" */;
buildPhases = (
D31108A91828DB8700737925 /* Sources */,
D31108AA1828DB8700737925 /* Frameworks */,
D31108AB1828DB8700737925 /* Resources */,
);
buildRules = (
);
dependencies = (
D31108BF1828DB8700737925 /* PBXTargetDependency */,
);
name = OCMockLibTests;
productName = OCMockLibTests;
productReference = D31108AD1828DB8700737925 /* OCMockLibTests.octest */;
productType = "com.apple.product-type.bundle";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
Expand All @@ -605,6 +697,11 @@
attributes = {
LastUpgradeCheck = 0460;
ORGANIZATIONNAME = "Mulle Kybernetik";
TargetAttributes = {
D31108AC1828DB8700737925 = {
TestTargetID = 030EF0DB14632FF700B04273;
};
};
};
buildConfigurationList = 030EF0A114632FD000B04273 /* Build configuration list for PBXProject "OCMock" */;
compatibilityVersion = "Xcode 3.2";
Expand All @@ -621,6 +718,7 @@
030EF0A714632FD000B04273 /* OCMock */,
030EF0BF14632FD000B04273 /* OCMockTests */,
030EF0DB14632FF700B04273 /* OCMockLib */,
D31108AC1828DB8700737925 /* OCMockLibTests */,
);
};
/* End PBXProject section */
Expand All @@ -642,6 +740,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
D31108AB1828DB8700737925 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D31108BA1828DB8700737925 /* InfoPlist.strings in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -749,6 +855,21 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
D31108A91828DB8700737925 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D31108C51828DBD600737925 /* OCMockObjectClassMethodMockingTests.m in Sources */,
D31108C71828DBD600737925 /* OCMConstraintTests.m in Sources */,
D31108C91828DBD600737925 /* OCObserverMockObjectTests.m in Sources */,
D31108C41828DBD600737925 /* OCMockObjectPartialMocksTests.m in Sources */,
D31108C81828DBD600737925 /* OCMockRecorderTests.m in Sources */,
D31108C61828DBD600737925 /* OCMockObjectForwardingTargetTests.m in Sources */,
D31108CA1828DBD600737925 /* NSInvocationOCMAdditionsTests.m in Sources */,
D31108C31828DBD600737925 /* OCMockObjectTests.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
Expand All @@ -757,6 +878,11 @@
target = 030EF0A714632FD000B04273 /* OCMock */;
targetProxy = 030EF0C414632FD000B04273 /* PBXContainerItemProxy */;
};
D31108BF1828DB8700737925 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 030EF0DB14632FF700B04273 /* OCMockLib */;
targetProxy = D31108BE1828DB8700737925 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
Expand All @@ -776,6 +902,14 @@
name = InfoPlist.strings;
sourceTree = "<group>";
};
D31108B81828DB8700737925 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
D31108B91828DB8700737925 /* en */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
Expand Down Expand Up @@ -926,7 +1060,10 @@
030EF0E614632FF700B04273 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
ARCHS = (
i386,
"$(ARCHS_STANDARD_INCLUDING_64_BIT)",
);
DSTROOT = /tmp/OCMockLib.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "OCMockLib/OCMockLib-Prefix.pch";
Expand All @@ -947,7 +1084,10 @@
030EF0E714632FF700B04273 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
ARCHS = (
i386,
"$(ARCHS_STANDARD_INCLUDING_64_BIT)",
);
DSTROOT = /tmp/OCMockLib.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "OCMockLib/OCMockLib-Prefix.pch";
Expand All @@ -966,6 +1106,75 @@
};
name = Release;
};
D31108C11828DB8700737925 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = NO;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(DEVELOPER_FRAMEWORKS_DIR)",
);
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "OCMockLibTests/OCMockLibTests-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
INFOPLIST_FILE = "OCMockLibTests/OCMockLibTests-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
WRAPPER_EXTENSION = octest;
};
name = Debug;
};
D31108C21828DB8700737925 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = NO;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
ENABLE_NS_ASSERTIONS = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
"$(DEVELOPER_FRAMEWORKS_DIR)",
);
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "OCMockLibTests/OCMockLibTests-Prefix.pch";
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
INFOPLIST_FILE = "OCMockLibTests/OCMockLibTests-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
WRAPPER_EXTENSION = octest;
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
Expand Down Expand Up @@ -1005,6 +1214,14 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
D31108C01828DB8700737925 /* Build configuration list for PBXNativeTarget "OCMockLibTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
D31108C11828DB8700737925 /* Debug */,
D31108C21828DB8700737925 /* Release */,
);
defaultConfigurationIsVisible = 0;
};
/* End XCConfigurationList section */
};
rootObject = 030EF09E14632FD000B04273 /* Project object */;
Expand Down
Loading

0 comments on commit fef65ec

Please sign in to comment.