Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix readme typeos and ignore more Xcode noise #40

Closed
wants to merge 9 commits into from
Closed

Fix readme typeos and ignore more Xcode noise #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
44e3184
Fix some typeos
soffes Jun 2, 2012
48513c1
Only require CFNetwork on iOS so that podspec works on Lion
MSch Apr 19, 2012
81bec76
Remove xcshareddata
soffes Jun 15, 2012
519afed
Fix warnings
soffes Jun 15, 2012
6a87d46
Revert "Fix warnings".
soffes Jun 15, 2012
b4401b9
Skip install
soffes Jul 12, 2012
f52e0d2
Merge branch 'master' of https://github.com/square/SocketRocket
soffes Jul 29, 2012
25efe7b
Add Mac static library
soffes Aug 15, 2012
e73826d
Target 10.7
soffes Aug 15, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Expand Up @@ -6,3 +6,4 @@ build/
nohup.out
.DS_Store
xcuserdata/
xcshareddata/
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@ There's a few options. Choose one, or just figure it out


Depending on how you configure your project you may need to ``#import`` either
``<SocketRocket/SRSocketRocket.h>`` or ``"SRSocketRocket.h"``
``<SocketRocket/SRWebSocket.h>`` or ``"SRWebSocket.h"``

Framework Dependencies
``````````````````````
Expand Down
145 changes: 144 additions & 1 deletion SocketRocket.xcodeproj/project.pbxproj
View file
Open in desktop
Expand Up @@ -7,6 +7,16 @@
objects = {

/* Begin PBXBuildFile section */
B2EB6A9715DB5D160035AD92 /* base64.c in Sources */ = {isa = PBXBuildFile; fileRef = F6016C7B146124B20037BB3D /* base64.c */; };
B2EB6A9815DB5D160035AD92 /* base64.h in Headers */ = {isa = PBXBuildFile; fileRef = F6016C7E146124ED0037BB3D /* base64.h */; };
B2EB6A9915DB5D160035AD92 /* SRWebSocket.h in Headers */ = {isa = PBXBuildFile; fileRef = F6A12CCF145119B700C1D980 /* SRWebSocket.h */; };
B2EB6A9A15DB5D160035AD92 /* SRWebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = F6A12CD0145119B700C1D980 /* SRWebSocket.m */; };
B2EB6A9B15DB5D160035AD92 /* NSData+SRB64Additions.h in Headers */ = {isa = PBXBuildFile; fileRef = F6572123146C7B6A00D6B8A9 /* NSData+SRB64Additions.h */; };
B2EB6A9C15DB5D160035AD92 /* NSData+SRB64Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = F6572124146C7B6A00D6B8A9 /* NSData+SRB64Additions.m */; };
B2EB6AA015DB5D530035AD92 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B2EB6A9D15DB5D530035AD92 /* CoreServices.framework */; };
B2EB6AA115DB5D530035AD92 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B2EB6A9E15DB5D530035AD92 /* Foundation.framework */; };
B2EB6AA215DB5D530035AD92 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B2EB6A9F15DB5D530035AD92 /* Security.framework */; };
B2EB6AB115DB60F60035AD92 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B2EB6AB015DB60F60035AD92 /* CFNetwork.framework */; };
F6016C7C146124B20037BB3D /* base64.c in Sources */ = {isa = PBXBuildFile; fileRef = F6016C7B146124B20037BB3D /* base64.c */; };
F6016C7F146124ED0037BB3D /* base64.h in Headers */ = {isa = PBXBuildFile; fileRef = F6016C7E146124ED0037BB3D /* base64.h */; };
F6016C8814620EC70037BB3D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6A12CD3145122FC00C1D980 /* Security.framework */; };
Expand Down Expand Up @@ -59,6 +69,13 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
B2EB6A7315DB5C800035AD92 /* libSocketRocketOSXLibrary.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSocketRocketOSXLibrary.a; sourceTree = BUILT_PRODUCTS_DIR; };
B2EB6A7415DB5C800035AD92 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; };
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; };
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; };
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; };
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; };
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; };
F6016C7B146124B20037BB3D /* base64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = base64.c; sourceTree = "<group>"; };
F6016C7E146124ED0037BB3D /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = base64.h; sourceTree = "<group>"; };
F60CC29F14D4EA0500A005E4 /* SRTWebSocketOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRTWebSocketOperation.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -106,6 +123,17 @@
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
B2EB6A7015DB5C800035AD92 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
B2EB6AB115DB60F60035AD92 /* CFNetwork.framework in Frameworks */,
B2EB6AA015DB5D530035AD92 /* CoreServices.framework in Frameworks */,
B2EB6AA115DB5D530035AD92 /* Foundation.framework in Frameworks */,
B2EB6AA215DB5D530035AD92 /* Security.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
F62417E014D52F3C003CE997 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -214,6 +242,11 @@
F6B208221450F597009315AF = {
isa = PBXGroup;
children = (
B2EB6AB015DB60F60035AD92 /* CFNetwork.framework */,
B2EB6AAE15DB5EB80035AD92 /* libicucore.dylib */,
B2EB6A9D15DB5D530035AD92 /* CoreServices.framework */,
B2EB6A9E15DB5D530035AD92 /* Foundation.framework */,
B2EB6A9F15DB5D530035AD92 /* Security.framework */,
F6B208321450F597009315AF /* SocketRocket */,
F6BDA807145900D200FE3253 /* SRWebSocketTests */,
F62417EA14D52F3C003CE997 /* TestChat */,
Expand All @@ -232,6 +265,7 @@
F6BDA802145900D200FE3253 /* SRWebSocketTests.octest */,
F62417E314D52F3C003CE997 /* TestChat.app */,
F668C880153E91210044DBAC /* SocketRocket.framework */,
B2EB6A7315DB5C800035AD92 /* libSocketRocketOSXLibrary.a */,
);
name = Products;
sourceTree = "<group>";
Expand All @@ -247,6 +281,7 @@
F6BDA803145900D200FE3253 /* SenTestingKit.framework */,
F62417E514D52F3C003CE997 /* UIKit.framework */,
F62417E814D52F3C003CE997 /* CoreGraphics.framework */,
B2EB6A7415DB5C800035AD92 /* Cocoa.framework */,
F668C883153E91210044DBAC /* Other Frameworks */,
);
name = Frameworks;
Expand Down Expand Up @@ -300,6 +335,16 @@
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
B2EB6A7115DB5C800035AD92 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
B2EB6A9815DB5D160035AD92 /* base64.h in Headers */,
B2EB6A9915DB5D160035AD92 /* SRWebSocket.h in Headers */,
B2EB6A9B15DB5D160035AD92 /* NSData+SRB64Additions.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
F668C87D153E91210044DBAC /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -320,6 +365,23 @@
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
B2EB6A7215DB5C800035AD92 /* SocketRocketOSXLibrary */ = {
isa = PBXNativeTarget;
buildConfigurationList = B2EB6A7E15DB5C800035AD92 /* Build configuration list for PBXNativeTarget "SocketRocketOSXLibrary" */;
buildPhases = (
B2EB6A6F15DB5C800035AD92 /* Sources */,
B2EB6A7015DB5C800035AD92 /* Frameworks */,
B2EB6A7115DB5C800035AD92 /* Headers */,
);
buildRules = (
);
dependencies = (
);
name = SocketRocketOSXLibrary;
productName = SocketRocketOSXLibrary;
productReference = B2EB6A7315DB5C800035AD92 /* libSocketRocketOSXLibrary.a */;
productType = "com.apple.product-type.library.static";
};
F62417E214D52F3C003CE997 /* TestChat */ = {
isa = PBXNativeTarget;
buildConfigurationList = F62417FC14D52F3C003CE997 /* Build configuration list for PBXNativeTarget "TestChat" */;
Expand Down Expand Up @@ -397,7 +459,7 @@
F6B208241450F597009315AF /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0440;
LastUpgradeCheck = 0450;
};
buildConfigurationList = F6B208271450F597009315AF /* Build configuration list for PBXProject "SocketRocket" */;
compatibilityVersion = "Xcode 3.2";
Expand All @@ -415,6 +477,7 @@
F668C87F153E91210044DBAC /* SocketRocketOSX */,
F6BDA801145900D200FE3253 /* SRWebSocketTests */,
F62417E214D52F3C003CE997 /* TestChat */,
B2EB6A7215DB5C800035AD92 /* SocketRocketOSXLibrary */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -463,6 +526,16 @@
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
B2EB6A6F15DB5C800035AD92 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
B2EB6A9715DB5D160035AD92 /* base64.c in Sources */,
B2EB6A9A15DB5D160035AD92 /* SRWebSocket.m in Sources */,
B2EB6A9C15DB5D160035AD92 /* NSData+SRB64Additions.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
F62417DF14D52F3C003CE997 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -542,6 +615,65 @@
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
B2EB6A7C15DB5C800035AD92 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SYSTEM_APPS_DIR)/Xcode45-DP3.app/Contents/Developer/Library/Frameworks\"",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "SocketRocket/SocketRocket-Prefix.pch";
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"-ObjC",
"-all_load",
);
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx10.7;
SKIP_INSTALL = YES;
};
name = Debug;
};
B2EB6A7D15DB5C800035AD92 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SYSTEM_APPS_DIR)/Xcode45-DP3.app/Contents/Developer/Library/Frameworks\"",
);
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "SocketRocket/SocketRocket-Prefix.pch";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
OTHER_LDFLAGS = (
"-ObjC",
"-all_load",
);
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx10.7;
SKIP_INSTALL = YES;
};
name = Release;
};
F62417FD14D52F3C003CE997 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -607,6 +739,7 @@
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = SocketRocket;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};
name = Debug;
Expand Down Expand Up @@ -635,6 +768,7 @@
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = SocketRocket;
SDKROOT = macosx;
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};
name = Release;
Expand Down Expand Up @@ -774,6 +908,15 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
B2EB6A7E15DB5C800035AD92 /* Build configuration list for PBXNativeTarget "SocketRocketOSXLibrary" */ = {
isa = XCConfigurationList;
buildConfigurations = (
B2EB6A7C15DB5C800035AD92 /* Debug */,
B2EB6A7D15DB5C800035AD92 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
F62417FC14D52F3C003CE997 /* Build configuration list for PBXNativeTarget "TestChat" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Expand Down