diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..cdb19190fa --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "src/extThree20JSON/Vendors/TouchJSON"] + path = src/extThree20JSON/Vendors/TouchJSON + url = git://github.com/TouchCode/TouchJSON.git +[submodule "src/extThree20JSON/Vendors/JSONKit"] + path = src/extThree20JSON/Vendors/JSONKit + url = git://github.com/johnezang/JSONKit.git diff --git a/src/Three20/Three20.xcodeproj/project.pbxproj b/src/Three20/Three20.xcodeproj/project.pbxproj index c9badb0f26..5b2d00f582 100755 --- a/src/Three20/Three20.xcodeproj/project.pbxproj +++ b/src/Three20/Three20.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -455,9 +455,10 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 0410; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Three20" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -754,8 +755,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Internal; }; @@ -769,7 +770,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; PRODUCT_NAME = "$(BASE_PRODUCT_NAME)"; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = iphoneos; @@ -782,14 +783,14 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; PRODUCT_NAME = "$(BASE_PRODUCT_NAME)"; SDKROOT = iphoneos; + SKIP_INSTALL = NO; WRAPPER_EXTENSION = octest; }; name = Internal; @@ -802,7 +803,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; PRODUCT_NAME = "$(BASE_PRODUCT_NAME)"; SDKROOT = iphoneos; }; @@ -814,8 +815,7 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; PRODUCT_NAME = "$(BASE_PRODUCT_NAME)"; SDKROOT = iphoneos; ZERO_LINK = NO; @@ -830,8 +830,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Debug; }; @@ -843,8 +843,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Release; }; @@ -854,14 +854,14 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; PRODUCT_NAME = "$(BASE_PRODUCT_NAME)"; SDKROOT = iphoneos; + SKIP_INSTALL = NO; WRAPPER_EXTENSION = octest; }; name = Debug; @@ -872,12 +872,12 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; PRODUCT_NAME = "$(BASE_PRODUCT_NAME)"; SDKROOT = iphoneos; + SKIP_INSTALL = NO; WRAPPER_EXTENSION = octest; ZERO_LINK = NO; }; diff --git a/src/Three20Core/Three20Core.xcodeproj/project.pbxproj b/src/Three20Core/Three20Core.xcodeproj/project.pbxproj index d74bde33bb..a3be47e6f2 100755 --- a/src/Three20Core/Three20Core.xcodeproj/project.pbxproj +++ b/src/Three20Core/Three20Core.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -399,9 +399,10 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 0410; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Three20Core" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -531,8 +532,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Internal; }; @@ -546,7 +547,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = iphoneos; }; @@ -558,13 +559,13 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; + SKIP_INSTALL = NO; }; name = Internal; }; @@ -576,7 +577,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; }; name = Debug; @@ -587,8 +588,7 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; ZERO_LINK = NO; }; @@ -602,8 +602,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Debug; }; @@ -616,8 +616,8 @@ GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Release; }; @@ -627,13 +627,13 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; + SKIP_INSTALL = NO; }; name = Debug; }; @@ -643,11 +643,11 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; + SKIP_INSTALL = NO; ZERO_LINK = NO; }; name = Release; diff --git a/src/Three20Network/Three20Network.xcodeproj/project.pbxproj b/src/Three20Network/Three20Network.xcodeproj/project.pbxproj index 39f2f3af07..4b5969d460 100755 --- a/src/Three20Network/Three20Network.xcodeproj/project.pbxproj +++ b/src/Three20Network/Three20Network.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -561,9 +561,10 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 0410; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Three20Network" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -779,13 +780,13 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; PRODUCT_NAME = "$(BASE_PRODUCT_NAME)-Xcode3.2.5"; SDKROOT = iphoneos; + SKIP_INSTALL = NO; }; name = Debug; }; @@ -795,13 +796,13 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; PRODUCT_NAME = "$(BASE_PRODUCT_NAME)-Xcode3.2.5"; SDKROOT = iphoneos; + SKIP_INSTALL = NO; }; name = Internal; }; @@ -811,11 +812,11 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; PRODUCT_NAME = "$(BASE_PRODUCT_NAME)-Xcode3.2.5"; SDKROOT = iphoneos; + SKIP_INSTALL = NO; ZERO_LINK = NO; }; name = Release; @@ -828,7 +829,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; PRODUCT_NAME = "$(BASE_PRODUCT_NAME)-Xcode3.2.5"; SDKROOT = iphoneos; }; @@ -843,7 +844,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; PRODUCT_NAME = "$(BASE_PRODUCT_NAME)-Xcode3.2.5"; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = iphoneos; @@ -856,8 +857,7 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; PRODUCT_NAME = "$(BASE_PRODUCT_NAME)-Xcode3.2.5"; SDKROOT = iphoneos; ZERO_LINK = NO; @@ -872,8 +872,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Internal; }; @@ -886,7 +886,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PREFIX_HEADER = "$(SRCROOT)/../common/Xcode324iOS41Fix.pch"; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = iphoneos; }; @@ -898,14 +898,14 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SRCROOT)/../common/Xcode324iOS41Fix.pch"; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; + SKIP_INSTALL = NO; }; name = Internal; }; @@ -917,7 +917,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; }; name = Debug; @@ -928,8 +928,7 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; ZERO_LINK = NO; }; @@ -943,8 +942,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Debug; }; @@ -956,8 +955,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Release; }; @@ -967,14 +966,14 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SRCROOT)/../common/Xcode324iOS41Fix.pch"; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; + SKIP_INSTALL = NO; }; name = Debug; }; @@ -984,12 +983,12 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SRCROOT)/../common/Xcode324iOS41Fix.pch"; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; + SKIP_INSTALL = NO; ZERO_LINK = NO; }; name = Release; diff --git a/src/Three20Style/Three20Style.xcodeproj/project.pbxproj b/src/Three20Style/Three20Style.xcodeproj/project.pbxproj index 97855e1b69..11efbd7282 100755 --- a/src/Three20Style/Three20Style.xcodeproj/project.pbxproj +++ b/src/Three20Style/Three20Style.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -202,6 +202,20 @@ remoteGlobalIDString = EB9E6C6110B6A8F800DE563C; remoteInfo = UnitTests; }; + C697F63313D8EB0500BAA3A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6EE7389D1184ADB400A35176 /* Three20Network.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 662D81EF12630516005851C2; + remoteInfo = "Three20Network-Xcode3.2.5"; + }; + C697F63513D8EB0500BAA3A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6EE7389D1184ADB400A35176 /* Three20Network.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 662D81B2126304EB005851C2; + remoteInfo = "Three20NetworkUnitTests-Xcode3.2.5"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -726,7 +740,9 @@ isa = PBXGroup; children = ( 6EE738A31184ADB400A35176 /* libThree20Network.a */, + C697F63413D8EB0500BAA3A4 /* libThree20Network-Xcode3.2.5.a */, 6EE738A51184ADB400A35176 /* NetworkUnitTests.octest */, + C697F63613D8EB0500BAA3A4 /* NetworkUnitTests-Xcode3.2.5.octest */, ); name = Products; sourceTree = ""; @@ -858,9 +874,10 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 0410; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Three20Style" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -918,6 +935,20 @@ remoteRef = 6EE738A41184ADB400A35176 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + C697F63413D8EB0500BAA3A4 /* libThree20Network-Xcode3.2.5.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libThree20Network-Xcode3.2.5.a"; + remoteRef = C697F63313D8EB0500BAA3A4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + C697F63613D8EB0500BAA3A4 /* NetworkUnitTests-Xcode3.2.5.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "NetworkUnitTests-Xcode3.2.5.octest"; + remoteRef = C697F63513D8EB0500BAA3A4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -1090,8 +1121,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Internal; }; @@ -1105,7 +1136,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = iphoneos; }; @@ -1122,14 +1153,14 @@ "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"", ); GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; + SKIP_INSTALL = NO; WRAPPER_EXTENSION = octest; }; name = Internal; @@ -1142,7 +1173,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; }; name = Debug; @@ -1153,8 +1184,7 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; ZERO_LINK = NO; }; @@ -1168,8 +1198,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Debug; }; @@ -1181,8 +1211,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Release; }; @@ -1197,13 +1227,13 @@ "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"", ); GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; + SKIP_INSTALL = NO; WRAPPER_EXTENSION = octest; }; name = Debug; @@ -1219,12 +1249,12 @@ "\"$(SDKROOT)/Developer/Library/Frameworks\"", "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"", ); - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_VERSION = com.apple.compilers.llvmgcc42; HEADER_SEARCH_PATHS = .; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = NO; WRAPPER_EXTENSION = octest; ZERO_LINK = NO; }; diff --git a/src/Three20UI/Three20UI.xcodeproj/project.pbxproj b/src/Three20UI/Three20UI.xcodeproj/project.pbxproj index 95037af928..953cc10513 100755 --- a/src/Three20UI/Three20UI.xcodeproj/project.pbxproj +++ b/src/Three20UI/Three20UI.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -431,6 +431,20 @@ remoteGlobalIDString = EB9E6C6110B6A8F800DE563C; remoteInfo = UnitTests; }; + C697F64313D8EB7C00BAA3A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6EE7389D1184ADB400A35176 /* Three20Network.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 662D81EF12630516005851C2; + remoteInfo = "Three20Network-Xcode3.2.5"; + }; + C697F64513D8EB7C00BAA3A4 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6EE7389D1184ADB400A35176 /* Three20Network.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 662D81B2126304EB005851C2; + remoteInfo = "Three20NetworkUnitTests-Xcode3.2.5"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -1707,7 +1721,9 @@ isa = PBXGroup; children = ( 6EE738A31184ADB400A35176 /* libThree20Network.a */, + C697F64413D8EB7C00BAA3A4 /* libThree20Network-Xcode3.2.5.a */, 6EE738A51184ADB400A35176 /* NetworkUnitTests.octest */, + C697F64613D8EB7C00BAA3A4 /* NetworkUnitTests-Xcode3.2.5.octest */, ); name = Products; sourceTree = ""; @@ -1924,9 +1940,10 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 0410; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Three20UI" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -2038,6 +2055,20 @@ remoteRef = 6EE738A41184ADB400A35176 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + C697F64413D8EB7C00BAA3A4 /* libThree20Network-Xcode3.2.5.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libThree20Network-Xcode3.2.5.a"; + remoteRef = C697F64313D8EB7C00BAA3A4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + C697F64613D8EB7C00BAA3A4 /* NetworkUnitTests-Xcode3.2.5.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "NetworkUnitTests-Xcode3.2.5.octest"; + remoteRef = C697F64513D8EB7C00BAA3A4 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -2303,8 +2334,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Internal; }; @@ -2318,7 +2349,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = iphoneos; }; @@ -2330,14 +2361,14 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; + SKIP_INSTALL = NO; WRAPPER_EXTENSION = octest; }; name = Internal; @@ -2350,7 +2381,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; }; name = Debug; @@ -2361,8 +2392,7 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; ZERO_LINK = NO; }; @@ -2376,8 +2406,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Debug; }; @@ -2389,8 +2419,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Release; }; @@ -2400,13 +2430,13 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; + SKIP_INSTALL = NO; WRAPPER_EXTENSION = octest; }; name = Debug; @@ -2417,11 +2447,11 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; + SKIP_INSTALL = NO; WRAPPER_EXTENSION = octest; ZERO_LINK = NO; }; diff --git a/src/Three20UICommon/Three20UICommon.xcodeproj/project.pbxproj b/src/Three20UICommon/Three20UICommon.xcodeproj/project.pbxproj index 5e18515ab0..fd1a9e6bcc 100755 --- a/src/Three20UICommon/Three20UICommon.xcodeproj/project.pbxproj +++ b/src/Three20UICommon/Three20UICommon.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -298,9 +298,10 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 0410; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Three20UICommon" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -449,8 +450,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Internal; }; @@ -464,7 +465,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = iphoneos; }; @@ -476,14 +477,14 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; + SKIP_INSTALL = NO; WRAPPER_EXTENSION = octest; }; name = Internal; @@ -496,7 +497,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; }; name = Debug; @@ -507,8 +508,7 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; ZERO_LINK = NO; }; @@ -522,8 +522,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Debug; }; @@ -535,8 +535,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Release; }; @@ -546,13 +546,13 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; + SKIP_INSTALL = NO; WRAPPER_EXTENSION = octest; }; name = Debug; @@ -563,11 +563,11 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; + SKIP_INSTALL = NO; WRAPPER_EXTENSION = octest; ZERO_LINK = NO; }; diff --git a/src/Three20UINavigator/Three20UINavigator.xcodeproj/project.pbxproj b/src/Three20UINavigator/Three20UINavigator.xcodeproj/project.pbxproj index 27f7645611..aeaeace1cf 100755 --- a/src/Three20UINavigator/Three20UINavigator.xcodeproj/project.pbxproj +++ b/src/Three20UINavigator/Three20UINavigator.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -508,9 +508,10 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 0410; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Three20UINavigator" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -696,8 +697,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Internal; }; @@ -711,7 +712,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = iphoneos; }; @@ -723,14 +724,14 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; + SKIP_INSTALL = NO; WRAPPER_EXTENSION = octest; }; name = Internal; @@ -743,7 +744,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; }; name = Debug; @@ -754,8 +755,7 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; ZERO_LINK = NO; }; @@ -769,8 +769,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Debug; }; @@ -782,8 +782,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Release; }; @@ -793,13 +793,13 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; + SKIP_INSTALL = NO; WRAPPER_EXTENSION = octest; }; name = Debug; @@ -810,11 +810,11 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; + SKIP_INSTALL = NO; WRAPPER_EXTENSION = octest; ZERO_LINK = NO; }; diff --git a/src/extThree20CSSStyle/extThree20CSSStyle.xcodeproj/project.pbxproj b/src/extThree20CSSStyle/extThree20CSSStyle.xcodeproj/project.pbxproj index f9c0e99b6f..962332ef8c 100755 --- a/src/extThree20CSSStyle/extThree20CSSStyle.xcodeproj/project.pbxproj +++ b/src/extThree20CSSStyle/extThree20CSSStyle.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXAggregateTarget section */ @@ -558,9 +558,10 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 0410; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "extThree20CSSStyle" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -795,6 +796,7 @@ COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; + GCC_VERSION = com.apple.compilers.llvmgcc42; PRODUCT_NAME = Grammar; }; name = Debug; @@ -802,6 +804,7 @@ 6E083B2E11B6113900B99C32 /* Internal */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_VERSION = com.apple.compilers.llvmgcc42; PRODUCT_NAME = Grammar; }; name = Internal; @@ -811,7 +814,7 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; PRODUCT_NAME = Grammar; ZERO_LINK = NO; }; @@ -825,8 +828,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Internal; }; @@ -842,7 +845,7 @@ EXTJSON_SBJSON, DEBUG, ); - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = iphoneos; }; @@ -854,11 +857,11 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; + SKIP_INSTALL = NO; }; name = Internal; }; @@ -873,7 +876,7 @@ EXTJSON_SBJSON, DEBUG, ); - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; }; name = Debug; @@ -884,9 +887,8 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PREPROCESSOR_DEFINITIONS = EXTJSON_SBJSON; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; ZERO_LINK = NO; }; @@ -900,8 +902,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Debug; }; @@ -914,8 +916,8 @@ GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Release; }; @@ -925,11 +927,11 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; + SKIP_INSTALL = NO; }; name = Debug; }; @@ -939,9 +941,9 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; + SKIP_INSTALL = NO; ZERO_LINK = NO; }; name = Release; diff --git a/src/extThree20JSON/Configurations/Library+JSONKit.xcconfig b/src/extThree20JSON/Configurations/Library+JSONKit.xcconfig new file mode 100644 index 0000000000..89cb2d3428 --- /dev/null +++ b/src/extThree20JSON/Configurations/Library+JSONKit.xcconfig @@ -0,0 +1,29 @@ +// +// Copyright 2011 Dominic Böttger - Inspirationlabs +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +#include "../common/Configurations/Library.xcconfig" +#include "../common/Configurations/Libraries.xcconfig" + +BASE_PRODUCT_NAME = extThree20JSON +PRODUCT_NAME = $(BASE_PRODUCT_NAME)+JSONKit +BUILD_LIBRARY_VERSION = 1.0 + +// We override these paths in order to copy the headers to the same directory, +// regardless of target. +PRIVATE_HEADERS_FOLDER_PATH = /../three20/$(BASE_PRODUCT_NAME)/private +PUBLIC_HEADERS_FOLDER_PATH = /../three20/$(BASE_PRODUCT_NAME) + +GCC_PREFIX_HEADER = $(SRCROOT)/Headers/$(BASE_PRODUCT_NAME)+JSONKit_Prefix.pch diff --git a/src/extThree20JSON/Configurations/Library+TouchJSON.xcconfig b/src/extThree20JSON/Configurations/Library+TouchJSON.xcconfig new file mode 100644 index 0000000000..21a132f666 --- /dev/null +++ b/src/extThree20JSON/Configurations/Library+TouchJSON.xcconfig @@ -0,0 +1,29 @@ +// +// Copyright 2011 Dominic Böttger - Inspirationlabs +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +#include "../common/Configurations/Library.xcconfig" +#include "../common/Configurations/Libraries.xcconfig" + +BASE_PRODUCT_NAME = extThree20JSON +PRODUCT_NAME = $(BASE_PRODUCT_NAME)+TouchJSON +BUILD_LIBRARY_VERSION = 1.0 + +// We override these paths in order to copy the headers to the same directory, +// regardless of target. +PRIVATE_HEADERS_FOLDER_PATH = /../three20/$(BASE_PRODUCT_NAME)/private +PUBLIC_HEADERS_FOLDER_PATH = /../three20/$(BASE_PRODUCT_NAME) + +GCC_PREFIX_HEADER = $(SRCROOT)/Headers/$(BASE_PRODUCT_NAME)+TouchJSON_Prefix.pch diff --git a/src/extThree20JSON/Headers/extThree20JSON+JSONKit_Prefix.pch b/src/extThree20JSON/Headers/extThree20JSON+JSONKit_Prefix.pch new file mode 100644 index 0000000000..d6f5f87ccb --- /dev/null +++ b/src/extThree20JSON/Headers/extThree20JSON+JSONKit_Prefix.pch @@ -0,0 +1,21 @@ +// +// Copyright 2011 Dominic Böttger - Inspirationlabs +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +//#import "../../common/Xcode324iOS41Fix.pch" + +#ifdef __OBJC__ + #import +#endif diff --git a/src/extThree20JSON/Headers/extThree20JSON+TouchJSON_Prefix.pch b/src/extThree20JSON/Headers/extThree20JSON+TouchJSON_Prefix.pch new file mode 100644 index 0000000000..4c2a9861a4 --- /dev/null +++ b/src/extThree20JSON/Headers/extThree20JSON+TouchJSON_Prefix.pch @@ -0,0 +1,21 @@ +// +// Copyright 2011 Dominic Böttger - Inspirationlabs +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +#import "../../common/Xcode324iOS41Fix.pch" + +#ifdef __OBJC__ + #import +#endif diff --git a/src/extThree20JSON/Source/TTExtensionLoader.m b/src/extThree20JSON/Source/TTExtensionLoader.m index 16cb9966e8..ce78fbd025 100644 --- a/src/extThree20JSON/Source/TTExtensionLoader.m +++ b/src/extThree20JSON/Source/TTExtensionLoader.m @@ -44,6 +44,7 @@ - (TTExtensionInfo*)extensionInfoNamedThree20JSON { extension.license = @"Apache 2.0"; extension.authors = [NSArray arrayWithObjects: [TTExtensionAuthor authorWithName:@"Jeff Verkoeyen"], + [TTExtensionAuthor authorWithName:@"Dominic Böttger"], nil]; #ifdef EXTJSON_SBJSON @@ -52,8 +53,13 @@ - (TTExtensionInfo*)extensionInfoNamedThree20JSON { #elif defined(EXTJSON_YAJL) extension.version = [extension.version stringByAppendingString:@" YAJL 1.0.11"]; extension.copyright = [extension.copyright stringByAppendingString:@" 2009 Gabriel Handford. 2010 Lloyd Hilaiel."]; +#elif defined(EXTJSON_TouchJSON) + extension.version = [extension.version stringByAppendingString:@" TouchJSON"]; + extension.copyright = [extension.copyright stringByAppendingString:@" 2008 Jonathan Wight"]; +#elif defined(EXTJSON_JSONKit) + extension.version = [extension.version stringByAppendingString:@" JSONKit"]; + extension.copyright = [extension.copyright stringByAppendingString:@" 2011 John Engelhart"]; #endif - return [extension autorelease]; } diff --git a/src/extThree20JSON/Source/TTURLJSONResponse.m b/src/extThree20JSON/Source/TTURLJSONResponse.m index 19cdd7936c..f58f2d2ac5 100644 --- a/src/extThree20JSON/Source/TTURLJSONResponse.m +++ b/src/extThree20JSON/Source/TTURLJSONResponse.m @@ -22,6 +22,10 @@ #import "extThree20JSON/JSON.h" #elif defined(EXTJSON_YAJL) #import "extThree20JSON/NSObject+YAJL.h" +#elif defined(EXTJSON_TouchJSON) +#import "extThree20JSON/CJSONDeserializer.h" +#elif defined(EXTJSON_JSONKit) +#import "extThree20JSON/JSONKit.h" #endif // Core @@ -39,8 +43,9 @@ @implementation TTURLJSONResponse /////////////////////////////////////////////////////////////////////////////////////////////////// - (void)dealloc { +#ifndef EXTJSON_TouchJSON TT_RELEASE_SAFELY(_rootObject); - +#endif [super dealloc]; } @@ -81,6 +86,17 @@ - (NSError*)request:(TTURLRequest*)request processResponse:(NSHTTPURLResponse*)r code:kTTExtJSONErrorCodeInvalidJSON userInfo:[exception userInfo]]; } +#elif defined(EXTJSON_TouchJSON) + _rootObject = [[CJSONDeserializer deserializer] deserialize:data error:&err]; +#elif defined(EXTJSON_JSONKit) + @try { + _rootObject = [[[JSONDecoder decoder] objectWithData:data error:&err] retain]; + } + @catch (NSException* exception) { + err = [NSError errorWithDomain:kTTExtJSONErrorDomain + code:kTTExtJSONErrorCodeInvalidJSON + userInfo:[exception userInfo]]; + } #endif } diff --git a/src/extThree20JSON/Vendors/JSONKit b/src/extThree20JSON/Vendors/JSONKit new file mode 160000 index 0000000000..2e6ccf4ecc --- /dev/null +++ b/src/extThree20JSON/Vendors/JSONKit @@ -0,0 +1 @@ +Subproject commit 2e6ccf4ecc28db1e7c511546f269233d96c87f4c diff --git a/src/extThree20JSON/Vendors/TouchJSON b/src/extThree20JSON/Vendors/TouchJSON new file mode 160000 index 0000000000..2abba33a21 --- /dev/null +++ b/src/extThree20JSON/Vendors/TouchJSON @@ -0,0 +1 @@ +Subproject commit 2abba33a21b9aacc16d6fdca14696155190b5ab6 diff --git a/src/extThree20JSON/extThree20JSON.xcodeproj/project.pbxproj b/src/extThree20JSON/extThree20JSON.xcodeproj/project.pbxproj index d2e0e21919..bb01b4e4c7 100755 --- a/src/extThree20JSON/extThree20JSON.xcodeproj/project.pbxproj +++ b/src/extThree20JSON/extThree20JSON.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -83,6 +83,33 @@ 6E6462121187DD2F00F08CB1 /* extThree20JSON.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E6462111187DD2A00F08CB1 /* extThree20JSON.h */; settings = {ATTRIBUTES = (Public, ); }; }; 6E6462131187DD3300F08CB1 /* extThree20JSON.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E6462111187DD2A00F08CB1 /* extThree20JSON.h */; settings = {ATTRIBUTES = (Public, ); }; }; 6EB460DA1183D8CB00685649 /* libextThree20JSON+SBJSON.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEF31F3A0F352DF5000DE5D2 /* libextThree20JSON+SBJSON.a */; }; + C641E5C81351FBB200676C51 /* TTURLJSONResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E645A1A11876C9800F08CB1 /* TTURLJSONResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C641E5CF1351FBB200676C51 /* extThree20JSON.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E6462111187DD2A00F08CB1 /* extThree20JSON.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C641E5D01351FBB200676C51 /* TTErrorCodes.h in Headers */ = {isa = PBXBuildFile; fileRef = 664B29E812848B1A0008D569 /* TTErrorCodes.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C641E5D11351FBB200676C51 /* TTExtensionLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 6609982012939800007B1E07 /* TTExtensionLoader.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C641E5D41351FBB200676C51 /* TTURLJSONResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E645A1C11876C9800F08CB1 /* TTURLJSONResponse.m */; }; + C641E5DA1351FBB200676C51 /* TTErrorCodes.m in Sources */ = {isa = PBXBuildFile; fileRef = 664B29EF12848B270008D569 /* TTErrorCodes.m */; }; + C641E5DB1351FBB200676C51 /* TTExtensionLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 66099817129397F5007B1E07 /* TTExtensionLoader.m */; }; + C641E68C1351FF7900676C51 /* JSONKit.h in Headers */ = {isa = PBXBuildFile; fileRef = C641E6891351FF7900676C51 /* JSONKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C641E68D1351FF7900676C51 /* JSONKit.m in Sources */ = {isa = PBXBuildFile; fileRef = C641E68A1351FF7900676C51 /* JSONKit.m */; }; + C641E69C135202A000676C51 /* extThree20JSON+JSONKit_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = C641E69B135202A000676C51 /* extThree20JSON+JSONKit_Prefix.pch */; }; + C6429F4C1327E0930062B00C /* TTURLJSONResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E645A1A11876C9800F08CB1 /* TTURLJSONResponse.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C6429F521327E0930062B00C /* extThree20JSON.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E6462111187DD2A00F08CB1 /* extThree20JSON.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C6429F531327E0930062B00C /* TTErrorCodes.h in Headers */ = {isa = PBXBuildFile; fileRef = 664B29E812848B1A0008D569 /* TTErrorCodes.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C6429F5E1327E0930062B00C /* TTExtensionLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 6609982012939800007B1E07 /* TTExtensionLoader.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C6429F621327E0930062B00C /* TTURLJSONResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E645A1C11876C9800F08CB1 /* TTURLJSONResponse.m */; }; + C6429F701327E0930062B00C /* TTExtensionLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 66099817129397F5007B1E07 /* TTExtensionLoader.m */; }; + C6429F9C1327E54E0062B00C /* extThree20JSON+TouchJSON_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = C6429F9B1327E54E0062B00C /* extThree20JSON+TouchJSON_Prefix.pch */; }; + C6CCA1BC13284C7300F27105 /* CDataScanner.h in Headers */ = {isa = PBXBuildFile; fileRef = C6CCA1801328466700F27105 /* CDataScanner.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C6CCA1BD13284C7300F27105 /* CDataScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = C6CCA1811328466700F27105 /* CDataScanner.m */; }; + C6CCA1BE13284CC400F27105 /* TTErrorCodes.m in Sources */ = {isa = PBXBuildFile; fileRef = 664B29EF12848B270008D569 /* TTErrorCodes.m */; }; + C6CCA1D513284E5700F27105 /* CJSONDeserializer.h in Headers */ = {isa = PBXBuildFile; fileRef = C6CCA1911328466700F27105 /* CJSONDeserializer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C6CCA1D613284E5700F27105 /* CJSONDeserializer.m in Sources */ = {isa = PBXBuildFile; fileRef = C6CCA1921328466700F27105 /* CJSONDeserializer.m */; }; + C6CCA1D713284E5700F27105 /* CJSONScanner.h in Headers */ = {isa = PBXBuildFile; fileRef = C6CCA1931328466700F27105 /* CJSONScanner.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C6CCA1D813284E5700F27105 /* CJSONScanner.m in Sources */ = {isa = PBXBuildFile; fileRef = C6CCA1941328466700F27105 /* CJSONScanner.m */; }; + C6CCA1D913284E5700F27105 /* CJSONSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = C6CCA1951328466700F27105 /* CJSONSerializer.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C6CCA1DA13284E5700F27105 /* CJSONSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = C6CCA1961328466700F27105 /* CJSONSerializer.m */; }; + C6CCA1DB13284E5700F27105 /* JSONRepresentation.h in Headers */ = {isa = PBXBuildFile; fileRef = C6CCA1971328466700F27105 /* JSONRepresentation.h */; settings = {ATTRIBUTES = (Private, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -163,6 +190,48 @@ remoteGlobalIDString = BEF31F390F352DF5000DE5D2; remoteInfo = extThree20JSON; }; + C641E5C41351FBB200676C51 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6E645A6A11876D3F00F08CB1 /* Three20Core.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = BEF31F390F352DF5000DE5D2; + remoteInfo = Three20Core; + }; + C641E5C61351FBB200676C51 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6E645A7311876D4600F08CB1 /* Three20Network.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = BEF31F390F352DF5000DE5D2; + remoteInfo = Three20Network; + }; + C6429F481327E0930062B00C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6E645A6A11876D3F00F08CB1 /* Three20Core.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = BEF31F390F352DF5000DE5D2; + remoteInfo = Three20Core; + }; + C6429F4A1327E0930062B00C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6E645A7311876D4600F08CB1 /* Three20Network.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = BEF31F390F352DF5000DE5D2; + remoteInfo = Three20Network; + }; + C6AC954F13D8E889003EA563 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6E645A7311876D4600F08CB1 /* Three20Network.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 662D81EF12630516005851C2; + remoteInfo = "Three20Network-Xcode3.2.5"; + }; + C6AC955113D8E889003EA563 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 6E645A7311876D4600F08CB1 /* Three20Network.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 662D81B2126304EB005851C2; + remoteInfo = "Three20NetworkUnitTests-Xcode3.2.5"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -252,6 +321,59 @@ 6EB460921183D16000685649 /* UnitTests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "UnitTests-Info.plist"; path = "UnitTests/Resources/PropertyLists/UnitTests-Info.plist"; sourceTree = ""; }; 6EB460A61183D2AC00685649 /* UnitTests+SBJSON.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "UnitTests+SBJSON.xcconfig"; path = "Configurations/UnitTests+SBJSON.xcconfig"; sourceTree = ""; }; BEF31F3A0F352DF5000DE5D2 /* libextThree20JSON+SBJSON.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libextThree20JSON+SBJSON.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + C641E5E11351FBB200676C51 /* libextThree20JSON+JSONKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libextThree20JSON+JSONKit.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + C641E6651351FF7900676C51 /* config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = config; sourceTree = ""; }; + C641E6661351FF7900676C51 /* description */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = description; sourceTree = ""; }; + C641E6671351FF7900676C51 /* HEAD */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HEAD; sourceTree = ""; }; + C641E6691351FF7900676C51 /* applypatch-msg.sample */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "applypatch-msg.sample"; sourceTree = ""; }; + C641E66A1351FF7900676C51 /* commit-msg.sample */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "commit-msg.sample"; sourceTree = ""; }; + C641E66B1351FF7900676C51 /* post-commit.sample */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "post-commit.sample"; sourceTree = ""; }; + C641E66C1351FF7900676C51 /* post-receive.sample */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "post-receive.sample"; sourceTree = ""; }; + C641E66D1351FF7900676C51 /* post-update.sample */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "post-update.sample"; sourceTree = ""; }; + C641E66E1351FF7900676C51 /* pre-applypatch.sample */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "pre-applypatch.sample"; sourceTree = ""; }; + C641E66F1351FF7900676C51 /* pre-commit.sample */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "pre-commit.sample"; sourceTree = ""; }; + C641E6701351FF7900676C51 /* pre-rebase.sample */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "pre-rebase.sample"; sourceTree = ""; }; + C641E6711351FF7900676C51 /* prepare-commit-msg.sample */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "prepare-commit-msg.sample"; sourceTree = ""; }; + C641E6721351FF7900676C51 /* update.sample */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = update.sample; sourceTree = ""; }; + C641E6731351FF7900676C51 /* index */ = {isa = PBXFileReference; lastKnownFileType = file; path = index; sourceTree = ""; }; + C641E6751351FF7900676C51 /* exclude */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = exclude; sourceTree = ""; }; + C641E6771351FF7900676C51 /* HEAD */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HEAD; sourceTree = ""; }; + C641E67A1351FF7900676C51 /* master */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = master; sourceTree = ""; }; + C641E67E1351FF7900676C51 /* pack-7790b2b75c82136c793e5b2a39a48eaccb210402.idx */ = {isa = PBXFileReference; lastKnownFileType = file; path = "pack-7790b2b75c82136c793e5b2a39a48eaccb210402.idx"; sourceTree = ""; }; + C641E67F1351FF7900676C51 /* pack-7790b2b75c82136c793e5b2a39a48eaccb210402.pack */ = {isa = PBXFileReference; lastKnownFileType = file; path = "pack-7790b2b75c82136c793e5b2a39a48eaccb210402.pack"; sourceTree = ""; }; + C641E6801351FF7900676C51 /* packed-refs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "packed-refs"; sourceTree = ""; }; + C641E6831351FF7900676C51 /* master */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = master; sourceTree = ""; }; + C641E6861351FF7900676C51 /* HEAD */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HEAD; sourceTree = ""; }; + C641E6881351FF7900676C51 /* CHANGELOG.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG.md; sourceTree = ""; }; + C641E6891351FF7900676C51 /* JSONKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONKit.h; sourceTree = ""; }; + C641E68A1351FF7900676C51 /* JSONKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSONKit.m; sourceTree = ""; }; + C641E68B1351FF7900676C51 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = ""; }; + C641E69B135202A000676C51 /* extThree20JSON+JSONKit_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "extThree20JSON+JSONKit_Prefix.pch"; path = "Headers/extThree20JSON+JSONKit_Prefix.pch"; sourceTree = ""; }; + C641E6BD135203A500676C51 /* Library+TouchJSON.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "Library+TouchJSON.xcconfig"; path = "Configurations/Library+TouchJSON.xcconfig"; sourceTree = ""; }; + C641E6BE135203BB00676C51 /* Library+JSONKit.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "Library+JSONKit.xcconfig"; path = "Configurations/Library+JSONKit.xcconfig"; sourceTree = ""; }; + C6429F771327E0930062B00C /* libextThree20JSON+TouchJSON.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libextThree20JSON+TouchJSON.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + C6429F9B1327E54E0062B00C /* extThree20JSON+TouchJSON_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "extThree20JSON+TouchJSON_Prefix.pch"; path = "Headers/extThree20JSON+TouchJSON_Prefix.pch"; sourceTree = ""; }; + C6CCA1801328466700F27105 /* CDataScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDataScanner.h; sourceTree = ""; }; + C6CCA1811328466700F27105 /* CDataScanner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDataScanner.m; sourceTree = ""; }; + C6CCA1831328466700F27105 /* CFilteringJSONSerializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CFilteringJSONSerializer.h; sourceTree = ""; }; + C6CCA1841328466700F27105 /* CFilteringJSONSerializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CFilteringJSONSerializer.m; sourceTree = ""; }; + C6CCA1851328466700F27105 /* CJSONDeserializer_BlocksExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CJSONDeserializer_BlocksExtensions.h; sourceTree = ""; }; + C6CCA1861328466700F27105 /* CJSONDeserializer_BlocksExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CJSONDeserializer_BlocksExtensions.m; sourceTree = ""; }; + C6CCA1871328466700F27105 /* CJSONSerialization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CJSONSerialization.h; sourceTree = ""; }; + C6CCA1881328466700F27105 /* CJSONSerialization.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CJSONSerialization.m; sourceTree = ""; }; + C6CCA1891328466700F27105 /* CJSONSerializedData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CJSONSerializedData.h; sourceTree = ""; }; + C6CCA18A1328466700F27105 /* CJSONSerializedData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CJSONSerializedData.m; sourceTree = ""; }; + C6CCA18C1328466700F27105 /* CDataScanner_Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDataScanner_Extensions.h; sourceTree = ""; }; + C6CCA18D1328466700F27105 /* CDataScanner_Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDataScanner_Extensions.m; sourceTree = ""; }; + C6CCA18E1328466700F27105 /* NSDictionary_JSONExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSDictionary_JSONExtensions.h; sourceTree = ""; }; + C6CCA18F1328466700F27105 /* NSDictionary_JSONExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSDictionary_JSONExtensions.m; sourceTree = ""; }; + C6CCA1911328466700F27105 /* CJSONDeserializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CJSONDeserializer.h; sourceTree = ""; }; + C6CCA1921328466700F27105 /* CJSONDeserializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CJSONDeserializer.m; sourceTree = ""; }; + C6CCA1931328466700F27105 /* CJSONScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CJSONScanner.h; sourceTree = ""; }; + C6CCA1941328466700F27105 /* CJSONScanner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CJSONScanner.m; sourceTree = ""; }; + C6CCA1951328466700F27105 /* CJSONSerializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CJSONSerializer.h; sourceTree = ""; }; + C6CCA1961328466700F27105 /* CJSONSerializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CJSONSerializer.m; sourceTree = ""; }; + C6CCA1971328466700F27105 /* JSONRepresentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONRepresentation.h; sourceTree = ""; }; EB9E6C6210B6A8F800DE563C /* extJSONUnitTests+SBJSON.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "extJSONUnitTests+SBJSON.octest"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -270,6 +392,20 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + C641E5DC1351FBB200676C51 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + C6429F721327E0930062B00C /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; EB9E6C5F10B6A8F800DE563C /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -289,6 +425,8 @@ BEF31F3A0F352DF5000DE5D2 /* libextThree20JSON+SBJSON.a */, 6E645BD91187751200F08CB1 /* libextThree20JSON+YAJL.a */, EB9E6C6210B6A8F800DE563C /* extJSONUnitTests+SBJSON.octest */, + C6429F771327E0930062B00C /* libextThree20JSON+TouchJSON.a */, + C641E5E11351FBB200676C51 /* libextThree20JSON+JSONKit.a */, ); name = Products; sourceTree = ""; @@ -299,6 +437,8 @@ 6E6462111187DD2A00F08CB1 /* extThree20JSON.h */, 6E645BF71187771D00F08CB1 /* extThree20JSON+SBJSON_Prefix.pch */, 6E645BF81187771D00F08CB1 /* extThree20JSON+YAJL_Prefix.pch */, + C6429F9B1327E54E0062B00C /* extThree20JSON+TouchJSON_Prefix.pch */, + C641E69B135202A000676C51 /* extThree20JSON+JSONKit_Prefix.pch */, 6609982012939800007B1E07 /* TTExtensionLoader.h */, 66099817129397F5007B1E07 /* TTExtensionLoader.m */, 6EB4609C1183D1E000685649 /* Source */, @@ -360,8 +500,10 @@ 6E645A1F11876CA800F08CB1 /* Vendors */ = { isa = PBXGroup; children = ( - 6E645A2011876CA800F08CB1 /* SBJSON */, 6E645AF71187744C00F08CB1 /* YAJL */, + C641E6621351FF7800676C51 /* JSONKit */, + C6CCA17F1328466700F27105 /* TouchJSON */, + 6E645A2011876CA800F08CB1 /* SBJSON */, ); path = Vendors; sourceTree = ""; @@ -424,7 +566,9 @@ isa = PBXGroup; children = ( 6E645A7911876D4600F08CB1 /* libThree20Network.a */, + C6AC955013D8E889003EA563 /* libThree20Network-Xcode3.2.5.a */, 6E645A7B11876D4600F08CB1 /* NetworkUnitTests.octest */, + C6AC955213D8E889003EA563 /* NetworkUnitTests-Xcode3.2.5.octest */, ); name = Products; sourceTree = ""; @@ -493,14 +637,222 @@ 6ED118E41183C38A0096AEBF /* Configurations */ = { isa = PBXGroup; children = ( + C641E6BE135203BB00676C51 /* Library+JSONKit.xcconfig */, 6E55A4B31183CA80002768DE /* Library+SBJSON.xcconfig */, 663DB06D12661EE900CF8CEA /* Library+YAJL.xcconfig */, + C641E6BD135203A500676C51 /* Library+TouchJSON.xcconfig */, 6E6454021184BDD500F08CB1 /* Project.xcconfig */, 6EB460A61183D2AC00685649 /* UnitTests+SBJSON.xcconfig */, ); name = Configurations; sourceTree = ""; }; + C641E6621351FF7800676C51 /* JSONKit */ = { + isa = PBXGroup; + children = ( + C641E6631351FF7900676C51 /* .git */, + C641E6881351FF7900676C51 /* CHANGELOG.md */, + C641E6891351FF7900676C51 /* JSONKit.h */, + C641E68A1351FF7900676C51 /* JSONKit.m */, + C641E68B1351FF7900676C51 /* README.md */, + ); + path = JSONKit; + sourceTree = ""; + }; + C641E6631351FF7900676C51 /* .git */ = { + isa = PBXGroup; + children = ( + C641E6641351FF7900676C51 /* branches */, + C641E6651351FF7900676C51 /* config */, + C641E6661351FF7900676C51 /* description */, + C641E6671351FF7900676C51 /* HEAD */, + C641E6681351FF7900676C51 /* hooks */, + C641E6731351FF7900676C51 /* index */, + C641E6741351FF7900676C51 /* info */, + C641E6761351FF7900676C51 /* logs */, + C641E67B1351FF7900676C51 /* objects */, + C641E6801351FF7900676C51 /* packed-refs */, + C641E6811351FF7900676C51 /* refs */, + ); + path = .git; + sourceTree = ""; + }; + C641E6641351FF7900676C51 /* branches */ = { + isa = PBXGroup; + children = ( + ); + path = branches; + sourceTree = ""; + }; + C641E6681351FF7900676C51 /* hooks */ = { + isa = PBXGroup; + children = ( + C641E6691351FF7900676C51 /* applypatch-msg.sample */, + C641E66A1351FF7900676C51 /* commit-msg.sample */, + C641E66B1351FF7900676C51 /* post-commit.sample */, + C641E66C1351FF7900676C51 /* post-receive.sample */, + C641E66D1351FF7900676C51 /* post-update.sample */, + C641E66E1351FF7900676C51 /* pre-applypatch.sample */, + C641E66F1351FF7900676C51 /* pre-commit.sample */, + C641E6701351FF7900676C51 /* pre-rebase.sample */, + C641E6711351FF7900676C51 /* prepare-commit-msg.sample */, + C641E6721351FF7900676C51 /* update.sample */, + ); + path = hooks; + sourceTree = ""; + }; + C641E6741351FF7900676C51 /* info */ = { + isa = PBXGroup; + children = ( + C641E6751351FF7900676C51 /* exclude */, + ); + path = info; + sourceTree = ""; + }; + C641E6761351FF7900676C51 /* logs */ = { + isa = PBXGroup; + children = ( + C641E6771351FF7900676C51 /* HEAD */, + C641E6781351FF7900676C51 /* refs */, + ); + path = logs; + sourceTree = ""; + }; + C641E6781351FF7900676C51 /* refs */ = { + isa = PBXGroup; + children = ( + C641E6791351FF7900676C51 /* heads */, + ); + path = refs; + sourceTree = ""; + }; + C641E6791351FF7900676C51 /* heads */ = { + isa = PBXGroup; + children = ( + C641E67A1351FF7900676C51 /* master */, + ); + path = heads; + sourceTree = ""; + }; + C641E67B1351FF7900676C51 /* objects */ = { + isa = PBXGroup; + children = ( + C641E67C1351FF7900676C51 /* info */, + C641E67D1351FF7900676C51 /* pack */, + ); + path = objects; + sourceTree = ""; + }; + C641E67C1351FF7900676C51 /* info */ = { + isa = PBXGroup; + children = ( + ); + path = info; + sourceTree = ""; + }; + C641E67D1351FF7900676C51 /* pack */ = { + isa = PBXGroup; + children = ( + C641E67E1351FF7900676C51 /* pack-7790b2b75c82136c793e5b2a39a48eaccb210402.idx */, + C641E67F1351FF7900676C51 /* pack-7790b2b75c82136c793e5b2a39a48eaccb210402.pack */, + ); + path = pack; + sourceTree = ""; + }; + C641E6811351FF7900676C51 /* refs */ = { + isa = PBXGroup; + children = ( + C641E6821351FF7900676C51 /* heads */, + C641E6841351FF7900676C51 /* remotes */, + C641E6871351FF7900676C51 /* tags */, + ); + path = refs; + sourceTree = ""; + }; + C641E6821351FF7900676C51 /* heads */ = { + isa = PBXGroup; + children = ( + C641E6831351FF7900676C51 /* master */, + ); + path = heads; + sourceTree = ""; + }; + C641E6841351FF7900676C51 /* remotes */ = { + isa = PBXGroup; + children = ( + C641E6851351FF7900676C51 /* origin */, + ); + path = remotes; + sourceTree = ""; + }; + C641E6851351FF7900676C51 /* origin */ = { + isa = PBXGroup; + children = ( + C641E6861351FF7900676C51 /* HEAD */, + ); + path = origin; + sourceTree = ""; + }; + C641E6871351FF7900676C51 /* tags */ = { + isa = PBXGroup; + children = ( + ); + path = tags; + sourceTree = ""; + }; + C6CCA17F1328466700F27105 /* TouchJSON */ = { + isa = PBXGroup; + children = ( + C6CCA1801328466700F27105 /* CDataScanner.h */, + C6CCA1811328466700F27105 /* CDataScanner.m */, + C6CCA1821328466700F27105 /* Experimental */, + C6CCA18B1328466700F27105 /* Extensions */, + C6CCA1901328466700F27105 /* JSON */, + ); + name = TouchJSON; + path = TouchJSON/Source; + sourceTree = ""; + }; + C6CCA1821328466700F27105 /* Experimental */ = { + isa = PBXGroup; + children = ( + C6CCA1831328466700F27105 /* CFilteringJSONSerializer.h */, + C6CCA1841328466700F27105 /* CFilteringJSONSerializer.m */, + C6CCA1851328466700F27105 /* CJSONDeserializer_BlocksExtensions.h */, + C6CCA1861328466700F27105 /* CJSONDeserializer_BlocksExtensions.m */, + C6CCA1871328466700F27105 /* CJSONSerialization.h */, + C6CCA1881328466700F27105 /* CJSONSerialization.m */, + C6CCA1891328466700F27105 /* CJSONSerializedData.h */, + C6CCA18A1328466700F27105 /* CJSONSerializedData.m */, + ); + path = Experimental; + sourceTree = ""; + }; + C6CCA18B1328466700F27105 /* Extensions */ = { + isa = PBXGroup; + children = ( + C6CCA18C1328466700F27105 /* CDataScanner_Extensions.h */, + C6CCA18D1328466700F27105 /* CDataScanner_Extensions.m */, + C6CCA18E1328466700F27105 /* NSDictionary_JSONExtensions.h */, + C6CCA18F1328466700F27105 /* NSDictionary_JSONExtensions.m */, + ); + path = Extensions; + sourceTree = ""; + }; + C6CCA1901328466700F27105 /* JSON */ = { + isa = PBXGroup; + children = ( + C6CCA1911328466700F27105 /* CJSONDeserializer.h */, + C6CCA1921328466700F27105 /* CJSONDeserializer.m */, + C6CCA1931328466700F27105 /* CJSONScanner.h */, + C6CCA1941328466700F27105 /* CJSONScanner.m */, + C6CCA1951328466700F27105 /* CJSONSerializer.h */, + C6CCA1961328466700F27105 /* CJSONSerializer.m */, + C6CCA1971328466700F27105 /* JSONRepresentation.h */, + ); + path = JSON; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -557,6 +909,36 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + C641E5C71351FBB200676C51 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + C641E5C81351FBB200676C51 /* TTURLJSONResponse.h in Headers */, + C641E5CF1351FBB200676C51 /* extThree20JSON.h in Headers */, + C641E5D01351FBB200676C51 /* TTErrorCodes.h in Headers */, + C641E5D11351FBB200676C51 /* TTExtensionLoader.h in Headers */, + C641E68C1351FF7900676C51 /* JSONKit.h in Headers */, + C641E69C135202A000676C51 /* extThree20JSON+JSONKit_Prefix.pch in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + C6429F4B1327E0930062B00C /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + C6CCA1D513284E5700F27105 /* CJSONDeserializer.h in Headers */, + C6CCA1D713284E5700F27105 /* CJSONScanner.h in Headers */, + C6CCA1D913284E5700F27105 /* CJSONSerializer.h in Headers */, + C6CCA1DB13284E5700F27105 /* JSONRepresentation.h in Headers */, + C6429F4C1327E0930062B00C /* TTURLJSONResponse.h in Headers */, + C6429F521327E0930062B00C /* extThree20JSON.h in Headers */, + C6429F531327E0930062B00C /* TTErrorCodes.h in Headers */, + C6429F5E1327E0930062B00C /* TTExtensionLoader.h in Headers */, + C6429F9C1327E54E0062B00C /* extThree20JSON+TouchJSON_Prefix.pch in Headers */, + C6CCA1BC13284C7300F27105 /* CDataScanner.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ @@ -600,6 +982,46 @@ productReference = BEF31F3A0F352DF5000DE5D2 /* libextThree20JSON+SBJSON.a */; productType = "com.apple.product-type.library.static"; }; + C641E5C21351FBB200676C51 /* extThree20JSON+JSONKit */ = { + isa = PBXNativeTarget; + buildConfigurationList = C641E5DD1351FBB200676C51 /* Build configuration list for PBXNativeTarget "extThree20JSON+JSONKit" */; + buildPhases = ( + C641E5C71351FBB200676C51 /* Headers */, + C641E5D21351FBB200676C51 /* Protect Copied Headers */, + C641E5D31351FBB200676C51 /* Sources */, + C641E5DC1351FBB200676C51 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + C641E5C31351FBB200676C51 /* PBXTargetDependency */, + C641E5C51351FBB200676C51 /* PBXTargetDependency */, + ); + name = "extThree20JSON+JSONKit"; + productName = Three20; + productReference = C641E5E11351FBB200676C51 /* libextThree20JSON+JSONKit.a */; + productType = "com.apple.product-type.library.static"; + }; + C6429F461327E0930062B00C /* extThree20JSON+TouchJSON */ = { + isa = PBXNativeTarget; + buildConfigurationList = C6429F731327E0930062B00C /* Build configuration list for PBXNativeTarget "extThree20JSON+TouchJSON" */; + buildPhases = ( + C6429F4B1327E0930062B00C /* Headers */, + C6429F601327E0930062B00C /* Protect Copied Headers */, + C6429F611327E0930062B00C /* Sources */, + C6429F721327E0930062B00C /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + C6429F471327E0930062B00C /* PBXTargetDependency */, + C6429F491327E0930062B00C /* PBXTargetDependency */, + ); + name = "extThree20JSON+TouchJSON"; + productName = Three20; + productReference = C6429F771327E0930062B00C /* libextThree20JSON+TouchJSON.a */; + productType = "com.apple.product-type.library.static"; + }; EB9E6C6110B6A8F800DE563C /* extThree20JSONUnitTests+SBJSON */ = { isa = PBXNativeTarget; buildConfigurationList = EB9E6C6710B6A8F900DE563C /* Build configuration list for PBXNativeTarget "extThree20JSONUnitTests+SBJSON" */; @@ -628,9 +1050,10 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 0410; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "extThree20JSON" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -656,6 +1079,8 @@ BEF31F390F352DF5000DE5D2 /* extThree20JSON+SBJSON */, 6E645BA31187751200F08CB1 /* extThree20JSON+YAJL */, EB9E6C6110B6A8F800DE563C /* extThree20JSONUnitTests+SBJSON */, + C6429F461327E0930062B00C /* extThree20JSON+TouchJSON */, + C641E5C21351FBB200676C51 /* extThree20JSON+JSONKit */, ); }; /* End PBXProject section */ @@ -689,6 +1114,20 @@ remoteRef = 6E645A7A11876D4600F08CB1 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + C6AC955013D8E889003EA563 /* libThree20Network-Xcode3.2.5.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libThree20Network-Xcode3.2.5.a"; + remoteRef = C6AC954F13D8E889003EA563 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + C6AC955213D8E889003EA563 /* NetworkUnitTests-Xcode3.2.5.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "NetworkUnitTests-Xcode3.2.5.octest"; + remoteRef = C6AC955113D8E889003EA563 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -730,6 +1169,34 @@ shellPath = "/bin/sh ../scripts/Protect.command"; shellScript = ""; }; + C641E5D21351FBB200676C51 /* Protect Copied Headers */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Protect Copied Headers"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = "/bin/sh ../scripts/Protect.command"; + shellScript = ""; + }; + C6429F601327E0930062B00C /* Protect Copied Headers */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Protect Copied Headers"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = "/bin/sh ../scripts/Protect.command"; + shellScript = ""; + }; EB9E6C6010B6A8F800DE563C /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -793,6 +1260,31 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + C641E5D31351FBB200676C51 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C641E5D41351FBB200676C51 /* TTURLJSONResponse.m in Sources */, + C641E5DA1351FBB200676C51 /* TTErrorCodes.m in Sources */, + C641E5DB1351FBB200676C51 /* TTExtensionLoader.m in Sources */, + C641E68D1351FF7900676C51 /* JSONKit.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + C6429F611327E0930062B00C /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + C6429F621327E0930062B00C /* TTURLJSONResponse.m in Sources */, + C6CCA1BE13284CC400F27105 /* TTErrorCodes.m in Sources */, + C6429F701327E0930062B00C /* TTExtensionLoader.m in Sources */, + C6CCA1BD13284C7300F27105 /* CDataScanner.m in Sources */, + C6CCA1D613284E5700F27105 /* CJSONDeserializer.m in Sources */, + C6CCA1D813284E5700F27105 /* CJSONScanner.m in Sources */, + C6CCA1DA13284E5700F27105 /* CJSONSerializer.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; EB9E6C5E10B6A8F800DE563C /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -839,6 +1331,26 @@ target = BEF31F390F352DF5000DE5D2 /* extThree20JSON+SBJSON */; targetProxy = 6EB460DD1183D8D400685649 /* PBXContainerItemProxy */; }; + C641E5C31351FBB200676C51 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Three20Core; + targetProxy = C641E5C41351FBB200676C51 /* PBXContainerItemProxy */; + }; + C641E5C51351FBB200676C51 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Three20Network; + targetProxy = C641E5C61351FBB200676C51 /* PBXContainerItemProxy */; + }; + C6429F471327E0930062B00C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Three20Core; + targetProxy = C6429F481327E0930062B00C /* PBXContainerItemProxy */; + }; + C6429F491327E0930062B00C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Three20Network; + targetProxy = C6429F4A1327E0930062B00C /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -853,7 +1365,7 @@ DEBUG, EXTJSON_YAJL, ); - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; }; name = Debug; @@ -870,7 +1382,7 @@ EXTJSON_YAJL, DEBUG, ); - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = iphoneos; }; @@ -882,9 +1394,8 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PREPROCESSOR_DEFINITIONS = EXTJSON_YAJL; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; ZERO_LINK = NO; }; @@ -898,8 +1409,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Internal; }; @@ -915,7 +1426,7 @@ EXTJSON_SBJSON, DEBUG, ); - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; RUN_CLANG_STATIC_ANALYZER = YES; SDKROOT = iphoneos; }; @@ -927,12 +1438,11 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; }; name = Internal; @@ -948,7 +1458,7 @@ EXTJSON_SBJSON, DEBUG, ); - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; }; name = Debug; @@ -959,9 +1469,8 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PREPROCESSOR_DEFINITIONS = EXTJSON_SBJSON; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; ZERO_LINK = NO; }; @@ -975,8 +1484,8 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; }; name = Debug; }; @@ -989,8 +1498,113 @@ GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_LDFLAGS = "-ObjC"; - PREBINDING = NO; SDKROOT = iphoneos; + SKIP_INSTALL = YES; + }; + name = Release; + }; + C641E5DE1351FBB200676C51 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = C641E6BE135203BB00676C51 /* Library+JSONKit.xcconfig */; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + EXTJSON_JSONKit, + DEBUG, + ); + GCC_VERSION = com.apple.compilers.llvmgcc42; + PRODUCT_NAME = "$(BASE_PRODUCT_NAME)+JSONKit"; + SDKROOT = iphoneos; + }; + name = Debug; + }; + C641E5DF1351FBB200676C51 /* Internal */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = C641E6BE135203BB00676C51 /* Library+JSONKit.xcconfig */; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREFIX_HEADER = "$(SRCROOT)/../common/Xcode324iOS41Fix.pch"; + GCC_PREPROCESSOR_DEFINITIONS = ( + EXTJSON_SBJSON, + DEBUG, + ); + GCC_VERSION = com.apple.compilers.llvmgcc42; + PRODUCT_NAME = "$(BASE_PRODUCT_NAME)+JSONKit"; + RUN_CLANG_STATIC_ANALYZER = YES; + SDKROOT = iphoneos; + }; + name = Internal; + }; + C641E5E01351FBB200676C51 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = C641E6BE135203BB00676C51 /* Library+JSONKit.xcconfig */; + buildSettings = { + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_PREPROCESSOR_DEFINITIONS = EXTJSON_JSONKit; + GCC_VERSION = com.apple.compilers.llvmgcc42; + PRODUCT_NAME = "$(BASE_PRODUCT_NAME)+JSONKit"; + SDKROOT = iphoneos; + ZERO_LINK = NO; + }; + name = Release; + }; + C6429F741327E0930062B00C /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = C641E6BD135203A500676C51 /* Library+TouchJSON.xcconfig */; + buildSettings = { + COPY_PHASE_STRIP = NO; + EXTTHREE20JSONTOUCHJSON322_LIB = "-force_load \"$(CONFIGURATION_BUILD_DIR)/libextThree20JSON+TouchJSON-Xcode3.2.2.a\""; + EXTTHREE20JSONTOUCHJSON325_LIB = "-force_load \"$(CONFIGURATION_BUILD_DIR)/libextThree20JSON+TouchJSON-Xcode3.2.5.a\""; + EXTTHREE20JSONTOUCHJSON_LIB = ""; + EXTTHREE20JSONYAJL322_LIB = ""; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + DEBUG, + EXTJSON_TouchJSON, + ); + GCC_VERSION = com.apple.compilers.llvmgcc42; + SDKROOT = iphoneos; + }; + name = Debug; + }; + C6429F751327E0930062B00C /* Internal */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = C641E6BD135203A500676C51 /* Library+TouchJSON.xcconfig */; + buildSettings = { + COPY_PHASE_STRIP = NO; + EXTTHREE20JSONTOUCHJSON_LIB = ""; + EXTTHREE20JSONYAJL322_LIB = ""; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREFIX_HEADER = "$(SRCROOT)/../common/Xcode324iOS41Fix.pch"; + GCC_PREPROCESSOR_DEFINITIONS = ( + EXTJSON_YAJL, + DEBUG, + ); + GCC_VERSION = com.apple.compilers.llvmgcc42; + RUN_CLANG_STATIC_ANALYZER = YES; + SDKROOT = iphoneos; + }; + name = Internal; + }; + C6429F761327E0930062B00C /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = C641E6BD135203A500676C51 /* Library+TouchJSON.xcconfig */; + buildSettings = { + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + EXTTHREE20JSONTOUCHJSON_LIB = ""; + EXTTHREE20JSONYAJL322_LIB = ""; + GCC_PREPROCESSOR_DEFINITIONS = EXTJSON_YAJL; + GCC_VERSION = com.apple.compilers.llvmgcc42; + SDKROOT = iphoneos; + ZERO_LINK = NO; }; name = Release; }; @@ -1000,12 +1614,11 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; }; name = Debug; @@ -1016,10 +1629,9 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - PREBINDING = NO; + GCC_VERSION = com.apple.compilers.llvmgcc42; SDKROOT = iphoneos; ZERO_LINK = NO; }; @@ -1058,6 +1670,26 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + C641E5DD1351FBB200676C51 /* Build configuration list for PBXNativeTarget "extThree20JSON+JSONKit" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C641E5DE1351FBB200676C51 /* Debug */, + C641E5DF1351FBB200676C51 /* Internal */, + C641E5E01351FBB200676C51 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C6429F731327E0930062B00C /* Build configuration list for PBXNativeTarget "extThree20JSON+TouchJSON" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C6429F741327E0930062B00C /* Debug */, + C6429F751327E0930062B00C /* Internal */, + C6429F761327E0930062B00C /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; EB9E6C6710B6A8F900DE563C /* Build configuration list for PBXNativeTarget "extThree20JSONUnitTests+SBJSON" */ = { isa = XCConfigurationList; buildConfigurations = (