From 58cd4a47e823645414348acbd8f963f7e713b2fa Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Tue, 26 May 2015 12:31:13 -0400 Subject: ObjC fixup for the branch. - Shouldn't need SRCROOT in the project since Xcode should be setting the working directory to where the project lives. - Remove the packed/unpacked repeated enum field in the tests and update the code to handle the defaults. - Move up the ignore to cover .DS_Store files in src also. add starstar --- objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj') diff --git a/objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj b/objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj index 0773acb1..d6e621e6 100644 --- a/objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj +++ b/objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj @@ -875,7 +875,7 @@ "\"$(DEVELOPER_DIR)/usr/lib\"", ); PRODUCT_NAME = UnitTests; - SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/Tests/UnitTests-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "Tests/UnitTests-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOSTestHarness.app/iOSTestHarness"; @@ -903,7 +903,7 @@ "\"$(DEVELOPER_DIR)/usr/lib\"", ); PRODUCT_NAME = UnitTests; - SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/Tests/UnitTests-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "Tests/UnitTests-Bridging-Header.h"; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iOSTestHarness.app/iOSTestHarness"; }; -- cgit v1.2.3