APPLEMAIl-5 Add libpEpEngine dynamic library. Comment lines due to incompatibility adpater-engine. Add search library folder. Build works APPLEMAIL-5
authorDavid Alarcon <davida@pep-project.org>
Wed, 06 May 2020 16:10:51 +0200
branchAPPLEMAIL-5
changeset 144046bac5df1849
parent 1439 1ab240a88aee
APPLEMAIl-5 Add libpEpEngine dynamic library. Comment lines due to incompatibility adpater-engine. Add search library folder. Build works
pEpObjCAdapter.xcodeproj/project.pbxproj
pEpObjCAdapter/NSError+PEP.m
pEpObjCAdapter/PEPObjCAdapter.m
     1.1 --- a/pEpObjCAdapter.xcodeproj/project.pbxproj	Wed May 06 14:58:51 2020 +0200
     1.2 +++ b/pEpObjCAdapter.xcodeproj/project.pbxproj	Wed May 06 16:10:51 2020 +0200
     1.3 @@ -69,6 +69,8 @@
     1.4  		43E3985F221D7E56008E7983 /* PEPObjCAdapterFramework.h in Headers */ = {isa = PBXBuildFile; fileRef = 43E3985D221D7E56008E7983 /* PEPObjCAdapterFramework.h */; settings = {ATTRIBUTES = (Public, ); }; };
     1.5  		43E3986B221D7EDD008E7983 /* libiconv.2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 43E3986A221D7EDD008E7983 /* libiconv.2.tbd */; };
     1.6  		43FF2ED12226AFE9000D9567 /* PEPEngineTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 43FF2ECC2226AE7E000D9567 /* PEPEngineTypes.h */; settings = {ATTRIBUTES = (Public, ); }; };
     1.7 +		4E0405E12462ECF500BC4DF0 /* libpEpEngine.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E0405E02462ECF500BC4DF0 /* libpEpEngine.dylib */; };
     1.8 +		4E0405E22462ECF500BC4DF0 /* libpEpEngine.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = 4E0405E02462ECF500BC4DF0 /* libpEpEngine.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
     1.9  		640F79231C9B517C00DBEC4E /* 5CB2C182_sec.asc in Resources */ = {isa = PBXBuildFile; fileRef = 640F79211C9B517C00DBEC4E /* 5CB2C182_sec.asc */; };
    1.10  		640F79241C9B517C00DBEC4E /* 5CB2C182.asc in Resources */ = {isa = PBXBuildFile; fileRef = 640F79221C9B517C00DBEC4E /* 5CB2C182.asc */; };
    1.11  		64415E2F1BE9511C00F6CBB2 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35FB0ABD1B57F99D00377032 /* Security.framework */; };
    1.12 @@ -81,6 +83,20 @@
    1.13  		64415E4D1BEA523300F6CBB2 /* C9C2EE39_sec.asc in Resources */ = {isa = PBXBuildFile; fileRef = 64415E471BEA523300F6CBB2 /* C9C2EE39_sec.asc */; };
    1.14  /* End PBXBuildFile section */
    1.15  
    1.16 +/* Begin PBXCopyFilesBuildPhase section */
    1.17 +		4E0405E32462ECF500BC4DF0 /* Embed Libraries */ = {
    1.18 +			isa = PBXCopyFilesBuildPhase;
    1.19 +			buildActionMask = 2147483647;
    1.20 +			dstPath = "";
    1.21 +			dstSubfolderSpec = 10;
    1.22 +			files = (
    1.23 +				4E0405E22462ECF500BC4DF0 /* libpEpEngine.dylib in Embed Libraries */,
    1.24 +			);
    1.25 +			name = "Embed Libraries";
    1.26 +			runOnlyForDeploymentPostprocessing = 0;
    1.27 +		};
    1.28 +/* End PBXCopyFilesBuildPhase section */
    1.29 +
    1.30  /* Begin PBXFileReference section */
    1.31  		1508AEAD1F8792AC001D5230 /* PEPCopyableThread.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPCopyableThread.h; sourceTree = "<group>"; };
    1.32  		1508AEAE1F8792AC001D5230 /* PEPCopyableThread.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPCopyableThread.m; sourceTree = "<group>"; };
    1.33 @@ -169,6 +185,7 @@
    1.34  		43E3986A221D7EDD008E7983 /* libiconv.2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.2.tbd; path = usr/lib/libiconv.2.tbd; sourceTree = SDKROOT; };
    1.35  		43F73BE92166248E00AB4524 /* PEPSync.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPSync.m; sourceTree = "<group>"; };
    1.36  		43FF2ECC2226AE7E000D9567 /* PEPEngineTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PEPEngineTypes.h; path = PEPObjCAdapterFramework/PEPEngineTypes.h; sourceTree = SOURCE_ROOT; };
    1.37 +		4E0405E02462ECF500BC4DF0 /* libpEpEngine.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpEpEngine.dylib; path = "../Internal-Deployment/dest/lib/libpEpEngine.dylib"; sourceTree = "<group>"; };
    1.38  		640F79211C9B517C00DBEC4E /* 5CB2C182_sec.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = 5CB2C182_sec.asc; sourceTree = "<group>"; };
    1.39  		640F79221C9B517C00DBEC4E /* 5CB2C182.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = 5CB2C182.asc; sourceTree = "<group>"; };
    1.40  		64415E171BE94FCB00F6CBB2 /* pEpObjCAdapterTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = pEpObjCAdapterTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
    1.41 @@ -188,6 +205,7 @@
    1.42  			files = (
    1.43  				43E3986B221D7EDD008E7983 /* libiconv.2.tbd in Frameworks */,
    1.44  				155674ED22B82D710097930C /* libz.dylib in Frameworks */,
    1.45 +				4E0405E12462ECF500BC4DF0 /* libpEpEngine.dylib in Frameworks */,
    1.46  			);
    1.47  			runOnlyForDeploymentPostprocessing = 0;
    1.48  		};
    1.49 @@ -316,6 +334,7 @@
    1.50  		43447C51221D448500B6323E /* Frameworks */ = {
    1.51  			isa = PBXGroup;
    1.52  			children = (
    1.53 +				4E0405E02462ECF500BC4DF0 /* libpEpEngine.dylib */,
    1.54  				43E3986A221D7EDD008E7983 /* libiconv.2.tbd */,
    1.55  				155674EC22B82D710097930C /* libz.dylib */,
    1.56  			);
    1.57 @@ -401,6 +420,7 @@
    1.58  				43E39858221D7E56008E7983 /* Frameworks */,
    1.59  				43E39859221D7E56008E7983 /* Resources */,
    1.60  				158A568022BBDFFA00F98905 /* Warnings for TODO++ */,
    1.61 +				4E0405E32462ECF500BC4DF0 /* Embed Libraries */,
    1.62  			);
    1.63  			buildRules = (
    1.64  			);
    1.65 @@ -621,10 +641,13 @@
    1.66  				GCC_WARN_UNUSED_VARIABLE = YES;
    1.67  				HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../Sequoia4iOS/build/include";
    1.68  				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
    1.69 -				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/../Sequoia4iOS/build/lib";
    1.70 +				LIBRARY_SEARCH_PATHS = (
    1.71 +					"/Users/davidalarcon/Development/pEpSecurity/Internal-Deployment/dest/lib",
    1.72 +					"$(PROJECT_DIR)/../Sequoia4iOS/build/lib",
    1.73 +				);
    1.74  				MTL_ENABLE_DEBUG_INFO = YES;
    1.75  				ONLY_ACTIVE_ARCH = YES;
    1.76 -				SDKROOT = iphoneos;
    1.77 +				SDKROOT = macosx;
    1.78  				SKIP_INSTALL = YES;
    1.79  				VALID_ARCHS = "$(inherited)";
    1.80  			};
    1.81 @@ -671,10 +694,13 @@
    1.82  				GCC_WARN_UNUSED_VARIABLE = YES;
    1.83  				HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../Sequoia4iOS/build/include";
    1.84  				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
    1.85 -				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/../Sequoia4iOS/build/lib";
    1.86 +				LIBRARY_SEARCH_PATHS = (
    1.87 +					"/Users/davidalarcon/Development/pEpSecurity/Internal-Deployment/dest/lib",
    1.88 +					"$(PROJECT_DIR)/../Sequoia4iOS/build/lib",
    1.89 +				);
    1.90  				MTL_ENABLE_DEBUG_INFO = NO;
    1.91  				ONLY_ACTIVE_ARCH = NO;
    1.92 -				SDKROOT = iphoneos;
    1.93 +				SDKROOT = macosx;
    1.94  				SKIP_INSTALL = YES;
    1.95  				VALIDATE_PRODUCT = YES;
    1.96  				VALID_ARCHS = "$(inherited)";
     2.1 --- a/pEpObjCAdapter/NSError+PEP.m	Wed May 06 14:58:51 2020 +0200
     2.2 +++ b/pEpObjCAdapter/NSError+PEP.m	Wed May 06 16:10:51 2020 +0200
     2.3 @@ -26,10 +26,11 @@
     2.4          case PEP_DECRYPT_NO_KEY:
     2.5          case PEP_KEY_IMPORTED:
     2.6          case PEP_KEY_IMPORT_STATUS_UNKNOWN:
     2.7 +        /*
     2.8          case PEP_VERIFY_SIGNER_KEY_REVOKED:
     2.9              return nil;
    2.10              break;
    2.11 -
    2.12 +         */
    2.13          default: {
    2.14              NSDictionary *dict = [NSDictionary
    2.15                                    dictionaryWithObjectsAndKeys:localizedErrorStringFromPEPStatus(status),
     3.1 --- a/pEpObjCAdapter/PEPObjCAdapter.m	Wed May 06 14:58:51 2020 +0200
     3.2 +++ b/pEpObjCAdapter/PEPObjCAdapter.m	Wed May 06 16:10:51 2020 +0200
     3.3 @@ -195,7 +195,7 @@
     3.4                                      bundleName:(NSString *)bundleName
     3.5                                        fileName:(NSString *)fileName {
     3.6  
     3.7 -    NSString *systemDir = [NSString stringWithUTF8String:perMachineDirectory];
     3.8 +    NSString *systemDir = [NSString stringWithUTF8String:per_machine_directory];
     3.9      
    3.10      if(!(systemDir && bundleName && fileName))
    3.11          return;