Xcode: rm netpgp IOS-1484
authorbuff <andreas@pep-project.org>
Sun, 16 Jun 2019 21:08:57 +0200
branchIOS-1484
changeset 3846f99d0abbc6b2
parent 3845 43c758f533cb
child 3847 a2672205d332
Xcode: rm netpgp
build-mac/pEpEngine.xcodeproj/project.pbxproj
     1.1 --- a/build-mac/pEpEngine.xcodeproj/project.pbxproj	Sun Jun 16 15:47:03 2019 +0200
     1.2 +++ b/build-mac/pEpEngine.xcodeproj/project.pbxproj	Sun Jun 16 21:08:57 2019 +0200
     1.3 @@ -133,7 +133,6 @@
     1.4  		43F73C0F2166282C00AB4524 /* KeySync_fsm.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73C072166282C00AB4524 /* KeySync_fsm.c */; };
     1.5  		43F73C112166282C00AB4524 /* sync_api.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73C092166282C00AB4524 /* sync_api.c */; };
     1.6  		43F73C122166282C00AB4524 /* growing_buf.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73C0A2166282C00AB4524 /* growing_buf.c */; };
     1.7 -		6400FB861B8CA1C6005221E3 /* libnetpgp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 645922521B8BD32B00A5AF93 /* libnetpgp.a */; };
     1.8  		6400FB8B1B8CA1CF005221E3 /* libetpan-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64289E371B8B630200FC617B /* libetpan-ios.a */; };
     1.9  		644297C51BE11CE0002BC73B /* system.db in Resources */ = {isa = PBXBuildFile; fileRef = 64951A1B1BE0FCD800B10E71 /* system.db */; };
    1.10  		6467888C1CEB3D120001F54C /* map_asn1.c in Sources */ = {isa = PBXBuildFile; fileRef = 646788871CEB3D120001F54C /* map_asn1.c */; };
    1.11 @@ -152,7 +151,6 @@
    1.12  		64A8267F1B455D0800EECAF0 /* message.c in Sources */ = {isa = PBXBuildFile; fileRef = 64A8265B1B455D0800EECAF0 /* message.c */; };
    1.13  		64A826801B455D0800EECAF0 /* mime.c in Sources */ = {isa = PBXBuildFile; fileRef = 64A8265D1B455D0800EECAF0 /* mime.c */; };
    1.14  		64A826811B455D0800EECAF0 /* pEpEngine.c in Sources */ = {isa = PBXBuildFile; fileRef = 64A826601B455D0800EECAF0 /* pEpEngine.c */; };
    1.15 -		64A826821B455D0800EECAF0 /* pgp_netpgp.c in Sources */ = {isa = PBXBuildFile; fileRef = 64A826631B455D0800EECAF0 /* pgp_netpgp.c */; };
    1.16  		64A826831B455D0800EECAF0 /* platform_unix.c in Sources */ = {isa = PBXBuildFile; fileRef = 64A826651B455D0800EECAF0 /* platform_unix.c */; };
    1.17  		64A826861B455D0800EECAF0 /* stringlist.c in Sources */ = {isa = PBXBuildFile; fileRef = 64A8266D1B455D0800EECAF0 /* stringlist.c */; };
    1.18  		64A826871B455D0800EECAF0 /* stringpair.c in Sources */ = {isa = PBXBuildFile; fileRef = 64A8266F1B455D0800EECAF0 /* stringpair.c */; };
    1.19 @@ -200,20 +198,6 @@
    1.20  			remoteGlobalIDString = C682E21815B315EF00BE9DA7;
    1.21  			remoteInfo = "libetpan ios";
    1.22  		};
    1.23 -		645922511B8BD32B00A5AF93 /* PBXContainerItemProxy */ = {
    1.24 -			isa = PBXContainerItemProxy;
    1.25 -			containerPortal = 64DA240C1B832EA0000BEE80 /* netpgp.xcodeproj */;
    1.26 -			proxyType = 2;
    1.27 -			remoteGlobalIDString = 64AA9C201B45686800D0F542;
    1.28 -			remoteInfo = netpgp;
    1.29 -		};
    1.30 -		645922531B8BD53F00A5AF93 /* PBXContainerItemProxy */ = {
    1.31 -			isa = PBXContainerItemProxy;
    1.32 -			containerPortal = 64DA240C1B832EA0000BEE80 /* netpgp.xcodeproj */;
    1.33 -			proxyType = 1;
    1.34 -			remoteGlobalIDString = 64AA9C1F1B45686800D0F542;
    1.35 -			remoteInfo = netpgp;
    1.36 -		};
    1.37  /* End PBXContainerItemProxy section */
    1.38  
    1.39  /* Begin PBXCopyFilesBuildPhase section */
    1.40 @@ -388,9 +372,6 @@
    1.41  		64A8265F1B455D0800EECAF0 /* pEp_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pEp_internal.h; path = ../src/pEp_internal.h; sourceTree = "<group>"; };
    1.42  		64A826601B455D0800EECAF0 /* pEpEngine.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pEpEngine.c; path = ../src/pEpEngine.c; sourceTree = "<group>"; };
    1.43  		64A826611B455D0800EECAF0 /* pEpEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pEpEngine.h; path = ../src/pEpEngine.h; sourceTree = "<group>"; };
    1.44 -		64A826621B455D0800EECAF0 /* pgp_netpgp_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pgp_netpgp_internal.h; path = ../src/pgp_netpgp_internal.h; sourceTree = "<group>"; };
    1.45 -		64A826631B455D0800EECAF0 /* pgp_netpgp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pgp_netpgp.c; path = ../src/pgp_netpgp.c; sourceTree = "<group>"; };
    1.46 -		64A826641B455D0800EECAF0 /* pgp_netpgp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pgp_netpgp.h; path = ../src/pgp_netpgp.h; sourceTree = "<group>"; };
    1.47  		64A826651B455D0800EECAF0 /* platform_unix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = platform_unix.c; path = ../src/platform_unix.c; sourceTree = "<group>"; };
    1.48  		64A826661B455D0800EECAF0 /* platform_unix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform_unix.h; path = ../src/platform_unix.h; sourceTree = "<group>"; };
    1.49  		64A826691B455D0800EECAF0 /* platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform.h; path = ../src/platform.h; sourceTree = "<group>"; };
    1.50 @@ -406,7 +387,6 @@
    1.51  		64A826751B455D0800EECAF0 /* transport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = transport.c; path = ../src/transport.c; sourceTree = "<group>"; };
    1.52  		64A826761B455D0800EECAF0 /* transport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = transport.h; path = ../src/transport.h; sourceTree = "<group>"; };
    1.53  		64A826771B455D0800EECAF0 /* wrappers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = wrappers.h; path = ../src/wrappers.h; sourceTree = "<group>"; };
    1.54 -		64DA240C1B832EA0000BEE80 /* netpgp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = netpgp.xcodeproj; path = "../../netpgp-et/netpgp-xcode/netpgp.xcodeproj"; sourceTree = "<group>"; };
    1.55  		64DA24121B832EBA000BEE80 /* libetpan.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libetpan.xcodeproj; path = "../../libetpan/build-mac/libetpan.xcodeproj"; sourceTree = "<group>"; };
    1.56  		C46EBAE7216E445F0042A6A3 /* base64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = base64.c; path = ../src/base64.c; sourceTree = "<group>"; };
    1.57  		C46EBAEC216E445F0042A6A3 /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base64.h; path = ../src/base64.h; sourceTree = "<group>"; };
    1.58 @@ -425,7 +405,6 @@
    1.59  			buildActionMask = 2147483647;
    1.60  			files = (
    1.61  				6400FB8B1B8CA1CF005221E3 /* libetpan-ios.a in Frameworks */,
    1.62 -				6400FB861B8CA1C6005221E3 /* libnetpgp.a in Frameworks */,
    1.63  				649DE08B1B45C19100912F72 /* libcurl.a in Frameworks */,
    1.64  			);
    1.65  			runOnlyForDeploymentPostprocessing = 0;
    1.66 @@ -572,21 +551,12 @@
    1.67  			path = pEpTrustWords;
    1.68  			sourceTree = "<group>";
    1.69  		};
    1.70 -		6459224E1B8BD32B00A5AF93 /* Products */ = {
    1.71 -			isa = PBXGroup;
    1.72 -			children = (
    1.73 -				645922521B8BD32B00A5AF93 /* libnetpgp.a */,
    1.74 -			);
    1.75 -			name = Products;
    1.76 -			sourceTree = "<group>";
    1.77 -		};
    1.78  		64796A361B455AA5004B1C24 = {
    1.79  			isa = PBXGroup;
    1.80  			children = (
    1.81  				43D47A89225CC60600E97C5B /* Resources-iPad */,
    1.82  				64951A1B1BE0FCD800B10E71 /* system.db */,
    1.83  				64DA24121B832EBA000BEE80 /* libetpan.xcodeproj */,
    1.84 -				64DA240C1B832EA0000BEE80 /* netpgp.xcodeproj */,
    1.85  				649DE08A1B45C19100912F72 /* libcurl.a */,
    1.86  				6406CE811CE382F400C14D77 /* asn.1 */,
    1.87  				64A8264B1B455C5600EECAF0 /* srcref */,
    1.88 @@ -656,9 +626,6 @@
    1.89  				64A8265F1B455D0800EECAF0 /* pEp_internal.h */,
    1.90  				64A826601B455D0800EECAF0 /* pEpEngine.c */,
    1.91  				64A826611B455D0800EECAF0 /* pEpEngine.h */,
    1.92 -				64A826621B455D0800EECAF0 /* pgp_netpgp_internal.h */,
    1.93 -				64A826631B455D0800EECAF0 /* pgp_netpgp.c */,
    1.94 -				64A826641B455D0800EECAF0 /* pgp_netpgp.h */,
    1.95  				64A826651B455D0800EECAF0 /* platform_unix.c */,
    1.96  				64A826661B455D0800EECAF0 /* platform_unix.h */,
    1.97  				64A826691B455D0800EECAF0 /* platform.h */,
    1.98 @@ -787,7 +754,6 @@
    1.99  			);
   1.100  			dependencies = (
   1.101  				43D47AA1225CC82400E97C5B /* PBXTargetDependency */,
   1.102 -				645922541B8BD53F00A5AF93 /* PBXTargetDependency */,
   1.103  				64289E3F1B8B638800FC617B /* PBXTargetDependency */,
   1.104  			);
   1.105  			name = pEpEngine;
   1.106 @@ -828,10 +794,6 @@
   1.107  					ProductGroup = 64289E2B1B8B630200FC617B /* Products */;
   1.108  					ProjectRef = 64DA24121B832EBA000BEE80 /* libetpan.xcodeproj */;
   1.109  				},
   1.110 -				{
   1.111 -					ProductGroup = 6459224E1B8BD32B00A5AF93 /* Products */;
   1.112 -					ProjectRef = 64DA240C1B832EA0000BEE80 /* netpgp.xcodeproj */;
   1.113 -				},
   1.114  			);
   1.115  			projectRoot = "";
   1.116  			targets = (
   1.117 @@ -863,13 +825,6 @@
   1.118  			remoteRef = 64289E361B8B630200FC617B /* PBXContainerItemProxy */;
   1.119  			sourceTree = BUILT_PRODUCTS_DIR;
   1.120  		};
   1.121 -		645922521B8BD32B00A5AF93 /* libnetpgp.a */ = {
   1.122 -			isa = PBXReferenceProxy;
   1.123 -			fileType = archive.ar;
   1.124 -			path = libnetpgp.a;
   1.125 -			remoteRef = 645922511B8BD32B00A5AF93 /* PBXContainerItemProxy */;
   1.126 -			sourceTree = BUILT_PRODUCTS_DIR;
   1.127 -		};
   1.128  /* End PBXReferenceProxy section */
   1.129  
   1.130  /* Begin PBXResourcesBuildPhase section */
   1.131 @@ -964,7 +919,6 @@
   1.132  				4354FF651D6EDF300033069C /* sync_impl.c in Sources */,
   1.133  				64A8267E1B455D0800EECAF0 /* message_api.c in Sources */,
   1.134  				15B037D122B2B822002D664C /* per_encoder.c in Sources */,
   1.135 -				64A826821B455D0800EECAF0 /* pgp_netpgp.c in Sources */,
   1.136  				15B037CB22B2B822002D664C /* ISO639-1.c in Sources */,
   1.137  				15B037AF22B2B822002D664C /* constr_SEQUENCE.c in Sources */,
   1.138  				15B037B722B2B822002D664C /* Sync.c in Sources */,
   1.139 @@ -1033,11 +987,6 @@
   1.140  			name = "libetpan ios";
   1.141  			targetProxy = 64289E3E1B8B638800FC617B /* PBXContainerItemProxy */;
   1.142  		};
   1.143 -		645922541B8BD53F00A5AF93 /* PBXTargetDependency */ = {
   1.144 -			isa = PBXTargetDependency;
   1.145 -			name = netpgp;
   1.146 -			targetProxy = 645922531B8BD53F00A5AF93 /* PBXContainerItemProxy */;
   1.147 -		};
   1.148  /* End PBXTargetDependency section */
   1.149  
   1.150  /* Begin XCBuildConfiguration section */
   1.151 @@ -1096,10 +1045,7 @@
   1.152  				GCC_DYNAMIC_NO_PIC = NO;
   1.153  				GCC_NO_COMMON_BLOCKS = YES;
   1.154  				GCC_OPTIMIZATION_LEVEL = 0;
   1.155 -				GCC_PREPROCESSOR_DEFINITIONS = (
   1.156 -					"DEBUG=1",
   1.157 -					"USE_NETPGP=1",
   1.158 -				);
   1.159 +				GCC_PREPROCESSOR_DEFINITIONS = "USE_SEQUOIA=1";
   1.160  				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
   1.161  				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
   1.162  				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
   1.163 @@ -1157,7 +1103,7 @@
   1.164  				ENABLE_STRICT_OBJC_MSGSEND = YES;
   1.165  				GCC_C_LANGUAGE_STANDARD = gnu99;
   1.166  				GCC_NO_COMMON_BLOCKS = YES;
   1.167 -				GCC_PREPROCESSOR_DEFINITIONS = "USE_NETPGP=1";
   1.168 +				GCC_PREPROCESSOR_DEFINITIONS = "USE_SEQUOIA=1";
   1.169  				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
   1.170  				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
   1.171  				GCC_WARN_UNDECLARED_SELECTOR = YES;
   1.172 @@ -1185,6 +1131,10 @@
   1.173  		64796A541B455AA5004B1C24 /* Debug */ = {
   1.174  			isa = XCBuildConfiguration;
   1.175  			buildSettings = {
   1.176 +				GCC_PREPROCESSOR_DEFINITIONS = (
   1.177 +					"$(inherited)",
   1.178 +					"DEBUG=1",
   1.179 +				);
   1.180  				HEADER_SEARCH_PATHS = "$(inherited)";
   1.181  				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
   1.182  				LIBRARY_SEARCH_PATHS = (
   1.183 @@ -1211,6 +1161,7 @@
   1.184  		64796A551B455AA5004B1C24 /* Release */ = {
   1.185  			isa = XCBuildConfiguration;
   1.186  			buildSettings = {
   1.187 +				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
   1.188  				HEADER_SEARCH_PATHS = "$(inherited)";
   1.189  				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
   1.190  				LIBRARY_SEARCH_PATHS = (