回滚提交错误代码

ios-chat.xcworkspace/contents.xcworkspacedata

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Workspace
    version = "1.0">
-   <FileRef
-      location = "group:../proto2/mars/cmake_build/iOS/mars.xcodeproj">
-   </FileRef>
    <FileRef
       location = "group:wfchat/WildFireChat.xcodeproj">
    </FileRef>

wfclient/WFChatClient.xcodeproj/project.pbxproj

@@ -108,16 +108,6 @@
 		2F48C9C6214D16250092B167 /* WFCCRecallMessageContent.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F48C9C4214D16240092B167 /* WFCCRecallMessageContent.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2F56F6A22529D04500B829C4 /* WFCCCompositeMessageContent.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F56F6A02529D04500B829C4 /* WFCCCompositeMessageContent.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2F56F6A32529D04500B829C4 /* WFCCCompositeMessageContent.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F56F6A12529D04500B829C4 /* WFCCCompositeMessageContent.m */; };
-		2F5A6D362544FE1800B99E52 /* libapp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5A6D2E2544FE1800B99E52 /* libapp.a */; };
-		2F5A6D372544FE1800B99E52 /* libbaseevent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5A6D2F2544FE1800B99E52 /* libbaseevent.a */; };
-		2F5A6D382544FE1800B99E52 /* libcomm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5A6D302544FE1800B99E52 /* libcomm.a */; };
-		2F5A6D392544FE1800B99E52 /* libmars-boost.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5A6D312544FE1800B99E52 /* libmars-boost.a */; };
-		2F5A6D3A2544FE1800B99E52 /* libproto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5A6D322544FE1800B99E52 /* libproto.a */; };
-		2F5A6D3B2544FE1800B99E52 /* libsdt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5A6D332544FE1800B99E52 /* libsdt.a */; };
-		2F5A6D3C2544FE1800B99E52 /* libstn.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5A6D342544FE1800B99E52 /* libstn.a */; };
-		2F5A6D3D2544FE1800B99E52 /* libxlog.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5A6D352544FE1800B99E52 /* libxlog.a */; };
-		2F5A6D4E2544FFBD00B99E52 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5A6D4B2544FEC900B99E52 /* libcrypto.a */; };
-		2F5A6D4F2544FFBD00B99E52 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5A6D4A2544FEC900B99E52 /* libssl.a */; };
 		2F77099E2453DCB10020DB77 /* WFCCThingsLostEventContent.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F7709982453DCB10020DB77 /* WFCCThingsLostEventContent.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2F7709A02453DCB10020DB77 /* WFCCThingsDataContent.h in Headers */ = {isa = PBXBuildFile; fileRef = 2F77099A2453DCB10020DB77 /* WFCCThingsDataContent.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		2F7709A12453DCB10020DB77 /* WFCCThingsDataContent.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F77099B2453DCB10020DB77 /* WFCCThingsDataContent.m */; };
@@ -159,6 +149,7 @@
 		901E271021F1545000A163CB /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 901E270F21F1545000A163CB /* libresolv.tbd */; };
 		901E271221F1545900A163CB /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 901E271121F1545900A163CB /* libc++.tbd */; };
 		901E271421F1546100A163CB /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 901E271321F1546100A163CB /* libz.tbd */; };
+		901E271521F1546A00A163CB /* mars.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 901E270A21F153D800A163CB /* mars.framework */; };
 		903EBB8B21357DDF00312C16 /* WFCCStickerMessageContent.m in Sources */ = {isa = PBXBuildFile; fileRef = 903EBB8921357DDF00312C16 /* WFCCStickerMessageContent.m */; };
 		903EBB8C21357DDF00312C16 /* WFCCStickerMessageContent.h in Headers */ = {isa = PBXBuildFile; fileRef = 903EBB8A21357DDF00312C16 /* WFCCStickerMessageContent.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		90B044461FEFD6BA00AFE79B /* WFCCUnknownMessageContent.m in Sources */ = {isa = PBXBuildFile; fileRef = 90B044441FEFD6BA00AFE79B /* WFCCUnknownMessageContent.m */; };
@@ -280,16 +271,6 @@
 		2F48C9C4214D16240092B167 /* WFCCRecallMessageContent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WFCCRecallMessageContent.h; sourceTree = "<group>"; };
 		2F56F6A02529D04500B829C4 /* WFCCCompositeMessageContent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WFCCCompositeMessageContent.h; sourceTree = "<group>"; };
 		2F56F6A12529D04500B829C4 /* WFCCCompositeMessageContent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WFCCCompositeMessageContent.m; sourceTree = "<group>"; };
-		2F5A6D2E2544FE1800B99E52 /* libapp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libapp.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		2F5A6D2F2544FE1800B99E52 /* libbaseevent.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbaseevent.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		2F5A6D302544FE1800B99E52 /* libcomm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcomm.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		2F5A6D312544FE1800B99E52 /* libmars-boost.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libmars-boost.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		2F5A6D322544FE1800B99E52 /* libproto.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libproto.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		2F5A6D332544FE1800B99E52 /* libsdt.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libsdt.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		2F5A6D342544FE1800B99E52 /* libstn.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libstn.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		2F5A6D352544FE1800B99E52 /* libxlog.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libxlog.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		2F5A6D4A2544FEC900B99E52 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libssl.a; sourceTree = "<group>"; };
-		2F5A6D4B2544FEC900B99E52 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libcrypto.a; sourceTree = "<group>"; };
 		2F7709982453DCB10020DB77 /* WFCCThingsLostEventContent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WFCCThingsLostEventContent.h; sourceTree = "<group>"; };
 		2F77099A2453DCB10020DB77 /* WFCCThingsDataContent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WFCCThingsDataContent.h; sourceTree = "<group>"; };
 		2F77099B2453DCB10020DB77 /* WFCCThingsDataContent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WFCCThingsDataContent.m; sourceTree = "<group>"; };
@@ -356,21 +337,12 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2F5A6D3D2544FE1800B99E52 /* libxlog.a in Frameworks */,
-				2F5A6D372544FE1800B99E52 /* libbaseevent.a in Frameworks */,
-				2F5A6D392544FE1800B99E52 /* libmars-boost.a in Frameworks */,
-				2F5A6D382544FE1800B99E52 /* libcomm.a in Frameworks */,
+				901E271521F1546A00A163CB /* mars.framework in Frameworks */,
 				901E271421F1546100A163CB /* libz.tbd in Frameworks */,
-				2F5A6D4F2544FFBD00B99E52 /* libssl.a in Frameworks */,
 				901E271221F1545900A163CB /* libc++.tbd in Frameworks */,
-				2F5A6D4E2544FFBD00B99E52 /* libcrypto.a in Frameworks */,
 				901E271021F1545000A163CB /* libresolv.tbd in Frameworks */,
-				2F5A6D362544FE1800B99E52 /* libapp.a in Frameworks */,
 				901E270E21F1543D00A163CB /* CoreTelephony.framework in Frameworks */,
-				2F5A6D3B2544FE1800B99E52 /* libsdt.a in Frameworks */,
 				2E6B50B21FAE990D006B6E31 /* libopencore-amrnb.a in Frameworks */,
-				2F5A6D3A2544FE1800B99E52 /* libproto.a in Frameworks */,
-				2F5A6D3C2544FE1800B99E52 /* libstn.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -624,16 +596,6 @@
 		901E270C21F1543C00A163CB /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				2F5A6D4B2544FEC900B99E52 /* libcrypto.a */,
-				2F5A6D4A2544FEC900B99E52 /* libssl.a */,
-				2F5A6D2E2544FE1800B99E52 /* libapp.a */,
-				2F5A6D2F2544FE1800B99E52 /* libbaseevent.a */,
-				2F5A6D302544FE1800B99E52 /* libcomm.a */,
-				2F5A6D312544FE1800B99E52 /* libmars-boost.a */,
-				2F5A6D322544FE1800B99E52 /* libproto.a */,
-				2F5A6D332544FE1800B99E52 /* libsdt.a */,
-				2F5A6D342544FE1800B99E52 /* libstn.a */,
-				2F5A6D352544FE1800B99E52 /* libxlog.a */,
 				901E271321F1546100A163CB /* libz.tbd */,
 				901E271121F1545900A163CB /* libc++.tbd */,
 				901E270F21F1545000A163CB /* libresolv.tbd */,