Updating project files

slaughter550 · Dec 27, 2011 · 250b3a4 · 250b3a4
1 parent 81bd473
commit 250b3a4
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 41 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,5 @@ Documentation
 YAJL.docset
 Project-iOS/YAJLiOS.xcodeproj/xcuserdata/
 Project-iOS/YAJLiOS.xcodeproj/project.xcworkspace/xcuserdata/
+Project/YAJL.xcodeproj/xcuserdata
+Project/YAJL.xcodeproj/project.xcworkspace/xcuserdata
diff --git a/Classes/YAJLDocument.m b/Classes/YAJLDocument.m
@@ -89,7 +89,7 @@ - (YAJLParserStatus)parse:(NSData *)data error:(NSError **)error {
 #pragma mark Delegates
 
 - (void)parser:(YAJLParser *)parser didAdd:(id)value {
-  switch(currentType_) {
+  switch (currentType_) {
     case YAJLDecoderCurrentTypeArray:
       [array_ addObject:value];
       if ([delegate_ respondsToSelector:@selector(document:didAddObject:toArray:)])
@@ -102,6 +102,8 @@ - (void)parser:(YAJLParser *)parser didAdd:(id)value {
         [delegate_ document:self didSetObject:value forKey:key_ inDictionary:dict_];
       [self _popKey];
       break;
+    default:
+      break;
   } 
 }
 

diff --git a/Classes/YAJLParser.h b/Classes/YAJLParser.h
@@ -142,14 +142,14 @@ typedef NSUInteger YAJLParserStatus; //!< Status of the last parse event
 
   yajl_handle handle_;
 
-  __weak id <YAJLParserDelegate> delegate_; // weak
+  id<YAJLParserDelegate> delegate_; // weak
 
   YAJLParserOptions parserOptions_;
 
   NSError *parserError_;
 }
 
-@property (assign, nonatomic) __weak id <YAJLParserDelegate> delegate;
+@property (assign, nonatomic) id <YAJLParserDelegate> delegate;
 @property (readonly, retain, nonatomic) NSError *parserError;
 @property (readonly, nonatomic) YAJLParserOptions parserOptions;
 

diff --git a/Project-iOS/YAJLiOS.xcodeproj/project.pbxproj b/Project-iOS/YAJLiOS.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 45;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXAggregateTarget section */
@@ -60,7 +60,6 @@
 		005886B21226334500292C90 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 005886B11226334500292C90 /* UIKit.framework */; };
 		005886C81226337500292C90 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 005886C71226337500292C90 /* Foundation.framework */; };
 		005886E41226339500292C90 /* GHUnitIOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 005886E31226339500292C90 /* GHUnitIOS.framework */; };
-		00588702122634AD00292C90 /* Shared-MacOSX.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 00588701122634AD00292C90 /* Shared-MacOSX.xcconfig */; };
 		0058870E1226353B00292C90 /* GHUnitIOSTestMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 0058870D1226353B00292C90 /* GHUnitIOSTestMain.m */; };
 		0065975A11BEEF4000E89ABD /* YAJLiOS_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* YAJLiOS_Prefix.pch */; };
 		0065975B11BEEF4000E89ABD /* YAJLDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 00C404FE0FE77661003CE908 /* YAJLDocument.h */; };
@@ -607,7 +606,6 @@
 				0065979111BEEF4800E89ABD /* Sources */,
 				0065979E11BEEF4800E89ABD /* Frameworks */,
 				006597A011BEEF4800E89ABD /* CopyFiles */,
-				0097077F125E6435002B2065 /* Generate docset */,
 			);
 			buildRules = (
 			);
@@ -642,8 +640,11 @@
 /* Begin PBXProject section */
 		0867D690FE84028FC02AAC07 /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0420;
+			};
 			buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "YAJLiOS" */;
-			compatibilityVersion = "Xcode 3.1";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
@@ -689,7 +690,6 @@
 				006597C511BEEF5400E89ABD /* twitter.json in Resources */,
 				006597C611BEEF5400E89ABD /* overflow_longlong.json in Resources */,
 				006597C711BEEF5400E89ABD /* document_streaming.json in Resources */,
-				00588702122634AD00292C90 /* Shared-MacOSX.xcconfig in Resources */,
 				00C3CEFC126EAC5700DF710D /* twitter_snowflake.json in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -723,21 +723,6 @@
 			shellPath = /bin/sh;
 			shellScript = ../Tests/RunTests.sh;
 		};
-		0097077F125E6435002B2065 /* Generate docset */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Generate docset";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "cd .. && make docs";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -833,7 +818,6 @@
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				PRODUCT_NAME = "Run make to build";
 				ZERO_LINK = NO;
 			};
@@ -897,7 +881,6 @@
 					"-framework",
 					UIKit,
 				);
-				PREBINDING = NO;
 				PRODUCT_NAME = Tests;
 			};
 			name = Debug;
@@ -914,7 +897,6 @@
 					"$(inherited)",
 					"\"$(SRCROOT)/Libraries\"",
 				);
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = Tests_Prefix.pch;
 				INFOPLIST_FILE = "Tests-Info.plist";
@@ -927,7 +909,6 @@
 					"-framework",
 					UIKit,
 				);
-				PREBINDING = NO;
 				PRODUCT_NAME = Tests;
 				ZERO_LINK = NO;
 			};
@@ -942,7 +923,6 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				OTHER_LDFLAGS = "-ObjC";
-				PREBINDING = NO;
 				SDKROOT = iphoneos3.0;
 			};
 			name = Debug;
@@ -955,7 +935,6 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				OTHER_LDFLAGS = "-ObjC";
-				PREBINDING = NO;
 				SDKROOT = iphoneos3.0;
 			};
 			name = Release;

diff --git a/Project/YAJL.xcodeproj/project.pbxproj b/Project/YAJL.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 45;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -564,8 +564,11 @@
 /* Begin PBXProject section */
 		0867D690FE84028FC02AAC07 /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0420;
+			};
 			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "YAJL" */;
-			compatibilityVersion = "Xcode 3.1";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
@@ -721,7 +724,6 @@
 					"\"$(SRCROOT)/Frameworks\"",
 				);
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -735,7 +737,6 @@
 					"-framework",
 					AppKit,
 				);
-				PREBINDING = NO;
 				PRODUCT_NAME = Tests;
 			};
 			name = Debug;
@@ -753,7 +754,6 @@
 					"$(inherited)",
 					"\"$(SRCROOT)/Frameworks\"",
 				);
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = Tests_Prefix.pch;
@@ -766,7 +766,6 @@
 					"-framework",
 					AppKit,
 				);
-				PREBINDING = NO;
 				PRODUCT_NAME = Tests;
 				ZERO_LINK = NO;
 			};
@@ -792,26 +791,26 @@
 		1DEB91B208733DA50010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				ONLY_ACTIVE_ARCH = YES;
-				PREBINDING = NO;
-				SDKROOT = macosx10.5;
+				SDKROOT = macosx;
 			};
 			name = Debug;
 		};
 		1DEB91B308733DA50010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = macosx10.5;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				SDKROOT = macosx;
 			};
 			name = Release;
 		};

diff --git a/Project/YAJL.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Project/YAJL.xcodeproj/project.xcworkspace/contents.xcworkspacedata