diff --git a/Interface/PEPMessage+PEPMessage_MIME/PEPMessage+PEPMessage_MIME.h b/Interface/PEPMessage+PEPMessage_MIME/PEPMessage+PEPMessage_MIME.h new file mode 100644 index 0000000..269de5c --- /dev/null +++ b/Interface/PEPMessage+PEPMessage_MIME/PEPMessage+PEPMessage_MIME.h @@ -0,0 +1,20 @@ +// +// PEPMessage+PEPMessage_MIME.h +// pEpMimeObjCAdapter_macOS +// +// Created by Andreas Buff on 01.07.21. +// + +@import PEPObjCAdapterTypes_macOS; + +NS_ASSUME_NONNULL_BEGIN + +@interface PEPMessage (PEPMessage_MIME) + +- (NSData*)mimeData; + +- (instancetype) initWithMimeData:(NSData *)mimeData; + +@end + +NS_ASSUME_NONNULL_END diff --git a/Interface/PEPMessage+PEPMessage_MIME/PEPMessage+PEPMessage_MIME.m b/Interface/PEPMessage+PEPMessage_MIME/PEPMessage+PEPMessage_MIME.m new file mode 100644 index 0000000..5a0fd9e --- /dev/null +++ b/Interface/PEPMessage+PEPMessage_MIME/PEPMessage+PEPMessage_MIME.m @@ -0,0 +1,31 @@ +// +// PEPMessage+PEPMessage_MIME.m +// pEpMimeObjCAdapter_macOS +// +// Created by Andreas Buff on 01.07.21. +// + +#import "PEPMessage+PEPMessage_MIME.h" +#import "PEPMessage2MIMEUtil.h" +#import "PEPMIME2PEPMessageUtil.h" + +@implementation PEPMessage (PEPMessage_MIME) + +- (instancetype) initWithMimeData:(NSData *)mimeData { + + if (self = [self init]) { + PEPMIME2PEPMessageUtil *util = [PEPMIME2PEPMessageUtil new]; + NSError *error = nil; + self = [util pEpMessageWithMimeData:mimeData error:&error]; + } + return self; +} + +- (NSData*)mimeData { + PEPMessage2MIMEUtil *util = [PEPMessage2MIMEUtil new]; + NSError *error = nil; + NSData *mimeData = [util mimeDataFromPEPMessage:self error:&error]; + return mimeData; +} + +@end diff --git a/PublicHeaders/pEpMimeObjCAdapter.h b/Interface/pEpMimeObjCAdapter.h similarity index 100% rename from PublicHeaders/pEpMimeObjCAdapter.h rename to Interface/pEpMimeObjCAdapter.h diff --git a/PublicHeaders/pEpMimeObjCAdapter.m b/Interface/pEpMimeObjCAdapter.m similarity index 100% rename from PublicHeaders/pEpMimeObjCAdapter.m rename to Interface/pEpMimeObjCAdapter.m diff --git a/PEPMIME2PEPMessageUtil/PEPMIME2PEPMessageUtil.h b/PEPMIME2PEPMessageUtil/PEPMIME2PEPMessageUtil.h new file mode 100644 index 0000000..fccef4c --- /dev/null +++ b/PEPMIME2PEPMessageUtil/PEPMIME2PEPMessageUtil.h @@ -0,0 +1,20 @@ +// +// PEPMIME2PEPMessageUtil.h +// pEpMimeObjCAdapter_macOS +// +// Created by Andreas Buff on 01.07.21. +// + +#import + +@class PEPMessage; + +NS_ASSUME_NONNULL_BEGIN + +@interface PEPMIME2PEPMessageUtil : NSObject + +- (PEPMessage*)pEpMessageWithMimeData:(NSData *)mimeData error: (NSError **)error; + +@end + +NS_ASSUME_NONNULL_END diff --git a/PEPMIME2PEPMessageUtil/PEPMIME2PEPMessageUtil.m b/PEPMIME2PEPMessageUtil/PEPMIME2PEPMessageUtil.m new file mode 100644 index 0000000..ee133a1 --- /dev/null +++ b/PEPMIME2PEPMessageUtil/PEPMIME2PEPMessageUtil.m @@ -0,0 +1,21 @@ +// +// PEPMIME2PEPMessageUtil.m +// pEpMimeObjCAdapter_macOS +// +// Created by Andreas Buff on 01.07.21. +// + +#import "PEPMIME2PEPMessageUtil.h" + +@import PEPObjCAdapterTypes_macOS; + +@implementation PEPMIME2PEPMessageUtil + +- (PEPMessage*)pEpMessageWithMimeData:(NSData *)mimeData error: (NSError **)error { + // mime to engine msg + //msg to pepmsg + + return [PEPMessage new]; +} + +@end diff --git a/PEPMessage2MIMEUtil/PEPMessage2MIMEUtil.h b/PEPMessage2MIMEUtil/PEPMessage2MIMEUtil.h new file mode 100644 index 0000000..150347d --- /dev/null +++ b/PEPMessage2MIMEUtil/PEPMessage2MIMEUtil.h @@ -0,0 +1,21 @@ +// +// PEPMessage2MIMEUtil.h +// pEpMimeObjCAdapter_macOS +// +// Created by Andreas Buff on 01.07.21. +// + +#import + + +@class PEPMessage; + +NS_ASSUME_NONNULL_BEGIN + +@interface PEPMessage2MIMEUtil : NSObject + +- (nullable NSData*)mimeDataFromPEPMessage:(PEPMessage *)pEpMessage error:(NSError **)error; + +@end + +NS_ASSUME_NONNULL_END diff --git a/PEPMessage2MIMEUtil/PEPMessage2MIMEUtil.mm b/PEPMessage2MIMEUtil/PEPMessage2MIMEUtil.mm new file mode 100644 index 0000000..1fb511f --- /dev/null +++ b/PEPMessage2MIMEUtil/PEPMessage2MIMEUtil.mm @@ -0,0 +1,25 @@ +// +// PEPMessage2MIMEUtil.m +// pEpMimeObjCAdapter_macOS +// +// Created by Andreas Buff on 01.07.21. +// + +#import "PEPMessage2MIMEUtil.h" + +#import +#include + +@implementation PEPMessage2MIMEUtil + + +- (nullable NSData*)mimeDataFromPEPMessage:(PEPMessage *)pEpMessage error:(NSError **)error { + // PEPMSG 2 message + // msg to mimestring + //string to data + + + return nil; +} + +@end diff --git a/README.md b/README.md index 3667268..be0021c 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,52 @@ # WIP - - - -## Required Tools - -For building the engine, you need a working python3 environment and all dependencies: - +## Dependencies ``` sudo port install git -``` - -## Setup instructions / Dependencies - -In a directory of your choice, do: +sudo port install gmake +sudo port install autoconf +sudo port install libtool +sudo port install automake ``` -mkdir src_pEpMimeObjCAdapter -cd src_pEpMimeObjCAdapter +``` +mkdir src_pEpMime4macOS +cd src_pEpMime4macOS +mkdir -p local/include +mkdir -p local/lib + +# Dont bother with crossbuild. We need the headers only. +git clone -b boost-1.73.0 --recursive https://github.com/boostorg/boost.git +pushd boost + ./bootstrap.sh -mmacosx-version-min=10.10 + ./b2 -std=c++11 cxxflags=-mmacosx-version-min=10.10 --with-regex --with-filesystem --with-program_options --with-thread --with-system stage + ./b2 install + cp stage/lib/*.a "../local/lib" + cp -r boost "../local/include" +popd + +git clone -b "master" https://pep-security.lu/gitlab/misc/sqlite.git +git clone -b "master" https://gitea.pep.foundation/pEp.foundation/libetpan.git + +git clone git://github.com/vlm/asn1c.git +pushd asn1c + git checkout tags/v0.9.28 -b pep-engine + autoreconf -iv + ./configure --prefix="../local" + make install +popd + +git clone -b v2.1.6 http://pep-security.lu/gitlab/macos/sequoia4macos.git +pushd sequoia4macos + sh build.sh +popd + +https://gitea.pep.foundation/pEp.foundation/pEpEngine.git +git clone -b "v1.16_without_lib_prefix_defines" https://gitea.pep.foundation/buff/libiconv.git git clone https://gitea.pep.foundation/pEp.foundation/pEpMIME.git +git clone https://gitea.pep.foundation/pep.foundation/pEpObjCAdapter.git ``` - ## Build ### Using Xcode diff --git a/libpepmimeobjcadapter_macOS/libpepmimeobjcadapter_macOS.h b/libpepmimeobjcadapter_macOS/libpepmimeobjcadapter_macOS.h deleted file mode 100644 index b2ea5b8..0000000 --- a/libpepmimeobjcadapter_macOS/libpepmimeobjcadapter_macOS.h +++ /dev/null @@ -1,12 +0,0 @@ -// -// libpepmimeobjcadapter_macOS.h -// libpepmimeobjcadapter_macOS -// -// Created by Andreas Buff on 01.07.21. -// - -#import - -@interface libpepmimeobjcadapter_macOS : NSObject - -@end diff --git a/libpepmimeobjcadapter_macOS/libpepmimeobjcadapter_macOS.m b/libpepmimeobjcadapter_macOS/libpepmimeobjcadapter_macOS.m deleted file mode 100644 index e9d4a09..0000000 --- a/libpepmimeobjcadapter_macOS/libpepmimeobjcadapter_macOS.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// libpepmimeobjcadapter_macOS.m -// libpepmimeobjcadapter_macOS -// -// Created by Andreas Buff on 01.07.21. -// - -#import "libpepmimeobjcadapter_macOS.h" - -@implementation libpepmimeobjcadapter_macOS - -@end diff --git a/pEpMimeObjCAdapter.xcodeproj/project.pbxproj b/pEpMimeObjCAdapter.xcodeproj/project.pbxproj index c4a8bfe..4ab8222 100644 --- a/pEpMimeObjCAdapter.xcodeproj/project.pbxproj +++ b/pEpMimeObjCAdapter.xcodeproj/project.pbxproj @@ -7,16 +7,75 @@ objects = { /* Begin PBXBuildFile section */ - 1574D1A3268DB9C8003A5161 /* libpepmimeobjcadapter_macOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 1574D1A2268DB9C8003A5161 /* libpepmimeobjcadapter_macOS.h */; }; - 1574D1A5268DB9C8003A5161 /* libpepmimeobjcadapter_macOS.m in Sources */ = {isa = PBXBuildFile; fileRef = 1574D1A4268DB9C8003A5161 /* libpepmimeobjcadapter_macOS.m */; }; + 1585E8E6268E029500B822E1 /* pEpMimeObjCAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = 1574D19A268DB995003A5161 /* pEpMimeObjCAdapter.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 1585E8E7268E029500B822E1 /* pEpMimeObjCAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 1574D19B268DB995003A5161 /* pEpMimeObjCAdapter.m */; }; + 1585E8F9268E112A00B822E1 /* libpEpMIME.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1585E8F1268E02BA00B822E1 /* libpEpMIME.a */; }; + 1585E901268E12D600B822E1 /* PEPMIME2PEPMessageUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 1585E8FF268E12D600B822E1 /* PEPMIME2PEPMessageUtil.m */; }; + 1585E902268E12D600B822E1 /* PEPMIME2PEPMessageUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 1585E900268E12D600B822E1 /* PEPMIME2PEPMessageUtil.h */; }; + 1585E907268E135500B822E1 /* PEPMessage2MIMEUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 1585E905268E135500B822E1 /* PEPMessage2MIMEUtil.h */; }; + 1585E908268E135500B822E1 /* PEPMessage2MIMEUtil.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1585E906268E135500B822E1 /* PEPMessage2MIMEUtil.mm */; }; + 1585E924268E158700B822E1 /* libPEPObjCAdapterTypes_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1585E91F268E157C00B822E1 /* libPEPObjCAdapterTypes_macOS.a */; }; + 1585E933268E1CDA00B822E1 /* PEPMessage+PEPMessage_MIME.h in Headers */ = {isa = PBXBuildFile; fileRef = 1585E931268E1CDA00B822E1 /* PEPMessage+PEPMessage_MIME.h */; }; + 1585E934268E1CDA00B822E1 /* PEPMessage+PEPMessage_MIME.m in Sources */ = {isa = PBXBuildFile; fileRef = 1585E932268E1CDA00B822E1 /* PEPMessage+PEPMessage_MIME.m */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 1585E8F0268E02BA00B822E1 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1585E8E8268E02BA00B822E1 /* pEpMIME.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1585E8A8268DFD9E00B822E1; + remoteInfo = pEpMIME; + }; + 1585E8F2268E02C400B822E1 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1585E8E8268E02BA00B822E1 /* pEpMIME.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 1585E8A7268DFD9E00B822E1; + remoteInfo = pEpMIME; + }; + 1585E91E268E157C00B822E1 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1585E918268E157C00B822E1 /* PEPObjCAdapterTypes.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 4E575858268329170084F02D; + remoteInfo = PEPObjCAdapterTypes_macOS; + }; + 1585E920268E157C00B822E1 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1585E918268E157C00B822E1 /* PEPObjCAdapterTypes.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 4E575865268329A20084F02D; + remoteInfo = PEPObjCAdapterTypes_iOS; + }; + 1585E922268E157C00B822E1 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1585E918268E157C00B822E1 /* PEPObjCAdapterTypes.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 4E5758BF26833D140084F02D; + remoteInfo = PEPObjCAdapterTypesTests_iOS; + }; + 1585E925268E15A000B822E1 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1585E918268E157C00B822E1 /* PEPObjCAdapterTypes.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 4E575857268329170084F02D; + remoteInfo = PEPObjCAdapterTypes_macOS; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ 1574D19A268DB995003A5161 /* pEpMimeObjCAdapter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pEpMimeObjCAdapter.h; sourceTree = ""; }; 1574D19B268DB995003A5161 /* pEpMimeObjCAdapter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = pEpMimeObjCAdapter.m; sourceTree = ""; }; - 1574D1A0268DB9C8003A5161 /* liblibpEpMimeObjCAdapter_macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblibpEpMimeObjCAdapter_macOS.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 1574D1A2268DB9C8003A5161 /* libpepmimeobjcadapter_macOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = libpepmimeobjcadapter_macOS.h; sourceTree = ""; }; - 1574D1A4268DB9C8003A5161 /* libpepmimeobjcadapter_macOS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = libpepmimeobjcadapter_macOS.m; sourceTree = ""; }; + 1574D1A0268DB9C8003A5161 /* libpEpMimeObjCAdapter_macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libpEpMimeObjCAdapter_macOS.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 1585E8E8268E02BA00B822E1 /* pEpMIME.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = pEpMIME.xcodeproj; path = ../pEpMIME/build_macOS/pEpMIME/pEpMIME.xcodeproj; sourceTree = ""; }; + 1585E8FF268E12D600B822E1 /* PEPMIME2PEPMessageUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PEPMIME2PEPMessageUtil.m; sourceTree = ""; }; + 1585E900268E12D600B822E1 /* PEPMIME2PEPMessageUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PEPMIME2PEPMessageUtil.h; sourceTree = ""; }; + 1585E905268E135500B822E1 /* PEPMessage2MIMEUtil.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPMessage2MIMEUtil.h; sourceTree = ""; }; + 1585E906268E135500B822E1 /* PEPMessage2MIMEUtil.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = PEPMessage2MIMEUtil.mm; sourceTree = ""; }; + 1585E918268E157C00B822E1 /* PEPObjCAdapterTypes.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PEPObjCAdapterTypes.xcodeproj; path = ../pEpObjCAdapter/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj; sourceTree = ""; }; + 1585E931268E1CDA00B822E1 /* PEPMessage+PEPMessage_MIME.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "PEPMessage+PEPMessage_MIME.h"; sourceTree = ""; }; + 1585E932268E1CDA00B822E1 /* PEPMessage+PEPMessage_MIME.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "PEPMessage+PEPMessage_MIME.m"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -24,6 +83,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 1585E924268E158700B822E1 /* libPEPObjCAdapterTypes_macOS.a in Frameworks */, + 1585E8F9268E112A00B822E1 /* libpEpMIME.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -33,36 +94,84 @@ 1574D184268DB8A1003A5161 = { isa = PBXGroup; children = ( - 1574D199268DB980003A5161 /* PublicHeaders */, - 1574D1A1268DB9C8003A5161 /* libpepmimeobjcadapter_macOS */, + 1585E918268E157C00B822E1 /* PEPObjCAdapterTypes.xcodeproj */, + 1585E8E8268E02BA00B822E1 /* pEpMIME.xcodeproj */, + 1574D199268DB980003A5161 /* Interface */, + 1585E904268E132200B822E1 /* PEPMessage2MIMEUtil */, + 1585E903268E130300B822E1 /* PEPMIME2PEPMessageUtil */, 1574D18E268DB8A1003A5161 /* Products */, + 1585E8F8268E112A00B822E1 /* Frameworks */, ); sourceTree = ""; }; 1574D18E268DB8A1003A5161 /* Products */ = { isa = PBXGroup; children = ( - 1574D1A0268DB9C8003A5161 /* liblibpEpMimeObjCAdapter_macOS.a */, + 1574D1A0268DB9C8003A5161 /* libpEpMimeObjCAdapter_macOS.a */, ); name = Products; sourceTree = ""; }; - 1574D199268DB980003A5161 /* PublicHeaders */ = { + 1574D199268DB980003A5161 /* Interface */ = { isa = PBXGroup; children = ( 1574D19A268DB995003A5161 /* pEpMimeObjCAdapter.h */, 1574D19B268DB995003A5161 /* pEpMimeObjCAdapter.m */, + 1585E935268E1E2D00B822E1 /* PEPMessage+PEPMessage_MIME */, + ); + path = Interface; + sourceTree = ""; + }; + 1585E8E9268E02BA00B822E1 /* Products */ = { + isa = PBXGroup; + children = ( + 1585E8F1268E02BA00B822E1 /* libpEpMIME.a */, + ); + name = Products; + sourceTree = ""; + }; + 1585E8F8268E112A00B822E1 /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; + 1585E903268E130300B822E1 /* PEPMIME2PEPMessageUtil */ = { + isa = PBXGroup; + children = ( + 1585E900268E12D600B822E1 /* PEPMIME2PEPMessageUtil.h */, + 1585E8FF268E12D600B822E1 /* PEPMIME2PEPMessageUtil.m */, ); - path = PublicHeaders; + path = PEPMIME2PEPMessageUtil; sourceTree = ""; }; - 1574D1A1268DB9C8003A5161 /* libpepmimeobjcadapter_macOS */ = { + 1585E904268E132200B822E1 /* PEPMessage2MIMEUtil */ = { isa = PBXGroup; children = ( - 1574D1A2268DB9C8003A5161 /* libpepmimeobjcadapter_macOS.h */, - 1574D1A4268DB9C8003A5161 /* libpepmimeobjcadapter_macOS.m */, + 1585E905268E135500B822E1 /* PEPMessage2MIMEUtil.h */, + 1585E906268E135500B822E1 /* PEPMessage2MIMEUtil.mm */, ); - path = libpepmimeobjcadapter_macOS; + path = PEPMessage2MIMEUtil; + sourceTree = ""; + }; + 1585E919268E157C00B822E1 /* Products */ = { + isa = PBXGroup; + children = ( + 1585E91F268E157C00B822E1 /* libPEPObjCAdapterTypes_macOS.a */, + 1585E921268E157C00B822E1 /* libPEPObjCAdapterTypes_iOS.a */, + 1585E923268E157C00B822E1 /* PEPObjCAdapterTypesTests_iOS.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 1585E935268E1E2D00B822E1 /* PEPMessage+PEPMessage_MIME */ = { + isa = PBXGroup; + children = ( + 1585E931268E1CDA00B822E1 /* PEPMessage+PEPMessage_MIME.h */, + 1585E932268E1CDA00B822E1 /* PEPMessage+PEPMessage_MIME.m */, + ); + path = "PEPMessage+PEPMessage_MIME"; sourceTree = ""; }; /* End PBXGroup section */ @@ -72,16 +181,19 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 1574D1A3268DB9C8003A5161 /* libpepmimeobjcadapter_macOS.h in Headers */, + 1585E933268E1CDA00B822E1 /* PEPMessage+PEPMessage_MIME.h in Headers */, + 1585E8E6268E029500B822E1 /* pEpMimeObjCAdapter.h in Headers */, + 1585E907268E135500B822E1 /* PEPMessage2MIMEUtil.h in Headers */, + 1585E902268E12D600B822E1 /* PEPMIME2PEPMessageUtil.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 1574D19F268DB9C8003A5161 /* libpEpMimeObjCAdapter_macOS */ = { + 1574D19F268DB9C8003A5161 /* pEpMimeObjCAdapter_macOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 1574D1A6268DB9C8003A5161 /* Build configuration list for PBXNativeTarget "libpEpMimeObjCAdapter_macOS" */; + buildConfigurationList = 1574D1A6268DB9C8003A5161 /* Build configuration list for PBXNativeTarget "pEpMimeObjCAdapter_macOS" */; buildPhases = ( 1574D19C268DB9C8003A5161 /* Headers */, 1574D19D268DB9C8003A5161 /* Sources */, @@ -91,10 +203,12 @@ buildRules = ( ); dependencies = ( + 1585E926268E15A000B822E1 /* PBXTargetDependency */, + 1585E8F3268E02C400B822E1 /* PBXTargetDependency */, ); - name = libpEpMimeObjCAdapter_macOS; + name = pEpMimeObjCAdapter_macOS; productName = libpepmimeobjcadapter_macOS; - productReference = 1574D1A0268DB9C8003A5161 /* liblibpEpMimeObjCAdapter_macOS.a */; + productReference = 1574D1A0268DB9C8003A5161 /* libpEpMimeObjCAdapter_macOS.a */; productType = "com.apple.product-type.library.static"; }; /* End PBXNativeTarget section */ @@ -121,13 +235,54 @@ mainGroup = 1574D184268DB8A1003A5161; productRefGroup = 1574D18E268DB8A1003A5161 /* Products */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 1585E8E9268E02BA00B822E1 /* Products */; + ProjectRef = 1585E8E8268E02BA00B822E1 /* pEpMIME.xcodeproj */; + }, + { + ProductGroup = 1585E919268E157C00B822E1 /* Products */; + ProjectRef = 1585E918268E157C00B822E1 /* PEPObjCAdapterTypes.xcodeproj */; + }, + ); projectRoot = ""; targets = ( - 1574D19F268DB9C8003A5161 /* libpEpMimeObjCAdapter_macOS */, + 1574D19F268DB9C8003A5161 /* pEpMimeObjCAdapter_macOS */, ); }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 1585E8F1268E02BA00B822E1 /* libpEpMIME.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libpEpMIME.a; + remoteRef = 1585E8F0268E02BA00B822E1 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1585E91F268E157C00B822E1 /* libPEPObjCAdapterTypes_macOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libPEPObjCAdapterTypes_macOS.a; + remoteRef = 1585E91E268E157C00B822E1 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1585E921268E157C00B822E1 /* libPEPObjCAdapterTypes_iOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libPEPObjCAdapterTypes_iOS.a; + remoteRef = 1585E920268E157C00B822E1 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1585E923268E157C00B822E1 /* PEPObjCAdapterTypesTests_iOS.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = PEPObjCAdapterTypesTests_iOS.xctest; + remoteRef = 1585E922268E157C00B822E1 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXShellScriptBuildPhase section */ 1574D1AF268DBD55003A5161 /* Copy artefacts to custom build dir */ = { isa = PBXShellScriptBuildPhase; @@ -146,7 +301,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/bash; - shellScript = "CUSTOM_BUILD_DIR=${PROJECT_DIR}/build\nmkdir -p ${CUSTOM_BUILD_DIR}\ncp -R \"${BUILD_DIR}/${CONFIGURATION}/usr/local/include\" ${CUSTOM_BUILD_DIR}\ncp \"${BUILD_DIR}/${CONFIGURATION}/libpEpMimeObjCAdapter_macOS.a\" ${CUSTOM_BUILD_DIR}\n"; + shellScript = "CUSTOM_BUILD_DIR=${PROJECT_DIR}/build\nmkdir -p ${CUSTOM_BUILD_DIR}/include\ncp \"${BUILD_DIR}/${CONFIGURATION}/usr/local/include/pEpMimeObjCAdapter.h\" \"${CUSTOM_BUILD_DIR}/include\"\ncp \"${BUILD_DIR}/${CONFIGURATION}/libpEpMimeObjCAdapter_macOS.a\" ${CUSTOM_BUILD_DIR}\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -156,12 +311,28 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1574D1A5268DB9C8003A5161 /* libpepmimeobjcadapter_macOS.m in Sources */, + 1585E901268E12D600B822E1 /* PEPMIME2PEPMessageUtil.m in Sources */, + 1585E934268E1CDA00B822E1 /* PEPMessage+PEPMessage_MIME.m in Sources */, + 1585E908268E135500B822E1 /* PEPMessage2MIMEUtil.mm in Sources */, + 1585E8E7268E029500B822E1 /* pEpMimeObjCAdapter.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 1585E8F3268E02C400B822E1 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = pEpMIME; + targetProxy = 1585E8F2268E02C400B822E1 /* PBXContainerItemProxy */; + }; + 1585E926268E15A000B822E1 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = PEPObjCAdapterTypes_macOS; + targetProxy = 1585E925268E15A000B822E1 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 1574D194268DB8A1003A5161 /* Debug */ = { isa = XCBuildConfiguration; @@ -214,6 +385,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + "${PROJECT_DIR}/../pEpMIME/build/include", + "${PROJECT_DIR}/../pEpEngine/build-mac/build/include", + "${PROJECT_DIR}/../pEpObjCAdapter/Subprojects/PEPObjCAdapterTypes/build/include", + ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -267,6 +443,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + "${PROJECT_DIR}/../pEpMIME/build/include", + "${PROJECT_DIR}/../pEpEngine/build-mac/build/include", + "${PROJECT_DIR}/../pEpObjCAdapter/Subprojects/PEPObjCAdapterTypes/build/include", + ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -308,7 +489,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1574D1A6268DB9C8003A5161 /* Build configuration list for PBXNativeTarget "libpEpMimeObjCAdapter_macOS" */ = { + 1574D1A6268DB9C8003A5161 /* Build configuration list for PBXNativeTarget "pEpMimeObjCAdapter_macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 1574D1A7268DB9C8003A5161 /* Debug */, diff --git a/pEpMimeObjCAdapter.xcodeproj/xcshareddata/xcschemes/libpEpMimeObjCAdapter_macOS.xcscheme b/pEpMimeObjCAdapter.xcodeproj/xcshareddata/xcschemes/libpEpMimeObjCAdapter_macOS.xcscheme index fcfe143..b174e07 100644 --- a/pEpMimeObjCAdapter.xcodeproj/xcshareddata/xcschemes/libpEpMimeObjCAdapter_macOS.xcscheme +++ b/pEpMimeObjCAdapter.xcodeproj/xcshareddata/xcschemes/libpEpMimeObjCAdapter_macOS.xcscheme @@ -15,8 +15,8 @@ @@ -51,8 +51,8 @@