From aa175d54851a0e41f7f40015eafe000cc5a05f49 Mon Sep 17 00:00:00 2001 From: Andreas Buff Date: Mon, 22 Mar 2021 12:31:07 +0100 Subject: [PATCH 1/5] IOS-2736 rm commented code --- pEpObjCAdapter/Logger.h | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/pEpObjCAdapter/Logger.h b/pEpObjCAdapter/Logger.h index 27e6c9e..f1b4b6f 100644 --- a/pEpObjCAdapter/Logger.h +++ b/pEpObjCAdapter/Logger.h @@ -37,28 +37,4 @@ fileLine:__LINE__]; #endif - - -//#import - - - -//#import -// -//#define LogInfo(...) [[Log shared] \ -// logInfoWithMessage:[NSString stringWithFormat:__VA_ARGS__] \ -// function:[NSString stringWithUTF8String:__FUNCTION__] \ -// filePath:[NSString stringWithUTF8String:__FILE__] \ -// fileLine:__LINE__]; -//#define LogWarn(...) [[Log shared] \ -//logWarnWithMessage:[NSString stringWithFormat:__VA_ARGS__] \ -//function:[NSString stringWithUTF8String:__FUNCTION__] \ -//filePath:[NSString stringWithUTF8String:__FILE__] \ -//fileLine:__LINE__]; -//#define LogError(...) [[Log shared] \ -//logErrorWithMessage:[NSString stringWithFormat:__VA_ARGS__] \ -//function:[NSString stringWithUTF8String:__FUNCTION__] \ -//filePath:[NSString stringWithUTF8String:__FILE__] \ -//fileLine:__LINE__]; - #endif /* Logger_h */ From b2f635a54280c269e4ea04d59836051ca5680c2b Mon Sep 17 00:00:00 2001 From: Andreas Buff Date: Mon, 22 Mar 2021 17:10:24 +0100 Subject: [PATCH 2/5] IOS-2736 mac build uses PEPToolbox now. --- pEpObjCAdapter.xcodeproj/project.pbxproj | 34 ++++++++++++++++++- .../xcschemes/PEPObjCAdapter_macOS.xcscheme | 28 +++++++++++++++ pEpObjCAdapter/Logger.h | 12 ++----- 3 files changed, 64 insertions(+), 10 deletions(-) diff --git a/pEpObjCAdapter.xcodeproj/project.pbxproj b/pEpObjCAdapter.xcodeproj/project.pbxproj index 308ae48..4f7aebe 100644 --- a/pEpObjCAdapter.xcodeproj/project.pbxproj +++ b/pEpObjCAdapter.xcodeproj/project.pbxproj @@ -145,6 +145,7 @@ 1552D98F257660C900A92F71 /* PEPAutoPointer.h in Headers */ = {isa = PBXBuildFile; fileRef = 434ED6D4207E27B8000A7590 /* PEPAutoPointer.h */; }; 1552D990257660C900A92F71 /* PEPPassphraseCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 43589EF624A4A3B70079BEA2 /* PEPPassphraseCache.m */; }; 1552DCBE2577E0B600A92F71 /* libpEpEngine_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1552DCBD2577E0B600A92F71 /* libpEpEngine_macOS.a */; }; + 155A03512608B7DE00FF2754 /* libPEPToolbox_macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 155A03502608B7DE00FF2754 /* libPEPToolbox_macOS.a */; settings = {ATTRIBUTES = (Weak, ); }; }; 159C009125BB13E200F13E2B /* PEPIdentity+Engine.m in Sources */ = {isa = PBXBuildFile; fileRef = 438C0F1225402D6400337922 /* PEPIdentity+Engine.m */; }; 159C009925BB13F700F13E2B /* NSArray+Take.m in Sources */ = {isa = PBXBuildFile; fileRef = 43209B271ECC2ACD007E7E2E /* NSArray+Take.m */; }; 159C009F25BB140000F13E2B /* NSArray+Engine.m in Sources */ = {isa = PBXBuildFile; fileRef = 438C0ECB254020F000337922 /* NSArray+Engine.m */; }; @@ -316,6 +317,7 @@ 1552D93F2576602D00A92F71 /* PEPObjCAdapter_macOS.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPObjCAdapter_macOS.m; sourceTree = ""; }; 1552DA2125766AC700A92F71 /* libpEpEngine.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpEpEngine.a; path = ../../src_pEp4ThunderbirdMacInstaller/pep4thunderbird_macos_installer_buildscript/local/lib/libpEpEngine.a; sourceTree = ""; }; 155674EC22B82D710097930C /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; + 155A03502608B7DE00FF2754 /* libPEPToolbox_macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libPEPToolbox_macOS.a; sourceTree = BUILT_PRODUCTS_DIR; }; 15B107A4257520DE00D06C34 /* PEPEngineTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PEPEngineTypes.h; sourceTree = ""; }; 15B107A5257520DE00D06C34 /* PEPIdentity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PEPIdentity.m; sourceTree = ""; }; 15B107A6257520DE00D06C34 /* PEPAttachment.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PEPAttachment.m; sourceTree = ""; }; @@ -476,8 +478,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 1543D9E02577EF260041EFB5 /* libpEpEngine_macOS.a in Frameworks */, + 155A03512608B7DE00FF2754 /* libPEPToolbox_macOS.a in Frameworks */, 1543DA892577FE230041EFB5 /* libPEPObjCAdapterTypes_macOS.a in Frameworks */, + 1543D9E02577EF260041EFB5 /* libpEpEngine_macOS.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -719,6 +722,7 @@ 43447C51221D448500B6323E /* Frameworks */ = { isa = PBXGroup; children = ( + 155A03502608B7DE00FF2754 /* libPEPToolbox_macOS.a */, 15160E7F257AA06500DD42E0 /* pEp4iosIntern.framework */, 15160B30257A595800DD42E0 /* libiconv.tbd */, 15160B29257A594F00DD42E0 /* libz.tbd */, @@ -1063,6 +1067,7 @@ }; 1552D93A2576602D00A92F71 = { CreatedOnToolsVersion = 12.2; + LastSwiftMigration = 1240; }; 4E81CD4825C19DD4009F140D = { CreatedOnToolsVersion = 12.3; @@ -1505,6 +1510,7 @@ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; @@ -1514,6 +1520,16 @@ EXECUTABLE_PREFIX = lib; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; + HEADER_SEARCH_PATHS = ( + "$(PROJECT_DIR)/../pEpEngine/src", + "$(PROJECT_DIR)/../local/include/**", + "$(PROJECT_DIR)/../pep-toolbox/xcodeGenerated", + ); + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -1522,6 +1538,9 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SKIP_INSTALL = YES; + SWIFT_OBJC_BRIDGING_HEADER = "PEPObjCAdapter_macOS-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -1532,6 +1551,7 @@ CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; @@ -1539,6 +1559,16 @@ DEVELOPMENT_TEAM = NQLYU6MGPN; EXECUTABLE_PREFIX = lib; GCC_C_LANGUAGE_STANDARD = gnu11; + HEADER_SEARCH_PATHS = ( + "$(PROJECT_DIR)/../pEpEngine/src", + "$(PROJECT_DIR)/../local/include/**", + "$(PROJECT_DIR)/../pep-toolbox/xcodeGenerated", + ); + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + ); MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_FAST_MATH = YES; OTHER_LDFLAGS = ""; @@ -1546,6 +1576,8 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SKIP_INSTALL = YES; + SWIFT_OBJC_BRIDGING_HEADER = "PEPObjCAdapter_macOS-Bridging-Header.h"; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/pEpObjCAdapter.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapter_macOS.xcscheme b/pEpObjCAdapter.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapter_macOS.xcscheme index b786a31..b124eec 100644 --- a/pEpObjCAdapter.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapter_macOS.xcscheme +++ b/pEpObjCAdapter.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapter_macOS.xcscheme @@ -6,6 +6,34 @@ parallelizeBuildables = "NO" buildImplicitDependencies = "NO"> + + + + + + + + +#else +#import "PEPToolbox_macOS-Swift.h" +#endif #define LogInfo(...) [[Log shared] \ logInfoWithMessage:[NSString stringWithFormat:__VA_ARGS__] \ @@ -29,12 +31,4 @@ function:[NSString stringWithUTF8String:__FUNCTION__] \ filePath:[NSString stringWithUTF8String:__FILE__] \ fileLine:__LINE__]; -#else -//BUFF: //DIRK: //!!!: Mac version loggingneeds to be defined and implemented. Remeber to only use static libs. Ideally we find a nice way without #ifdef IS_IOS_BUILD. -#define LogInfo(...) NSLog(__VA_ARGS__); -#define LogWarn(...) NSLog(__VA_ARGS__); -#define LogError(...) NSLog(__VA_ARGS__); - -#endif - #endif /* Logger_h */ From 37bd8391936fee9d3eb3838d26dfe4281ff486b5 Mon Sep 17 00:00:00 2001 From: Andreas Buff Date: Mon, 22 Mar 2021 18:07:56 +0100 Subject: [PATCH 3/5] adapts toobox dir change --- pEpObjCAdapter.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pEpObjCAdapter.xcodeproj/project.pbxproj b/pEpObjCAdapter.xcodeproj/project.pbxproj index 4f7aebe..0b5f467 100644 --- a/pEpObjCAdapter.xcodeproj/project.pbxproj +++ b/pEpObjCAdapter.xcodeproj/project.pbxproj @@ -1523,7 +1523,7 @@ HEADER_SEARCH_PATHS = ( "$(PROJECT_DIR)/../pEpEngine/src", "$(PROJECT_DIR)/../local/include/**", - "$(PROJECT_DIR)/../pep-toolbox/xcodeGenerated", + "$(PROJECT_DIR)/../pep-toolbox/build/include", ); LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -1562,7 +1562,7 @@ HEADER_SEARCH_PATHS = ( "$(PROJECT_DIR)/../pEpEngine/src", "$(PROJECT_DIR)/../local/include/**", - "$(PROJECT_DIR)/../pep-toolbox/xcodeGenerated", + "$(PROJECT_DIR)/../pep-toolbox/build/include", ); LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", From 88544e7c39e5ce90428abd6ffc030e0ae1d90544 Mon Sep 17 00:00:00 2001 From: Andreas Buff Date: Mon, 22 Mar 2021 18:09:21 +0100 Subject: [PATCH 4/5] IOS-2736 uses defines from toolbox (to DRY) --- pEpObjCAdapter/Logger.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/pEpObjCAdapter/Logger.h b/pEpObjCAdapter/Logger.h index 8856161..bb655d3 100644 --- a/pEpObjCAdapter/Logger.h +++ b/pEpObjCAdapter/Logger.h @@ -14,21 +14,6 @@ #else #import "PEPToolbox_macOS-Swift.h" #endif - -#define LogInfo(...) [[Log shared] \ - logInfoWithMessage:[NSString stringWithFormat:__VA_ARGS__] \ - function:[NSString stringWithUTF8String:__FUNCTION__] \ - filePath:[NSString stringWithUTF8String:__FILE__] \ - fileLine:__LINE__]; -#define LogWarn(...) [[Log shared] \ -logWarnWithMessage:[NSString stringWithFormat:__VA_ARGS__] \ -function:[NSString stringWithUTF8String:__FUNCTION__] \ -filePath:[NSString stringWithUTF8String:__FILE__] \ -fileLine:__LINE__]; -#define LogError(...) [[Log shared] \ -logErrorWithMessage:[NSString stringWithFormat:__VA_ARGS__] \ -function:[NSString stringWithUTF8String:__FUNCTION__] \ -filePath:[NSString stringWithUTF8String:__FILE__] \ -fileLine:__LINE__]; +#import "PEPLogger.h" #endif /* Logger_h */ From faa18cc18a882f4f9c40558b606869383d4df8b2 Mon Sep 17 00:00:00 2001 From: Andreas Buff Date: Mon, 22 Mar 2021 18:36:55 +0100 Subject: [PATCH 5/5] IOS-2736 fixes: defines not found building for iOS --- .../xcshareddata/xcschemes/PEPObjCAdapter_iOS.xcscheme | 2 +- pEpObjCAdapter/Logger.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pEpObjCAdapter.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapter_iOS.xcscheme b/pEpObjCAdapter.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapter_iOS.xcscheme index 040416e..a38abae 100644 --- a/pEpObjCAdapter.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapter_iOS.xcscheme +++ b/pEpObjCAdapter.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapter_iOS.xcscheme @@ -59,7 +59,7 @@ BlueprintIdentifier = "B7911EB321F7358500D7F66F" BuildableName = "pEpIOSToolbox.framework" BlueprintName = "pEpIOSToolbox" - ReferencedContainer = "container:../pep4ios/SubProjects/pEpIOSToolbox/pEpIOSToolbox.xcodeproj"> + ReferencedContainer = "container:../pep-toolbox/pEpIOSToolbox.xcodeproj"> +#import #else #import "PEPToolbox_macOS-Swift.h" -#endif #import "PEPLogger.h" +#endif #endif /* Logger_h */