Skip to content
This repository

Fix readme typeos and ignore more Xcode noise #40

Open
wants to merge 9 commits into from

2 participants

Sam Soffes Martin Schürrer
Sam Soffes
soffes commented June 14, 2012

No description provided.

Sam Soffes
soffes commented June 14, 2012

Not sure why @MSch commit got included in this. Whatevs.

added some commits June 14, 2012
Sam Soffes Fix warnings 519afed
Sam Soffes Revert "Fix warnings".
The original formats are fine on iOS but cause warnings on Mac.

This reverts commit 519afedd1d88bf37854a477b47d234c0ad4b9bf6.
6a87d46
Martin Schürrer
MSch commented June 15, 2012

@samsoffes Well it's a nice commit to have in master IMO :)

added some commits July 11, 2012
Sam Soffes Skip install b4401b9
Sam Soffes Merge branch 'master' of https://github.com/square/SocketRocket
Conflicts:
	SocketRocket.xcodeproj/project.pbxproj
	SocketRocket.xcodeproj/xcshareddata/xcschemes/SocketRocket.xcscheme
	SocketRocket.xcodeproj/xcshareddata/xcschemes/SocketRocketOSX.xcscheme
	SocketRocket.xcodeproj/xcshareddata/xcschemes/TestChat.xcscheme
f52e0d2
Sam Soffes Add Mac static library 25efe7b
Sam Soffes Target 10.7 e73826d
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 9 unique commits by 2 authors.

Jun 01, 2012
Sam Soffes Fix some typeos 44e3184
Jun 14, 2012
Martin Schürrer Only require CFNetwork on iOS so that podspec works on Lion 48513c1
Sam Soffes Remove xcshareddata 81bec76
Sam Soffes Fix warnings 519afed
Sam Soffes Revert "Fix warnings".
The original formats are fine on iOS but cause warnings on Mac.

This reverts commit 519afedd1d88bf37854a477b47d234c0ad4b9bf6.
6a87d46
Jul 11, 2012
Sam Soffes Skip install b4401b9
Jul 28, 2012
Sam Soffes Merge branch 'master' of https://github.com/square/SocketRocket
Conflicts:
	SocketRocket.xcodeproj/project.pbxproj
	SocketRocket.xcodeproj/xcshareddata/xcschemes/SocketRocket.xcscheme
	SocketRocket.xcodeproj/xcshareddata/xcschemes/SocketRocketOSX.xcscheme
	SocketRocket.xcodeproj/xcshareddata/xcschemes/TestChat.xcscheme
f52e0d2
Aug 14, 2012
Sam Soffes Add Mac static library 25efe7b
Aug 15, 2012
Sam Soffes Target 10.7 e73826d
This page is out of date. Refresh to see the latest.
1  .gitignore
@@ -6,3 +6,4 @@ build/
6 6
 nohup.out
7 7
 .DS_Store
8 8
 xcuserdata/
  9
+xcshareddata/
2  README.rst
Source Rendered
@@ -37,7 +37,7 @@ There's a few options. Choose one, or just figure it out
37 37
 
38 38
 
39 39
 Depending on how you configure your project you may need to ``#import`` either
40  
-``<SocketRocket/SRSocketRocket.h>`` or ``"SRSocketRocket.h"``
  40
+``<SocketRocket/SRWebSocket.h>`` or ``"SRWebSocket.h"``
41 41
 
42 42
 Framework Dependencies
43 43
 ``````````````````````
145  SocketRocket.xcodeproj/project.pbxproj
@@ -7,6 +7,16 @@
7 7
 	objects = {
8 8
 
9 9
 /* Begin PBXBuildFile section */
  10
+		B2EB6A9715DB5D160035AD92 /* base64.c in Sources */ = {isa = PBXBuildFile; fileRef = F6016C7B146124B20037BB3D /* base64.c */; };
  11
+		B2EB6A9815DB5D160035AD92 /* base64.h in Headers */ = {isa = PBXBuildFile; fileRef = F6016C7E146124ED0037BB3D /* base64.h */; };
  12
+		B2EB6A9915DB5D160035AD92 /* SRWebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = F6A12CCF145119B700C1D980 /* SRWebSocket.h */; };
  13
+		B2EB6A9A15DB5D160035AD92 /* SRWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = F6A12CD0145119B700C1D980 /* SRWebSocket.m */; };
  14
+		B2EB6A9B15DB5D160035AD92 /* NSData+SRB64Additions.h in Headers */ = {isa = PBXBuildFile; fileRef = F6572123146C7B6A00D6B8A9 /* NSData+SRB64Additions.h */; };
  15
+		B2EB6A9C15DB5D160035AD92 /* NSData+SRB64Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = F6572124146C7B6A00D6B8A9 /* NSData+SRB64Additions.m */; };
  16
+		B2EB6AA015DB5D530035AD92 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B2EB6A9D15DB5D530035AD92 /* CoreServices.framework */; };
  17
+		B2EB6AA115DB5D530035AD92 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B2EB6A9E15DB5D530035AD92 /* Foundation.framework */; };
  18
+		B2EB6AA215DB5D530035AD92 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B2EB6A9F15DB5D530035AD92 /* Security.framework */; };
  19
+		B2EB6AB115DB60F60035AD92 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B2EB6AB015DB60F60035AD92 /* CFNetwork.framework */; };
10 20
 		F6016C7C146124B20037BB3D /* base64.c in Sources */ = {isa = PBXBuildFile; fileRef = F6016C7B146124B20037BB3D /* base64.c */; };
11 21
 		F6016C7F146124ED0037BB3D /* base64.h in Headers */ = {isa = PBXBuildFile; fileRef = F6016C7E146124ED0037BB3D /* base64.h */; };
12 22
 		F6016C8814620EC70037BB3D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6A12CD3145122FC00C1D980 /* Security.framework */; };
@@ -59,6 +69,13 @@
59 69
 /* End PBXContainerItemProxy section */
60 70
 
61 71
 /* Begin PBXFileReference section */
  72
+		B2EB6A7315DB5C800035AD92 /* libSocketRocketOSXLibrary.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSocketRocketOSXLibrary.a; sourceTree = BUILT_PRODUCTS_DIR; };
  73
+		B2EB6A7415DB5C800035AD92 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; };
  74
+		B2EB6A9D15DB5D530035AD92 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/CoreServices.framework; sourceTree = DEVELOPER_DIR; };
  75
+		B2EB6A9E15DB5D530035AD92 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; };
  76
+		B2EB6A9F15DB5D530035AD92 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; };
  77
+		B2EB6AAE15DB5EB80035AD92 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/lib/libicucore.dylib; sourceTree = DEVELOPER_DIR; };
  78
+		B2EB6AB015DB60F60035AD92 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/CFNetwork.framework; sourceTree = DEVELOPER_DIR; };
62 79
 		F6016C7B146124B20037BB3D /* base64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = base64.c; sourceTree = "<group>"; };
63 80
 		F6016C7E146124ED0037BB3D /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = base64.h; sourceTree = "<group>"; };
64 81
 		F60CC29F14D4EA0500A005E4 /* SRTWebSocketOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRTWebSocketOperation.h; sourceTree = "<group>"; };
@@ -106,6 +123,17 @@
106 123
 /* End PBXFileReference section */
107 124
 
108 125
 /* Begin PBXFrameworksBuildPhase section */
  126
+		B2EB6A7015DB5C800035AD92 /* Frameworks */ = {
  127
+			isa = PBXFrameworksBuildPhase;
  128
+			buildActionMask = 2147483647;
  129
+			files = (
  130
+				B2EB6AB115DB60F60035AD92 /* CFNetwork.framework in Frameworks */,
  131
+				B2EB6AA015DB5D530035AD92 /* CoreServices.framework in Frameworks */,
  132
+				B2EB6AA115DB5D530035AD92 /* Foundation.framework in Frameworks */,
  133
+				B2EB6AA215DB5D530035AD92 /* Security.framework in Frameworks */,
  134
+			);
  135
+			runOnlyForDeploymentPostprocessing = 0;
  136
+		};
109 137
 		F62417E014D52F3C003CE997 /* Frameworks */ = {
110 138
 			isa = PBXFrameworksBuildPhase;
111 139
 			buildActionMask = 2147483647;
@@ -214,6 +242,11 @@
214 242
 		F6B208221450F597009315AF = {
215 243
 			isa = PBXGroup;
216 244
 			children = (
  245
+				B2EB6AB015DB60F60035AD92 /* CFNetwork.framework */,
  246
+				B2EB6AAE15DB5EB80035AD92 /* libicucore.dylib */,
  247
+				B2EB6A9D15DB5D530035AD92 /* CoreServices.framework */,
  248
+				B2EB6A9E15DB5D530035AD92 /* Foundation.framework */,
  249
+				B2EB6A9F15DB5D530035AD92 /* Security.framework */,
217 250
 				F6B208321450F597009315AF /* SocketRocket */,
218 251
 				F6BDA807145900D200FE3253 /* SRWebSocketTests */,
219 252
 				F62417EA14D52F3C003CE997 /* TestChat */,
@@ -232,6 +265,7 @@
232 265
 				F6BDA802145900D200FE3253 /* SRWebSocketTests.octest */,
233 266
 				F62417E314D52F3C003CE997 /* TestChat.app */,
234 267
 				F668C880153E91210044DBAC /* SocketRocket.framework */,
  268
+				B2EB6A7315DB5C800035AD92 /* libSocketRocketOSXLibrary.a */,
235 269
 			);
236 270
 			name = Products;
237 271
 			sourceTree = "<group>";
@@ -247,6 +281,7 @@
247 281
 				F6BDA803145900D200FE3253 /* SenTestingKit.framework */,
248 282
 				F62417E514D52F3C003CE997 /* UIKit.framework */,
249 283
 				F62417E814D52F3C003CE997 /* CoreGraphics.framework */,
  284
+				B2EB6A7415DB5C800035AD92 /* Cocoa.framework */,
250 285
 				F668C883153E91210044DBAC /* Other Frameworks */,
251 286
 			);
252 287
 			name = Frameworks;
@@ -300,6 +335,16 @@
300 335
 /* End PBXGroup section */
301 336
 
302 337
 /* Begin PBXHeadersBuildPhase section */
  338
+		B2EB6A7115DB5C800035AD92 /* Headers */ = {
  339
+			isa = PBXHeadersBuildPhase;
  340
+			buildActionMask = 2147483647;
  341
+			files = (
  342
+				B2EB6A9815DB5D160035AD92 /* base64.h in Headers */,
  343
+				B2EB6A9915DB5D160035AD92 /* SRWebSocket.h in Headers */,
  344
+				B2EB6A9B15DB5D160035AD92 /* NSData+SRB64Additions.h in Headers */,
  345
+			);
  346
+			runOnlyForDeploymentPostprocessing = 0;
  347
+		};
303 348
 		F668C87D153E91210044DBAC /* Headers */ = {
304 349
 			isa = PBXHeadersBuildPhase;
305 350
 			buildActionMask = 2147483647;
@@ -320,6 +365,23 @@
320 365
 /* End PBXHeadersBuildPhase section */
321 366
 
322 367
 /* Begin PBXNativeTarget section */
  368
+		B2EB6A7215DB5C800035AD92 /* SocketRocketOSXLibrary */ = {
  369
+			isa = PBXNativeTarget;
  370
+			buildConfigurationList = B2EB6A7E15DB5C800035AD92 /* Build configuration list for PBXNativeTarget "SocketRocketOSXLibrary" */;
  371
+			buildPhases = (
  372
+				B2EB6A6F15DB5C800035AD92 /* Sources */,
  373
+				B2EB6A7015DB5C800035AD92 /* Frameworks */,
  374
+				B2EB6A7115DB5C800035AD92 /* Headers */,
  375
+			);
  376
+			buildRules = (
  377
+			);
  378
+			dependencies = (
  379
+			);
  380
+			name = SocketRocketOSXLibrary;
  381
+			productName = SocketRocketOSXLibrary;
  382
+			productReference = B2EB6A7315DB5C800035AD92 /* libSocketRocketOSXLibrary.a */;
  383
+			productType = "com.apple.product-type.library.static";
  384
+		};
323 385
 		F62417E214D52F3C003CE997 /* TestChat */ = {
324 386
 			isa = PBXNativeTarget;
325 387
 			buildConfigurationList = F62417FC14D52F3C003CE997 /* Build configuration list for PBXNativeTarget "TestChat" */;
@@ -397,7 +459,7 @@
397 459
 		F6B208241450F597009315AF /* Project object */ = {
398 460
 			isa = PBXProject;
399 461
 			attributes = {
400  
-				LastUpgradeCheck = 0440;
  462
+				LastUpgradeCheck = 0450;
401 463
 			};
402 464
 			buildConfigurationList = F6B208271450F597009315AF /* Build configuration list for PBXProject "SocketRocket" */;
403 465
 			compatibilityVersion = "Xcode 3.2";
@@ -415,6 +477,7 @@
415 477
 				F668C87F153E91210044DBAC /* SocketRocketOSX */,
416 478
 				F6BDA801145900D200FE3253 /* SRWebSocketTests */,
417 479
 				F62417E214D52F3C003CE997 /* TestChat */,
  480
+				B2EB6A7215DB5C800035AD92 /* SocketRocketOSXLibrary */,
418 481
 			);
419 482
 		};
420 483
 /* End PBXProject section */
@@ -463,6 +526,16 @@
463 526
 /* End PBXShellScriptBuildPhase section */
464 527
 
465 528
 /* Begin PBXSourcesBuildPhase section */
  529
+		B2EB6A6F15DB5C800035AD92 /* Sources */ = {
  530
+			isa = PBXSourcesBuildPhase;
  531
+			buildActionMask = 2147483647;
  532
+			files = (
  533
+				B2EB6A9715DB5D160035AD92 /* base64.c in Sources */,
  534
+				B2EB6A9A15DB5D160035AD92 /* SRWebSocket.m in Sources */,
  535
+				B2EB6A9C15DB5D160035AD92 /* NSData+SRB64Additions.m in Sources */,
  536
+			);
  537
+			runOnlyForDeploymentPostprocessing = 0;
  538
+		};
466 539
 		F62417DF14D52F3C003CE997 /* Sources */ = {
467 540
 			isa = PBXSourcesBuildPhase;
468 541
 			buildActionMask = 2147483647;
@@ -542,6 +615,65 @@
542 615
 /* End PBXVariantGroup section */
543 616
 
544 617
 /* Begin XCBuildConfiguration section */
  618
+		B2EB6A7C15DB5C800035AD92 /* Debug */ = {
  619
+			isa = XCBuildConfiguration;
  620
+			buildSettings = {
  621
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
  622
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
  623
+				CLANG_CXX_LIBRARY = "libc++";
  624
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
  625
+				FRAMEWORK_SEARCH_PATHS = (
  626
+					"$(inherited)",
  627
+					"\"$(SYSTEM_APPS_DIR)/Xcode45-DP3.app/Contents/Developer/Library/Frameworks\"",
  628
+				);
  629
+				GCC_C_LANGUAGE_STANDARD = gnu99;
  630
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
  631
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
  632
+				GCC_PREFIX_HEADER = "SocketRocket/SocketRocket-Prefix.pch";
  633
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
  634
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
  635
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
  636
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
  637
+				ONLY_ACTIVE_ARCH = YES;
  638
+				OTHER_LDFLAGS = (
  639
+					"-ObjC",
  640
+					"-all_load",
  641
+				);
  642
+				PRODUCT_NAME = "$(TARGET_NAME)";
  643
+				SDKROOT = macosx10.7;
  644
+				SKIP_INSTALL = YES;
  645
+			};
  646
+			name = Debug;
  647
+		};
  648
+		B2EB6A7D15DB5C800035AD92 /* Release */ = {
  649
+			isa = XCBuildConfiguration;
  650
+			buildSettings = {
  651
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
  652
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
  653
+				CLANG_CXX_LIBRARY = "libc++";
  654
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
  655
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
  656
+				FRAMEWORK_SEARCH_PATHS = (
  657
+					"$(inherited)",
  658
+					"\"$(SYSTEM_APPS_DIR)/Xcode45-DP3.app/Contents/Developer/Library/Frameworks\"",
  659
+				);
  660
+				GCC_C_LANGUAGE_STANDARD = gnu99;
  661
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
  662
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
  663
+				GCC_PREFIX_HEADER = "SocketRocket/SocketRocket-Prefix.pch";
  664
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
  665
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
  666
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
  667
+				OTHER_LDFLAGS = (
  668
+					"-ObjC",
  669
+					"-all_load",
  670
+				);
  671
+				PRODUCT_NAME = "$(TARGET_NAME)";
  672
+				SDKROOT = macosx10.7;
  673
+				SKIP_INSTALL = YES;
  674
+			};
  675
+			name = Release;
  676
+		};
545 677
 		F62417FD14D52F3C003CE997 /* Debug */ = {
546 678
 			isa = XCBuildConfiguration;
547 679
 			buildSettings = {
@@ -607,6 +739,7 @@
607 739
 				OTHER_LDFLAGS = "-ObjC";
608 740
 				PRODUCT_NAME = SocketRocket;
609 741
 				SDKROOT = macosx;
  742
+				SKIP_INSTALL = YES;
610 743
 				WRAPPER_EXTENSION = framework;
611 744
 			};
612 745
 			name = Debug;
@@ -635,6 +768,7 @@
635 768
 				OTHER_LDFLAGS = "-ObjC";
636 769
 				PRODUCT_NAME = SocketRocket;
637 770
 				SDKROOT = macosx;
  771
+				SKIP_INSTALL = YES;
638 772
 				WRAPPER_EXTENSION = framework;
639 773
 			};
640 774
 			name = Release;
@@ -774,6 +908,15 @@
774 908
 /* End XCBuildConfiguration section */
775 909
 
776 910
 /* Begin XCConfigurationList section */
  911
+		B2EB6A7E15DB5C800035AD92 /* Build configuration list for PBXNativeTarget "SocketRocketOSXLibrary" */ = {
  912
+			isa = XCConfigurationList;
  913
+			buildConfigurations = (
  914
+				B2EB6A7C15DB5C800035AD92 /* Debug */,
  915
+				B2EB6A7D15DB5C800035AD92 /* Release */,
  916
+			);
  917
+			defaultConfigurationIsVisible = 0;
  918
+			defaultConfigurationName = Release;
  919
+		};
777 920
 		F62417FC14D52F3C003CE997 /* Build configuration list for PBXNativeTarget "TestChat" */ = {
778 921
 			isa = XCConfigurationList;
779 922
 			buildConfigurations = (
158  SocketRocket.xcodeproj/xcshareddata/xcschemes/SocketRocket.xcscheme
... ...
@@ -1,158 +0,0 @@
1  
-<?xml version="1.0" encoding="UTF-8"?>
2  
-<Scheme
3  
-   LastUpgradeVersion = "0440"
4  
-   version = "1.7">
5  
-   <BuildAction
6  
-      parallelizeBuildables = "YES"
7  
-      buildImplicitDependencies = "YES">
8  
-      <BuildActionEntries>
9  
-         <BuildActionEntry
10  
-            buildForTesting = "YES"
11  
-            buildForRunning = "YES"
12  
-            buildForProfiling = "YES"
13  
-            buildForArchiving = "YES"
14  
-            buildForAnalyzing = "YES">
15  
-            <BuildableReference
16  
-               BuildableIdentifier = "primary"
17  
-               BlueprintIdentifier = "F6B2082C1450F597009315AF"
18  
-               BuildableName = "libSocketRocket.a"
19  
-               BlueprintName = "SocketRocket"
20  
-               ReferencedContainer = "container:SocketRocket.xcodeproj">
21  
-            </BuildableReference>
22  
-         </BuildActionEntry>
23  
-         <BuildActionEntry
24  
-            buildForTesting = "YES"
25  
-            buildForRunning = "NO"
26  
-            buildForProfiling = "NO"
27  
-            buildForArchiving = "NO"
28  
-            buildForAnalyzing = "NO">
29  
-            <BuildableReference
30  
-               BuildableIdentifier = "primary"
31  
-               BlueprintIdentifier = "F6BDA801145900D200FE3253"
32  
-               BuildableName = "SRWebSocketTests.octest"
33  
-               BlueprintName = "SRWebSocketTests"
34  
-               ReferencedContainer = "container:SocketRocket.xcodeproj">
35  
-            </BuildableReference>
36  
-         </BuildActionEntry>
37  
-      </BuildActionEntries>
38  
-   </BuildAction>
39  
-   <TestAction
40  
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
41  
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
42  
-      shouldUseLaunchSchemeArgsEnv = "NO"
43  
-      buildConfiguration = "Debug">
44  
-      <PreActions>
45  
-         <ExecutionAction
46  
-            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
47  
-            <ActionContent
48  
-               title = "Run Script"
49  
-               scriptText = "PIDFILE=$TMPDIR/srtharness.pid&#10;if [ -r $PIDFILE ]; then&#10;    EXISTING_PID=`cat $PIDFILE`&#10;    echo &quot;Killing Dangling SRTextharneess PID:&quot; $EXISTING_PID&#10;    kill $EXISTING_PID&#10;    rm $PIDFILE&#10;fi&#10;&#10;pushd $PROJECT_DIR&#10;&#10;export MACOSX_DEPLOYMENT_TARGET=&#10;&#10;bash TestSupport/ensure_virtualenv.sh $PROJECT_DIR/.env&#10;source .env/bin/activate&#10;&#10;rm -rf &quot;$PROJECT_DIR/reports/clients/&quot;&#10;nohup sr-testharness -i &apos;&apos; -c &apos;*&apos; &amp;&#10;&#10;#nohup sr-testharness -k hello_test_harness -i &apos;&apos; -c &apos;*&apos; &amp;&#10;&#10;echo $! &gt; $PIDFILE&#10;&#10;popd"
50  
-               shellToInvoke = "/bin/bash">
51  
-               <EnvironmentBuildable>
52  
-                  <BuildableReference
53  
-                     BuildableIdentifier = "primary"
54  
-                     BlueprintIdentifier = "F6BDA801145900D200FE3253"
55  
-                     BuildableName = "SRWebSocketTests.octest"
56  
-                     BlueprintName = "SRWebSocketTests"
57  
-                     ReferencedContainer = "container:SocketRocket.xcodeproj">
58  
-                  </BuildableReference>
59  
-               </EnvironmentBuildable>
60  
-            </ActionContent>
61  
-         </ExecutionAction>
62  
-      </PreActions>
63  
-      <PostActions>
64  
-         <ExecutionAction
65  
-            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
66  
-            <ActionContent
67  
-               title = "Run Script"
68  
-               scriptText = "PIDFILE=$TMPDIR/srtharness.pid&#10;if [ -r $PIDFILE ]; then&#10;    EXISTING_PID=`cat $PIDFILE`&#10;    echo &quot;Killing SRTextharneess PID:&quot; $EXISTING_PID&#10;    kill $EXISTING_PID&#10;    rm $PIDFILE&#10;fi&#10;&#10;&#10;open $PROJECT_DIR/reports/clients/index.html"
69  
-               shellToInvoke = "/bin/bash">
70  
-               <EnvironmentBuildable>
71  
-                  <BuildableReference
72  
-                     BuildableIdentifier = "primary"
73  
-                     BlueprintIdentifier = "F6BDA801145900D200FE3253"
74  
-                     BuildableName = "SRWebSocketTests.octest"
75  
-                     BlueprintName = "SRWebSocketTests"
76  
-                     ReferencedContainer = "container:SocketRocket.xcodeproj">
77  
-                  </BuildableReference>
78  
-               </EnvironmentBuildable>
79  
-            </ActionContent>
80  
-         </ExecutionAction>
81  
-      </PostActions>
82  
-      <Testables>
83  
-         <TestableReference
84  
-            skipped = "NO">
85  
-            <BuildableReference
86  
-               BuildableIdentifier = "primary"
87  
-               BlueprintIdentifier = "F6BDA801145900D200FE3253"
88  
-               BuildableName = "SRWebSocketTests.octest"
89  
-               BlueprintName = "SRWebSocketTests"
90  
-               ReferencedContainer = "container:SocketRocket.xcodeproj">
91  
-            </BuildableReference>
92  
-         </TestableReference>
93  
-      </Testables>
94  
-      <MacroExpansion>
95  
-         <BuildableReference
96  
-            BuildableIdentifier = "primary"
97  
-            BlueprintIdentifier = "F6B2082C1450F597009315AF"
98  
-            BuildableName = "libSocketRocket.a"
99  
-            BlueprintName = "SocketRocket"
100  
-            ReferencedContainer = "container:SocketRocket.xcodeproj">
101  
-         </BuildableReference>
102  
-      </MacroExpansion>
103  
-      <EnvironmentVariables>
104  
-         <EnvironmentVariable
105  
-            key = "SR_TEST_URL"
106  
-            value = "ws://localhost:9001"
107  
-            isEnabled = "YES">
108  
-         </EnvironmentVariable>
109  
-      </EnvironmentVariables>
110  
-   </TestAction>
111  
-   <LaunchAction
112  
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
113  
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
114  
-      launchStyle = "0"
115  
-      useCustomWorkingDirectory = "NO"
116  
-      buildConfiguration = "Debug"
117  
-      ignoresPersistentStateOnLaunch = "NO"
118  
-      debugDocumentVersioning = "YES"
119  
-      enableOpenGLFrameCaptureMode = "0"
120  
-      allowLocationSimulation = "YES">
121  
-      <AdditionalOptions>
122  
-         <AdditionalOption
123  
-            key = "MallocScribble"
124  
-            value = ""
125  
-            isEnabled = "YES">
126  
-         </AdditionalOption>
127  
-         <AdditionalOption
128  
-            key = "OBJC_PRINT_EXCEPTIONS"
129  
-            value = "YES"
130  
-            isEnabled = "YES">
131  
-         </AdditionalOption>
132  
-         <AdditionalOption
133  
-            key = "MallocGuardEdges"
134  
-            value = ""
135  
-            isEnabled = "YES">
136  
-         </AdditionalOption>
137  
-         <AdditionalOption
138  
-            key = "NSZombieEnabled"
139  
-            value = "YES"
140  
-            isEnabled = "YES">
141  
-         </AdditionalOption>
142  
-      </AdditionalOptions>
143  
-   </LaunchAction>
144  
-   <ProfileAction
145  
-      shouldUseLaunchSchemeArgsEnv = "YES"
146  
-      savedToolIdentifier = ""
147  
-      useCustomWorkingDirectory = "NO"
148  
-      buildConfiguration = "Release"
149  
-      debugDocumentVersioning = "YES">
150  
-   </ProfileAction>
151  
-   <AnalyzeAction
152  
-      buildConfiguration = "Debug">
153  
-   </AnalyzeAction>
154  
-   <ArchiveAction
155  
-      buildConfiguration = "Release"
156  
-      revealArchiveInOrganizer = "YES">
157  
-   </ArchiveAction>
158  
-</Scheme>
59  SocketRocket.xcodeproj/xcshareddata/xcschemes/SocketRocketOSX.xcscheme
... ...
@@ -1,59 +0,0 @@
1  
-<?xml version="1.0" encoding="UTF-8"?>
2  
-<Scheme
3  
-   LastUpgradeVersion = "0440"
4  
-   version = "1.3">
5  
-   <BuildAction
6  
-      parallelizeBuildables = "YES"
7  
-      buildImplicitDependencies = "YES">
8  
-      <BuildActionEntries>
9  
-         <BuildActionEntry
10  
-            buildForTesting = "YES"
11  
-            buildForRunning = "YES"
12  
-            buildForProfiling = "YES"
13  
-            buildForArchiving = "YES"
14  
-            buildForAnalyzing = "YES">
15  
-            <BuildableReference
16  
-               BuildableIdentifier = "primary"
17  
-               BlueprintIdentifier = "F668C87F153E91210044DBAC"
18  
-               BuildableName = "SocketRocket.framework"
19  
-               BlueprintName = "SocketRocketOSX"
20  
-               ReferencedContainer = "container:SocketRocket.xcodeproj">
21  
-            </BuildableReference>
22  
-         </BuildActionEntry>
23  
-      </BuildActionEntries>
24  
-   </BuildAction>
25  
-   <TestAction
26  
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
27  
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28  
-      shouldUseLaunchSchemeArgsEnv = "YES"
29  
-      buildConfiguration = "Debug">
30  
-      <Testables>
31  
-      </Testables>
32  
-   </TestAction>
33  
-   <LaunchAction
34  
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
35  
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
36  
-      launchStyle = "0"
37  
-      useCustomWorkingDirectory = "NO"
38  
-      buildConfiguration = "Debug"
39  
-      ignoresPersistentStateOnLaunch = "NO"
40  
-      debugDocumentVersioning = "YES"
41  
-      allowLocationSimulation = "YES">
42  
-      <AdditionalOptions>
43  
-      </AdditionalOptions>
44  
-   </LaunchAction>
45  
-   <ProfileAction
46  
-      shouldUseLaunchSchemeArgsEnv = "YES"
47  
-      savedToolIdentifier = ""
48  
-      useCustomWorkingDirectory = "NO"
49  
-      buildConfiguration = "Release"
50  
-      debugDocumentVersioning = "YES">
51  
-   </ProfileAction>
52  
-   <AnalyzeAction
53  
-      buildConfiguration = "Debug">
54  
-   </AnalyzeAction>
55  
-   <ArchiveAction
56  
-      buildConfiguration = "Release"
57  
-      revealArchiveInOrganizer = "YES">
58  
-   </ArchiveAction>
59  
-</Scheme>
106  SocketRocket.xcodeproj/xcshareddata/xcschemes/TestChat.xcscheme
... ...
@@ -1,106 +0,0 @@
1  
-<?xml version="1.0" encoding="UTF-8"?>
2  
-<Scheme
3  
-   LastUpgradeVersion = "0440"
4  
-   version = "1.3">
5  
-   <BuildAction
6  
-      parallelizeBuildables = "YES"
7  
-      buildImplicitDependencies = "YES">
8  
-      <BuildActionEntries>
9  
-         <BuildActionEntry
10  
-            buildForTesting = "YES"
11  
-            buildForRunning = "YES"
12  
-            buildForProfiling = "YES"
13  
-            buildForArchiving = "YES"
14  
-            buildForAnalyzing = "YES">
15  
-            <BuildableReference
16  
-               BuildableIdentifier = "primary"
17  
-               BlueprintIdentifier = "F62417E214D52F3C003CE997"
18  
-               BuildableName = "TestChat.app"
19  
-               BlueprintName = "TestChat"
20  
-               ReferencedContainer = "container:SocketRocket.xcodeproj">
21  
-            </BuildableReference>
22  
-         </BuildActionEntry>
23  
-      </BuildActionEntries>
24  
-   </BuildAction>
25  
-   <TestAction
26  
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.GDB"
27  
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB"
28  
-      shouldUseLaunchSchemeArgsEnv = "YES"
29  
-      buildConfiguration = "Debug">
30  
-      <Testables>
31  
-      </Testables>
32  
-      <MacroExpansion>
33  
-         <BuildableReference
34  
-            BuildableIdentifier = "primary"
35  
-            BlueprintIdentifier = "F62417E214D52F3C003CE997"
36  
-            BuildableName = "TestChat.app"
37  
-            BlueprintName = "TestChat"
38  
-            ReferencedContainer = "container:SocketRocket.xcodeproj">
39  
-         </BuildableReference>
40  
-      </MacroExpansion>
41  
-   </TestAction>
42  
-   <LaunchAction
43  
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
44  
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
45  
-      launchStyle = "0"
46  
-      useCustomWorkingDirectory = "NO"
47  
-      buildConfiguration = "Debug"
48  
-      ignoresPersistentStateOnLaunch = "NO"
49  
-      debugDocumentVersioning = "YES"
50  
-      allowLocationSimulation = "YES">
51  
-      <BuildableProductRunnable>
52  
-         <BuildableReference
53  
-            BuildableIdentifier = "primary"
54  
-            BlueprintIdentifier = "F62417E214D52F3C003CE997"
55  
-            BuildableName = "TestChat.app"
56  
-            BlueprintName = "TestChat"
57  
-            ReferencedContainer = "container:SocketRocket.xcodeproj">
58  
-         </BuildableReference>
59  
-      </BuildableProductRunnable>
60  
-      <AdditionalOptions>
61  
-         <AdditionalOption
62  
-            key = "MallocScribble"
63  
-            value = ""
64  
-            isEnabled = "YES">
65  
-         </AdditionalOption>
66  
-         <AdditionalOption
67  
-            key = "OBJC_PRINT_EXCEPTIONS"
68  
-            value = "YES"
69  
-            isEnabled = "YES">
70  
-         </AdditionalOption>
71  
-         <AdditionalOption
72  
-            key = "MallocGuardEdges"
73  
-            value = ""
74  
-            isEnabled = "YES">
75  
-         </AdditionalOption>
76  
-         <AdditionalOption
77  
-            key = "NSZombieEnabled"
78  
-            value = "YES"
79  
-            isEnabled = "YES">
80  
-         </AdditionalOption>
81  
-      </AdditionalOptions>
82  
-   </LaunchAction>
83  
-   <ProfileAction
84  
-      shouldUseLaunchSchemeArgsEnv = "YES"
85  
-      savedToolIdentifier = ""
86  
-      useCustomWorkingDirectory = "NO"
87  
-      buildConfiguration = "Release"
88  
-      debugDocumentVersioning = "YES">
89  
-      <BuildableProductRunnable>
90  
-         <BuildableReference
91  
-            BuildableIdentifier = "primary"
92  
-            BlueprintIdentifier = "F62417E214D52F3C003CE997"
93  
-            BuildableName = "TestChat.app"
94  
-            BlueprintName = "TestChat"
95  
-            ReferencedContainer = "container:SocketRocket.xcodeproj">
96  
-         </BuildableReference>
97  
-      </BuildableProductRunnable>
98  
-   </ProfileAction>
99  
-   <AnalyzeAction
100  
-      buildConfiguration = "Debug">
101  
-   </AnalyzeAction>
102  
-   <ArchiveAction
103  
-      buildConfiguration = "Release"
104  
-      revealArchiveInOrganizer = "YES">
105  
-   </ArchiveAction>
106  
-</Scheme>
4  SocketRocket/SRWebSocket.h
@@ -25,8 +25,6 @@ typedef enum {
25 25
     
26 26
 } SRReadyState;
27 27
 
28  
-@class SRWebSocket;
29  
-
30 28
 extern NSString *const SRWebSocketErrorDomain;
31 29
 
32 30
 @protocol SRWebSocketDelegate;
@@ -39,7 +37,7 @@ extern NSString *const SRWebSocketErrorDomain;
39 37
 @property (nonatomic, readonly, retain) NSURL *url;
40 38
 
41 39
 // This returns the negotiated protocol.
42  
-// It will be niluntil after the handshake completes.
  40
+// It will be nil until after the handshake completes.
43 41
 @property (nonatomic, readonly, copy) NSString *protocol;
44 42
 
45 43
 // Protocols should be an array of strings that turn into Sec-WebSocket-Protocol
22  SocketRocket/SRWebSocket.m
@@ -14,11 +14,22 @@
14 14
 //   limitations under the License.
15 15
 //
16 16
 
17  
-
18 17
 #import "SRWebSocket.h"
19 18
 
20 19
 #if TARGET_OS_IPHONE
21  
-#define HAS_ICU
  20
+	#define HAS_ICU
  21
+
  22
+	#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000
  23
+		#define NEEDS_DISPATCH_RETAIN_RELEASE 0
  24
+	#else
  25
+		#define NEEDS_DISPATCH_RETAIN_RELEASE 1
  26
+	#endif
  27
+#else
  28
+	#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080     // Mac OS X 10.8 or later
  29
+		#define NEEDS_DISPATCH_RETAIN_RELEASE 0
  30
+	#else
  31
+		#define NEEDS_DISPATCH_RETAIN_RELEASE 1     // Mac OS X 10.7 or earlier
  32
+	#endif
22 33
 #endif
23 34
 
24 35
 #ifdef HAS_ICU
@@ -309,7 +320,10 @@ - (void)_SR_commonInit;
309 320
     _workQueue = dispatch_queue_create(NULL, DISPATCH_QUEUE_SERIAL);
310 321
     
311 322
     _callbackQueue = dispatch_get_main_queue();
  323
+
  324
+#if NEEDS_DISPATCH_RETAIN_RELEASE
312 325
     dispatch_retain(_callbackQueue);
  326
+#endif
313 327
     
314 328
     _readBuffer = [[NSMutableData alloc] init];
315 329
     _outputBuffer = [[NSMutableData alloc] init];
@@ -328,9 +342,11 @@ - (void)dealloc
328 342
 
329 343
     [_inputStream close];
330 344
     [_outputStream close];
331  
-    
  345
+
  346
+#if NEEDS_DISPATCH_RETAIN_RELEASE
332 347
     dispatch_release(_callbackQueue);
333 348
     dispatch_release(_workQueue);
  349
+#endif
334 350
     
335 351
     if (_receivedHTTPHeaders) {
336 352
         CFRelease(_receivedHTTPHeaders);
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.