diff --git a/Examples/RKCatalog/RKCatalog.xcodeproj/project.pbxproj b/Examples/RKCatalog/RKCatalog.xcodeproj/project.pbxproj index 35184eb392..4deaee30d4 100644 --- a/Examples/RKCatalog/RKCatalog.xcodeproj/project.pbxproj +++ b/Examples/RKCatalog/RKCatalog.xcodeproj/project.pbxproj @@ -290,7 +290,7 @@ 2501DEA113607B74003DE9E4 /* libRestKitNetwork.a */, 2501DEA313607B74003DE9E4 /* libRestKitObjectMapping.a */, 2501DEA513607B74003DE9E4 /* libRestKitSupport.a */, - 25FB6D4F13E4830800F48969 /* libRestKitJSONParser+NXJSON.a */, + 25FB6D4F13E4830800F48969 /* libRestKitJSONParserNXJSON.a */, 2501DEA713607B74003DE9E4 /* libRestKitJSONParserYAJL.a */, 2501DEA913607B74003DE9E4 /* libRestKitJSONParserSBJSON.a */, 2501DEAB13607B74003DE9E4 /* libRestKitJSONParserJSONKit.a */, @@ -540,10 +540,9 @@ remoteRef = 2501DEB213607B74003DE9E4 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 25FB6D4F13E4830800F48969 /* libRestKitJSONParser+NXJSON.a */ = { + 25FB6D4F13E4830800F48969 /* libRestKitJSONParserNXJSON.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - name = "libRestKitJSONParser+NXJSON.a"; path = libRestKitJSONParserNXJSON.a; remoteRef = 25FB6D4E13E4830800F48969 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; @@ -660,7 +659,6 @@ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "$(SRCROOT)/../../Build"; IPHONEOS_DEPLOYMENT_TARGET = 4.3; OTHER_LDFLAGS = ( "-ObjC", @@ -680,7 +678,6 @@ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "$(SRCROOT)/../../Build"; IPHONEOS_DEPLOYMENT_TARGET = 4.3; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; OTHER_LDFLAGS = ( @@ -700,10 +697,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "App/RKCatalog-Prefix.pch"; INFOPLIST_FILE = "App/RKCatalog-Info.plist"; - LIBRARY_SEARCH_PATHS = ( - "\"$(SOURCE_ROOT)/../../Build/$(BUILD_STYLE)-$(PLATFORM_NAME)\"", - "\"$(SRCROOT)\"", - ); + LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)\""; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; @@ -718,10 +712,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "App/RKCatalog-Prefix.pch"; INFOPLIST_FILE = "App/RKCatalog-Info.plist"; - LIBRARY_SEARCH_PATHS = ( - "\"$(SOURCE_ROOT)/../../Build/$(BUILD_STYLE)-$(PLATFORM_NAME)\"", - "\"$(SRCROOT)\"", - ); + LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)\""; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; VALIDATE_PRODUCT = YES; diff --git a/Examples/RKDiscussionBoardExample/DiscussionBoard/DiscussionBoard.xcodeproj/project.pbxproj b/Examples/RKDiscussionBoardExample/DiscussionBoard/DiscussionBoard.xcodeproj/project.pbxproj index 4c3bfe4055..79d468b451 100755 --- a/Examples/RKDiscussionBoardExample/DiscussionBoard/DiscussionBoard.xcodeproj/project.pbxproj +++ b/Examples/RKDiscussionBoardExample/DiscussionBoard/DiscussionBoard.xcodeproj/project.pbxproj @@ -9,8 +9,6 @@ /* Begin PBXBuildFile section */ 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; - 25354DDF138EEDDD0099B4E2 /* libRestKitJSONParserJSONKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25354DDE138EEDDD0099B4E2 /* libRestKitJSONParserJSONKit.a */; }; - 25354DE1138EEDEC0099B4E2 /* libRestKitJSONParserYAJL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25354DE0138EEDEC0099B4E2 /* libRestKitJSONParserYAJL.a */; }; 25359E6512E3E0A5008BF33D /* libThree20.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25359D4212E3E0A4008BF33D /* libThree20.a */; }; 25359E6612E3E0A5008BF33D /* libThree20Core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25359D4312E3E0A4008BF33D /* libThree20Core.a */; }; 25359E6712E3E0A5008BF33D /* libThree20Network.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25359D4412E3E0A4008BF33D /* libThree20Network.a */; }; @@ -24,6 +22,11 @@ 25359ED712E512BB008BF33D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 25359ED612E512BB008BF33D /* main.m */; }; 25359F4112E53966008BF33D /* RKObjectLoaderTTModel+Loading.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F49C15A12DE1D9900FDE614 /* RKObjectLoaderTTModel+Loading.m */; }; 253E163412E8BA6500F3E4B0 /* DBContentObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 253E163312E8BA6500F3E4B0 /* DBContentObject.m */; }; + 258F853614106746007AABCD /* libRestKitJSONParserJSONKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25825AF41337CEAC00C0E3D2 /* libRestKitJSONParserJSONKit.a */; }; + 258F853714106746007AABCD /* libRestKitJSONParserNXJSON.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25FB6D6E13E483DE00F48969 /* libRestKitJSONParserNXJSON.a */; }; + 258F853814106746007AABCD /* libRestKitJSONParserSBJSON.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A7A2D3B312D7822D00683D6F /* libRestKitJSONParserSBJSON.a */; }; + 258F853914106746007AABCD /* libRestKitJSONParserYAJL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A7A2D3B112D7822D00683D6F /* libRestKitJSONParserYAJL.a */; }; + 258F853A14106746007AABCD /* libRestKitXMLParserLibxml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25A7B1DB13421D28004816AA /* libRestKitXMLParserLibxml.a */; }; 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; 3F22448812DDFCB30002559D /* UIViewController+RKLoading.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F22448712DDFCB30002559D /* UIViewController+RKLoading.m */; }; 3F255C9812DB70E200AFD2D1 /* DBPostsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F255C9312DB70E200AFD2D1 /* DBPostsTableViewController.m */; }; @@ -169,8 +172,6 @@ 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D6058910D05DD3D006BFB54 /* Discussion Board.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Discussion Board.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; - 25354DDE138EEDDD0099B4E2 /* libRestKitJSONParserJSONKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libRestKitJSONParserJSONKit.a; sourceTree = SOURCE_ROOT; }; - 25354DE0138EEDEC0099B4E2 /* libRestKitJSONParserYAJL.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libRestKitJSONParserYAJL.a; sourceTree = SOURCE_ROOT; }; 25359D4212E3E0A4008BF33D /* libThree20.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libThree20.a; sourceTree = ""; }; 25359D4312E3E0A4008BF33D /* libThree20Core.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libThree20Core.a; sourceTree = ""; }; 25359D4412E3E0A4008BF33D /* libThree20Network.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libThree20Network.a; sourceTree = ""; }; @@ -460,9 +461,6 @@ 25359ED612E512BB008BF33D /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Code/Other/main.m; sourceTree = SOURCE_ROOT; }; 253E163212E8BA6500F3E4B0 /* DBContentObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DBContentObject.h; sourceTree = ""; }; 253E163312E8BA6500F3E4B0 /* DBContentObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DBContentObject.m; sourceTree = ""; }; - 25DE017C138EE6EA006769D4 /* libRestKitJSONParserYAJL.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = libRestKitJSONParserYAJL.a; path = "/Users/blake/Projects/two_toasters/RestKit-object-mapping-2.0/Build/Release-iphoneos/libRestKitJSONParserYAJL.a"; sourceTree = ""; }; - 25DE017E138EE6F2006769D4 /* libRestKitJSONParserSBJSON.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; name = libRestKitJSONParserSBJSON.a; path = "/Users/blake/Projects/two_toasters/RestKit-object-mapping-2.0/Build/Release-iphoneos/libRestKitJSONParserSBJSON.a"; sourceTree = ""; }; - 25DE0182138EE79B006769D4 /* libRestKitJSONParserJSONKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libRestKitJSONParserJSONKit.a; sourceTree = SOURCE_ROOT; }; 25FED6E512E7D60600D94325 /* DiscussionBoard-Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "DiscussionBoard-Info copy.plist"; path = "Resources/DiscussionBoard-Info copy.plist"; sourceTree = ""; }; 25FED7BC12E7D6EC00D94325 /* DiscussionBoard-Info copy 2.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "DiscussionBoard-Info copy 2.plist"; path = "Resources/DiscussionBoard-Info copy 2.plist"; sourceTree = ""; }; 288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -520,6 +518,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 258F853614106746007AABCD /* libRestKitJSONParserJSONKit.a in Frameworks */, + 258F853714106746007AABCD /* libRestKitJSONParserNXJSON.a in Frameworks */, + 258F853814106746007AABCD /* libRestKitJSONParserSBJSON.a in Frameworks */, + 258F853914106746007AABCD /* libRestKitJSONParserYAJL.a in Frameworks */, + 258F853A14106746007AABCD /* libRestKitXMLParserLibxml.a in Frameworks */, 3F8CF774131D78D70023C5EA /* libxml2.dylib in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, @@ -534,8 +537,6 @@ 3F45615F12D7E31700BE25AD /* libRestKitObjectMapping.a in Frameworks */, 3F45616012D7E31800BE25AD /* libRestKitSupport.a in Frameworks */, 3F45616112D7E31900BE25AD /* libRestKitThree20.a in Frameworks */, - 25354DDF138EEDDD0099B4E2 /* libRestKitJSONParserJSONKit.a in Frameworks */, - 25354DE1138EEDEC0099B4E2 /* libRestKitJSONParserYAJL.a in Frameworks */, 25359E6512E3E0A5008BF33D /* libThree20.a in Frameworks */, 25359E6612E3E0A5008BF33D /* libThree20Core.a in Frameworks */, 25359E6712E3E0A5008BF33D /* libThree20Network.a in Frameworks */, @@ -1091,11 +1092,6 @@ children = ( 25359D4112E3E0A4008BF33D /* three20 */, A7A2D39412D7822C00683D6F /* RestKit.xcodeproj */, - 25354DE0138EEDEC0099B4E2 /* libRestKitJSONParserYAJL.a */, - 25354DDE138EEDDD0099B4E2 /* libRestKitJSONParserJSONKit.a */, - 25DE0182138EE79B006769D4 /* libRestKitJSONParserJSONKit.a */, - 25DE017E138EE6F2006769D4 /* libRestKitJSONParserSBJSON.a */, - 25DE017C138EE6EA006769D4 /* libRestKitJSONParserYAJL.a */, 3F8CF773131D78D70023C5EA /* libxml2.dylib */, ); name = Libraries; @@ -1107,7 +1103,7 @@ A7A2D3AB12D7822D00683D6F /* libRestKitNetwork.a */, A7A2D3AD12D7822D00683D6F /* libRestKitObjectMapping.a */, A7A2D3AF12D7822D00683D6F /* libRestKitSupport.a */, - 25FB6D6E13E483DE00F48969 /* libRestKitJSONParser+NXJSON.a */, + 25FB6D6E13E483DE00F48969 /* libRestKitJSONParserNXJSON.a */, A7A2D3B112D7822D00683D6F /* libRestKitJSONParserYAJL.a */, A7A2D3B312D7822D00683D6F /* libRestKitJSONParserSBJSON.a */, 25825AF41337CEAC00C0E3D2 /* libRestKitJSONParserJSONKit.a */, @@ -1191,10 +1187,9 @@ remoteRef = 25A7B1DA13421D28004816AA /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 25FB6D6E13E483DE00F48969 /* libRestKitJSONParser+NXJSON.a */ = { + 25FB6D6E13E483DE00F48969 /* libRestKitJSONParserNXJSON.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - name = "libRestKitJSONParser+NXJSON.a"; path = libRestKitJSONParserNXJSON.a; remoteRef = 25FB6D6D13E483DE00F48969 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; @@ -1342,10 +1337,7 @@ "DB_ENVIRONMENT=0", "DEBUG=1", ); - HEADER_SEARCH_PATHS = ( - ../../../Build, - Libraries/three20, - ); + HEADER_SEARCH_PATHS = Libraries/three20; INFOPLIST_FILE = "Resources/DiscussionBoard-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = ( @@ -1368,10 +1360,7 @@ "DB_ENVIRONMENT=2", "DEBUG=1", ); - HEADER_SEARCH_PATHS = ( - ../../../Build, - Libraries/three20, - ); + HEADER_SEARCH_PATHS = Libraries/three20; INFOPLIST_FILE = "Resources/DiscussionBoard-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = ( @@ -1394,10 +1383,7 @@ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - ../../../Build, - Libraries/three20/Build/Products/three20, - ); + HEADER_SEARCH_PATHS = Libraries/three20/Build/Products/three20; OTHER_LDFLAGS = "-ObjC"; SDKROOT = iphoneos; }; @@ -1413,10 +1399,7 @@ GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - ../../../Build, - Libraries/three20/Build/Products/three20, - ); + HEADER_SEARCH_PATHS = Libraries/three20/Build/Products/three20; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; SDKROOT = iphoneos; }; diff --git a/Examples/RKMacOSX/RKMacOSX.xcodeproj/project.pbxproj b/Examples/RKMacOSX/RKMacOSX.xcodeproj/project.pbxproj index a33afe4656..2b73a6d543 100644 --- a/Examples/RKMacOSX/RKMacOSX.xcodeproj/project.pbxproj +++ b/Examples/RKMacOSX/RKMacOSX.xcodeproj/project.pbxproj @@ -377,7 +377,6 @@ 25FB6DA013E4848200F48969 /* libRestKitJSONParser+NXJSON.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - name = "libRestKitJSONParser+NXJSON.a"; path = libRestKitJSONParserNXJSON.a; remoteRef = 25FB6D9F13E4848200F48969 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; diff --git a/Examples/RKTwitter/RKTwitter.xcodeproj/project.pbxproj b/Examples/RKTwitter/RKTwitter.xcodeproj/project.pbxproj index f2405af4aa..44875ded96 100755 --- a/Examples/RKTwitter/RKTwitter.xcodeproj/project.pbxproj +++ b/Examples/RKTwitter/RKTwitter.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -211,7 +211,7 @@ 250AC4A21358C79C006F084F /* libRestKitNetwork.a */, 250AC4A41358C79C006F084F /* libRestKitObjectMapping.a */, 250AC4A61358C79C006F084F /* libRestKitSupport.a */, - 25FB6DBB13E4850400F48969 /* libRestKitJSONParser+NXJSON.a */, + 25FB6DBB13E4850400F48969 /* libRestKitJSONParserNXJSON.a */, 250AC4A81358C79C006F084F /* libRestKitJSONParserYAJL.a */, 250AC4AA1358C79C006F084F /* libRestKitJSONParserSBJSON.a */, 250AC4AC1358C79C006F084F /* libRestKitJSONParserJSONKit.a */, @@ -310,8 +310,11 @@ /* Begin PBXProject section */ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0420; + }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "RKTwitter" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -406,10 +409,9 @@ remoteRef = 250AC4B31358C79C006F084F /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 25FB6DBB13E4850400F48969 /* libRestKitJSONParser+NXJSON.a */ = { + 25FB6DBB13E4850400F48969 /* libRestKitJSONParserNXJSON.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - name = "libRestKitJSONParser+NXJSON.a"; path = libRestKitJSONParserNXJSON.a; remoteRef = 25FB6DBA13E4850400F48969 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; @@ -459,16 +461,13 @@ 1D6058940D05DD3E006BFB54 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; BUILD_STYLE = Debug; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = RKTwitter_Prefix.pch; - HEADER_SEARCH_PATHS = "$(SRCROOT)/../../Build"; INFOPLIST_FILE = "Resources/RKTwitter-Info.plist"; - LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = RKTwitter; }; @@ -477,14 +476,11 @@ 1D6058950D05DD3E006BFB54 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; BUILD_STYLE = Release; COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = RKTwitter_Prefix.pch; - HEADER_SEARCH_PATHS = "$(SRCROOT)/../../Build"; INFOPLIST_FILE = "Resources/RKTwitter-Info.plist"; - LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = RKTwitter; VALIDATE_PRODUCT = YES; @@ -497,13 +493,9 @@ ARCHS = "$(ARCHS_STANDARD_32_BIT)"; BUILD_STYLE = Debug; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - LIBRARY_SEARCH_PATHS = "\"$(SOURCE_ROOT)/../../Build/$(BUILD_STYLE)-$(PLATFORM_NAME)\""; - PREBINDING = NO; SDKROOT = iphoneos; - SYMROOT = Build; }; name = Debug; }; @@ -513,14 +505,10 @@ ARCHS = "$(ARCHS_STANDARD_32_BIT)"; BUILD_STYLE = Release; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - LIBRARY_SEARCH_PATHS = "\"$(SOURCE_ROOT)/../../Build/$(BUILD_STYLE)-$(PLATFORM_NAME)\""; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; - PREBINDING = NO; SDKROOT = iphoneos; - SYMROOT = Build; }; name = Release; }; diff --git a/Examples/RKTwitterCoreData/RKTwitterCoreData.xcodeproj/project.pbxproj b/Examples/RKTwitterCoreData/RKTwitterCoreData.xcodeproj/project.pbxproj index 1e40f861d5..7ffeb9103f 100755 --- a/Examples/RKTwitterCoreData/RKTwitterCoreData.xcodeproj/project.pbxproj +++ b/Examples/RKTwitterCoreData/RKTwitterCoreData.xcodeproj/project.pbxproj @@ -257,7 +257,7 @@ 3F3CE2C5125B93780083FDCB /* libRestKitNetwork.a */, 3F3CE2C7125B93780083FDCB /* libRestKitObjectMapping.a */, 3F3CE2C9125B93780083FDCB /* libRestKitSupport.a */, - 25FB6DDD13E4868300F48969 /* libRestKitJSONParser+NXJSON.a */, + 25FB6DDD13E4868300F48969 /* libRestKitJSONParserNXJSON.a */, 3F3CE2CB125B93780083FDCB /* libRestKitJSONParserYAJL.a */, 3F3CE2CD125B93780083FDCB /* libRestKitJSONParserSBJSON.a */, 25E5EEB4133BB2D700C33091 /* libRestKitJSONParserJSONKit.a */, @@ -426,10 +426,9 @@ remoteRef = 25E5EEB3133BB2D700C33091 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 25FB6DDD13E4868300F48969 /* libRestKitJSONParser+NXJSON.a */ = { + 25FB6DDD13E4868300F48969 /* libRestKitJSONParserNXJSON.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - name = "libRestKitJSONParser+NXJSON.a"; path = libRestKitJSONParserNXJSON.a; remoteRef = 25FB6DDC13E4868300F48969 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; @@ -554,14 +553,12 @@ 1D6058940D05DD3E006BFB54 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; BUILD_STYLE = Debug; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = RKTwitter_Prefix.pch; - HEADER_SEARCH_PATHS = "$(SRCROOT)/../../Build"; INFOPLIST_FILE = "Resources/RKTwitter-Info.plist"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = RKTwitterCoreData; @@ -571,12 +568,10 @@ 1D6058950D05DD3E006BFB54 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; BUILD_STYLE = Release; COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = RKTwitter_Prefix.pch; - HEADER_SEARCH_PATHS = "$(SRCROOT)/../../Build"; INFOPLIST_FILE = "Resources/RKTwitter-Info.plist"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = RKTwitterCoreData; @@ -587,7 +582,6 @@ 25F2A1941322D59400A33DE4 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; BUILD_STYLE = Debug; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; @@ -595,7 +589,6 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = RKTwitter_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = RESTKIT_GENERATE_SEED_DB; - HEADER_SEARCH_PATHS = ../../Build; INFOPLIST_FILE = "Resources/RKTwitter-Info.plist"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "Generate Seed Database"; @@ -605,13 +598,11 @@ 25F2A1951322D59400A33DE4 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; BUILD_STYLE = Release; COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = RKTwitter_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = RESTKIT_GENERATE_SEED_DB; - HEADER_SEARCH_PATHS = ../../Build; INFOPLIST_FILE = "Resources/RKTwitter-Info.plist"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "Generate Seed Database"; diff --git a/README.md b/README.md index 09a86b8bf9..291e74b079 100644 --- a/README.md +++ b/README.md @@ -66,9 +66,6 @@ Quick Start (aka TL;DR) 1. Add Git submodule to your project: `git submodule add git://github.com/RestKit/RestKit.git RestKit` 1. Add cross-project reference by dragging **RestKit.xcodeproj** to your project 1. Open build settings editor for your project -1. Add **Header Search Path** to the `"$(SOURCE_ROOT)/RestKit/Build"` directory. **DO NOT** check the `Recursive` checkbox. -1. Add **Library Search Path** to the `"$(SOURCE_ROOT)/RestKit/Build/$(BUILD_STYLE)-$(PLATFORM_NAME)"` directory. -**NOTE**: This is only necessary if you are **NOT** using DerivedData. 1. Add **Other Linker Flags** for `-ObjC` 1. Open target settings editor for the target you want to link RestKit into 1. Add direct dependency on the **RestKit** aggregate target @@ -85,39 +82,19 @@ Quick Start (aka TL;DR) 1. A JSON parser implementation (either **libRestKitJSONParserJSONKit.a**, **libRestKitJSONParserYAJL.a**, or **libRestKitJSONParserSBJSON.a**). We recommend JSONKit. 1. Import the RestKit headers via `#import ` 1. Build the project to verify installation is successful. - -Xcode 3.x (Git Submodule) -------------------------- - -To add RestKit to your project (you're using git, right?): - -1. Add the submodule: `git submodule add git://github.com/RestKit/RestKit.git RestKit` -1. Open RestKit.xcodeproj and drag the RestKit project file into your XCode project. -1. Click on the entry for RestKit.xcodeproj in your project's **Groups & Files** section. In the right hand pane, find the entries for **libRestKitSupport.a** **libRestKitObjectMapping.a** **libRestKitNetwork.a** and **libRestKitJSONParserYAJL.a** and click the checkboxes on the far right underneath the silver target icon. This will link your project against RestKit. If you wish to use the Core Data support, click the checkbox next to **libRestKitCoreData.a** also. -1. Look to the bottom of the **General** pane labeled **Linked Libraries**. You will need to add the following frameworks: - * **CFNetwork.framework** - Required for networking support. - * **SystemConfiguration.framework** - Required for detection of network availability. - * **MobileCoreServices.framework** - Required. Provides support for MIME type auto-detection for uploaded files. - * **CoreData.framework** - Optional. Provides support for use of the Core Data backed persistent object store. - **libxml2.dylib** - Optional. Only necessary if you are mapping from XML payloads and link libRestKitXMLParserLibxml.a into your app. -1. Get Info on your target and you should be looking at the **General** tag. In the top **Direct Dependencies** section, click the plus button and add a direct dependency on the RestKit target. -1. Switch to the 'Build' tab in your project inspector. Make sure that your **Configuration** pop-up menu reads **All Configurations** so that your changes will work for all build configurations. -1. Find the **Header Search Paths** setting. Double click and add a new entry. When RestKit is compiled, it will copy all relevant headers to the appropriate location under the /Build directory within the RestKit checkout. You need to add a path to the /Build directory of RestKit, relative to your project file. For example, if you checked the submodule out in the root directory of your project, your header path would be `"$(SOURCE_ROOT)/RestKit/Build"`. -1. Find the **Library Search Paths** setting. Double click and add a new entry. Add a search path to your RestKit build directory such as `"$(SOURCE_ROOT)/RestKit/Build/$(BUILD_STYLE)-$(PLATFORM_NAME)"` -1. Now find the **Other Linker Flags** setting. Double click it and add entries for -ObjC. -1. You may now close out the inspector window. Xcode 4.x (Git Submodule) ------------------------- +**NOTE** RestKit requires the use of the Derived Data directory for the build products to simplify +installation. If you are not using Derived Data, you may have issues when attempting to import the headers. + 1. Add the submodule: `git submodule add git://github.com/RestKit/RestKit.git RestKit` 1. Open the project you wish to add RestKit to in Xcode. 1. Focus your project and select the "View" menu > "Navigators" > "Project" to bring the project file list into view. 1. Drag the RestKit.xcodeproj file from the Finder and drop it on your "(Your Project's Name)".xcodeproj. 1. Click on your project's name in the sidebar on the left to open the project settings view in the right pane of the window. 1. In the middle pane you will see **PROJECT** and **TARGETS** headers for your project. Click on your project name, then select **Build Settings** along the top to open the Build Settings editor for your entire project. -1. Find the **Header Search Paths** setting. Double click and add a new entry. Add a search path to the `"$(SOURCE_ROOT)/RestKit/Build"` directory you have added to your project. **DO NOT** check the `Recursive` checkbox. -1. Find the **Library Search Paths** setting. Double click and add a new entry. Add a search path to the `"$(SOURCE_ROOT)/RestKit/Build/$(BUILD_STYLE)-$(PLATFORM_NAME)"` directory you have added to your project. **NOTE**: This is only necessary if you are **NOT** using DerivedData. 1. Find the **Other Linker Flags** entry and double click it. Use the **+** button to add a new entry and enter `-ObjC`. Dismiss the editor with the **Done** button. 1. Locate the target you wish to add RestKit to in the **TARGETS** list in the middle of the editor pane. Select it to open the target settings editor in the right pane of the window. diff --git a/RestKit.xcodeproj/project.pbxproj b/RestKit.xcodeproj/project.pbxproj index e5e5bdfb65..80d9138e5f 100644 --- a/RestKit.xcodeproj/project.pbxproj +++ b/RestKit.xcodeproj/project.pbxproj @@ -12,8 +12,6 @@ buildConfigurationList = 255B7589133BABBF00ED76AD /* Build configuration list for PBXAggregateTarget "RestKit" */; buildPhases = ( 25E5EE67133BB0A700C33091 /* Copy RestKit Header */, - 255B759E133BAC1900ED76AD /* Copy Protected Headers */, - 255B759F133BAC2400ED76AD /* Copy Headers to Legacy Build Location */, ); dependencies = ( 255B758F133BABCD00ED76AD /* PBXTargetDependency */, @@ -408,7 +406,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 20808DBD13DE8CDC000A156A /* libRestKitJSONParser+NXJSON.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = "libRestKitJSONParser+NXJSON.a"; path = libRestKitJSONParserNXJSON.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 20808DBD13DE8CDC000A156A /* libRestKitJSONParserNXJSON.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRestKitJSONParserNXJSON.a; sourceTree = BUILT_PRODUCTS_DIR; }; 20808DF613DE90F5000A156A /* NSError+Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSError+Extensions.h"; path = "Vendor/NXJSON/NSError+Extensions.h"; sourceTree = ""; }; 20808DF713DE90F5000A156A /* NSError+Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSError+Extensions.m"; path = "Vendor/NXJSON/NSError+Extensions.m"; sourceTree = ""; }; 20808DF813DE90F5000A156A /* NXDebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NXDebug.h; path = Vendor/NXJSON/NXDebug.h; sourceTree = ""; }; @@ -551,6 +549,7 @@ 258C65EF133C317A004388A4 /* CopyHeadersToLegacyBuildDir.command */ = {isa = PBXFileReference; lastKnownFileType = text; path = CopyHeadersToLegacyBuildDir.command; sourceTree = ""; }; 258E490013C51FE600C9C883 /* RKJSONParserJSONKitSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RKJSONParserJSONKitSpec.m; sourceTree = ""; }; 258F846E1410574B007AABCD /* RKFixCategoryBug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RKFixCategoryBug.h; sourceTree = ""; }; + 258F8500141061C3007AABCD /* PortableStaticLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = PortableStaticLibrary.xcconfig; path = Vendor/PortableStaticLibrary.xcconfig; sourceTree = ""; }; 259050F213F8BDEB00694498 /* RKObjectPropertyInspector+CoreData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RKObjectPropertyInspector+CoreData.h"; sourceTree = ""; }; 259050F313F8BDEB00694498 /* RKObjectPropertyInspector+CoreData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RKObjectPropertyInspector+CoreData.m"; sourceTree = ""; }; 2590E64F125231F600531FA8 /* libRestKitJSONParserYAJL.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRestKitJSONParserYAJL.a; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -842,7 +841,7 @@ 253A080C12551D3000976E89 /* libRestKitSupport.a */, 253A081412551D5300976E89 /* libRestKitCoreData.a */, 3F6C39A510FE5C95008F47C5 /* RestKitSpecs.app */, - 20808DBD13DE8CDC000A156A /* libRestKitJSONParser+NXJSON.a */, + 20808DBD13DE8CDC000A156A /* libRestKitJSONParserNXJSON.a */, ); name = Products; path = ../..; @@ -1210,6 +1209,7 @@ 2590E6711252357200531FA8 /* Vendor */ = { isa = PBXGroup; children = ( + 258F8500141061C3007AABCD /* PortableStaticLibrary.xcconfig */, 250D5BD913A0698100471F0E /* LibComponentLogging */, 20808DB713DE8C7C000A156A /* NXJSON */, 73057FC61331AA28001908EE /* JSONKit */, @@ -1722,7 +1722,7 @@ ); name = "RestKitJSONParser+NXJSON"; productName = "RestKitJSONParser+NSJSON"; - productReference = 20808DBD13DE8CDC000A156A /* libRestKitJSONParser+NXJSON.a */; + productReference = 20808DBD13DE8CDC000A156A /* libRestKitJSONParserNXJSON.a */; productType = "com.apple.product-type.library.static"; }; 2523360411E79F090048F9B4 /* RestKitThree20 */ = { @@ -1732,7 +1732,6 @@ 2523360111E79F090048F9B4 /* Headers */, 2523360211E79F090048F9B4 /* Sources */, 2523360311E79F090048F9B4 /* Frameworks */, - 25E5F253133C2B5900C33091 /* Copy Headers to Legacy Build Location */, ); buildRules = ( ); @@ -2003,34 +2002,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 255B759E133BAC1900ED76AD /* Copy Protected Headers */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Copy Protected Headers"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = "/bin/sh Scripts/Protect.command"; - shellScript = ""; - }; - 255B759F133BAC2400ED76AD /* Copy Headers to Legacy Build Location */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Copy Headers to Legacy Build Location"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = "/bin/sh Scripts/CopyHeadersToLegacyBuildDir.command"; - shellScript = ""; - }; 25E5EE67133BB0A700C33091 /* Copy RestKit Header */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -2045,20 +2016,6 @@ shellPath = /bin/sh; shellScript = "cp -pf \"${SOURCE_ROOT}/Code/RestKit.h\" \"${TARGET_BUILD_DIR}/include/RestKit\""; }; - 25E5F253133C2B5900C33091 /* Copy Headers to Legacy Build Location */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Copy Headers to Legacy Build Location"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = "/bin/sh Scripts/CopyHeadersToLegacyBuildDir.command"; - shellScript = ""; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -2328,6 +2285,7 @@ /* Begin XCBuildConfiguration section */ 1DEB922308733DC00010E9CD /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 258F8500141061C3007AABCD /* PortableStaticLibrary.xcconfig */; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD_32_64_BIT)"; @@ -2340,7 +2298,6 @@ IPHONEOS_DEPLOYMENT_TARGET = 3.0; OTHER_LDFLAGS = "-ObjC"; SDKROOT = iphoneos; - SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; SYMROOT = Build; VALID_ARCHS = "armv6 armv7 i386 x86_64"; @@ -2349,6 +2306,7 @@ }; 1DEB922408733DC00010E9CD /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 258F8500141061C3007AABCD /* PortableStaticLibrary.xcconfig */; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD_32_64_BIT)"; @@ -2360,7 +2318,6 @@ IPHONEOS_DEPLOYMENT_TARGET = 3.0; OTHER_LDFLAGS = "-ObjC"; SDKROOT = iphoneos; - SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; SYMROOT = Build; VALID_ARCHS = "armv6 armv7 i386 x86_64"; @@ -2492,6 +2449,7 @@ }; 253216491338CA940099A5DB /* Distribution */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 258F8500141061C3007AABCD /* PortableStaticLibrary.xcconfig */; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD_32_64_BIT)"; @@ -2503,7 +2461,6 @@ IPHONEOS_DEPLOYMENT_TARGET = 3.0; OTHER_LDFLAGS = "-ObjC"; SDKROOT = iphoneos; - SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; SYMROOT = Build; VALID_ARCHS = "armv6 armv7 i386 x86_64"; @@ -2819,6 +2776,7 @@ }; 255920CC13BDEDB400E9C29C /* Ad Hoc */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 258F8500141061C3007AABCD /* PortableStaticLibrary.xcconfig */; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "ARCHS[sdk=macosx*]" = "$(ARCHS_STANDARD_32_64_BIT)"; @@ -2830,7 +2788,6 @@ IPHONEOS_DEPLOYMENT_TARGET = 3.0; OTHER_LDFLAGS = "-ObjC"; SDKROOT = iphoneos; - SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; SYMROOT = Build; VALID_ARCHS = "armv6 armv7 i386 x86_64"; @@ -2842,6 +2799,7 @@ buildSettings = { ONLY_ACTIVE_ARCH = NO; PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = NO; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; }; name = "Ad Hoc"; @@ -3056,6 +3014,7 @@ buildSettings = { ONLY_ACTIVE_ARCH = NO; PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = NO; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; }; name = Debug; @@ -3065,6 +3024,7 @@ buildSettings = { ONLY_ACTIVE_ARCH = NO; PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = NO; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; }; name = Release; @@ -3074,6 +3034,7 @@ buildSettings = { ONLY_ACTIVE_ARCH = NO; PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = NO; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; }; name = Distribution; diff --git a/Vendor/PortableStaticLibrary.xcconfig b/Vendor/PortableStaticLibrary.xcconfig new file mode 100644 index 0000000000..6278317544 --- /dev/null +++ b/Vendor/PortableStaticLibrary.xcconfig @@ -0,0 +1,6 @@ +// See http://mrox.net/blog/2011/06/19/framework-like-static-libraries/ +// Derived from: https://gist.github.com/972630 + +PUBLIC_HEADERS_FOLDER_PATH = include/$(PROJECT_NAME) +INSTALL_PATH = /../BuildProductsPath/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/ +OTHER_LDFLAGS = -ObjC \ No newline at end of file