Merge branch 'IOSAD-218' into Release_2.1

README.md

@@ -8,15 +8,10 @@ This adapter will sport three main features:
 
 ## Deployment
 
-    PER_MACHINE_DIRECTORY="/Library/Application Support/pEp"
-    PER_USER_DIRECTORY=$HOME/.pEp
-
 This software is supporting macOS 10.10 and later.
 
 ## Required Tools
 
-For building the engine, you need a working python3 environment and all dependencies:
-
 ```
 sudo port install git
 sudo port install mercurial
@@ -25,25 +20,6 @@ sudo port install autoconf
 sudo port install libtool
 sudo port install automake
 sudo port install wget
-sudo port install capnproto
-pushd ~
-git clone https://gitea.pep.foundation/fdik/yml2
-popd
-curl https://sh.rustup.rs -sSf | sh
-```
-
-add this to ~/.profile (create if it doesn't exist):
-
-```
-source $HOME/.cargo/env
-export PATH="$HOME/.cargo/bin:$PATH"
-```
-
-restart your Console (!)
-
-```
-sudo port install pkgconfig
-rustup update
 ```
 
 Install Xcode (if not installed already)
@@ -58,35 +34,10 @@ You need to have an Apple ID (connected to pEp team account) configured in Xcode
 ```
 mkdir src_pEpMacOSAdapter
 cd src_pEpMacOSAdapter
-mkdir local
-
-export MACOSX_DEPLOYMENT_TARGET=10.10
-
-git clone -b OpenSSL_1_1_1g https://github.com/openssl/openssl.git
-pushd "openssl"
-./Configure --prefix=$(pwd)/../local/ --openssldir=$(pwd)/../local/ssl darwin64-x86_64-cc
-make
-make install
-popd
-
-git clone -b boost-1.73.0 --recursive https://github.com/boostorg/boost.git
-pushd "boost"
-./bootstrap.sh --prefix=$(pwd)/../local/
-./b2 --with-system --with-filesystem --with-program_options --with-thread
-./b2 install
-popd
-
-git clone -b CRYPTOPP_8_2_0 https://github.com/weidai11/cryptopp
-pushd cryptopp
-export PREFIX=$(pwd)/../local/
-make
-make install
-unset PREFIX
-popd
 
+git clone https://gitea.pep.foundation/buff/common-dependency-build-helpers-4-apple-hardware.git
 git clone https://gitea.pep.foundation/pEp.foundation/downloadclient
-
-git clone https://gitea.pep.foundation/fdik/pEpMacOSAdapter.git
+git clone https://gitea.pep.foundation/pEp.foundation/pEpMacOSAdapter
 ```
 
 ## Build
@@ -99,13 +50,11 @@ Build scheme "All" of pEpMacOSAdapter.xcworkspace
 
 ### Using terminal
 
-`xcodebuild -workspace "pEpMacOSAdapter.xcworkspace" -scheme "All" -configuration RELEASE`
-
-(or DEBUG)
+`xcodebuild -workspace "pEpMacOSAdapter.xcworkspace" -scheme "All" -configuration [RELEASE|DEBUG]`
 
 ### Build Dir & Build Artefacts
 
-You can find the build artefacts in the `build` folder odf the project or the used submodules:
+You can find the build artefacts in the `build` folder of the project or the used submodules:
 
 src_pEpMacOSAdapter/pEpMacOSAdapter/build/foundation.pEp.adapter.macOS.xpc
 src_pEpMacOSAdapter/pEpMacOSAdapter/Submodules/pEpNotifications/build/p≡p updates.app
@@ -114,8 +63,8 @@ src_pEpMacOSAdapter/pEpMacOSAdapter/Submodules/pEpNotifications/build/p≡p upda
 
 The implementation is split in to parts:
 
-1. the working code is in pEpMacOSAdapter; the implementation is in Objective C
-1. the User Interface is in pEpNotifications; the implementation is in Swift
+- the working code is in pEpMacOSAdapter; the implementation is in Objective C
+- the User Interface is in pEpNotifications; the implementation is in Swift
 
 ### PEPMacOSAdapterProtocol, implemented with XPC
 

Submodules/pEpNotifications/pEpNotifications.xcodeproj/project.pbxproj

@@ -277,6 +277,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -337,6 +338,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
@@ -354,7 +356,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = pEpNotifications/pEpNotifications.entitlements;
-				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"pEpNotifications/Preview Content\"";
@@ -377,7 +379,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = pEpNotifications/pEpNotifications.entitlements;
-				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"pEpNotifications/Preview Content\"";

pEpMacOSAdapter.xcodeproj/project.pbxproj

@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		15AC46BC254EE19600AA18DE /* libdownloadclient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15AC46BB254EE19600AA18DE /* libdownloadclient.a */; };
+		152E47E326A6CCE7009BD3CE /* libdownloadclient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CC85A62546D71A00DC43A1 /* libdownloadclient.a */; };
 		35380AE7247BD13A004A08A6 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 35380AE6247BD13A004A08A6 /* README.md */; };
 		35380AEA247C784E004A08A6 /* pEpUpdater.mm in Sources */ = {isa = PBXBuildFile; fileRef = 35380AE9247C784E004A08A6 /* pEpUpdater.mm */; };
 		35DC18D8244DA19100FB2002 /* pEpMacOSAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 35DC18D7244DA19100FB2002 /* pEpMacOSAdapter.m */; };
@@ -37,7 +37,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				15AC46BC254EE19600AA18DE /* libdownloadclient.a in Frameworks */,
+				152E47E326A6CCE7009BD3CE /* libdownloadclient.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -239,17 +239,17 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "${PROJECT_DIR}/../local/include";
+				HEADER_SEARCH_PATHS = (
+					"${PROJECT_DIR}/../downloadclient/build/include",
+					"${PROJECT_DIR}/../common-dependency-build-helpers-4-apple-hardware/CommonPEPDependencies/build/include",
+				);
 				LIBRARY_SEARCH_PATHS = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_LDFLAGS = (
-					"${PROJECT_DIR}/../local/lib/libcrypto.a",
-					"${PROJECT_DIR}/../local/lib/libssl.a",
-					"${PROJECT_DIR}/../local/lib/libcryptopp.a",
-				);
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
 				SDKROOT = macosx;
 			};
 			name = Debug;
@@ -299,16 +299,16 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "${PROJECT_DIR}/../local/include";
+				HEADER_SEARCH_PATHS = (
+					"${PROJECT_DIR}/../downloadclient/build/include",
+					"${PROJECT_DIR}/../common-dependency-build-helpers-4-apple-hardware/CommonPEPDependencies/build/include",
+				);
 				LIBRARY_SEARCH_PATHS = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
-				OTHER_LDFLAGS = (
-					"${PROJECT_DIR}/../local/lib/libcrypto.a",
-					"${PROJECT_DIR}/../local/lib/libssl.a",
-					"${PROJECT_DIR}/../local/lib/libcryptopp.a",
-				);
+				OTHER_LDFLAGS = "";
+				OTHER_LIBTOOLFLAGS = "";
 				SDKROOT = macosx;
 			};
 			name = Release;
@@ -327,7 +327,6 @@
 				INSTALL_PATH = "/Library/Application Support/pEp";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				OTHER_LDFLAGS = "${inherited}";
 				PRODUCT_BUNDLE_IDENTIFIER = pEp.foundation.pEpMacOSAdapter;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
@@ -350,7 +349,6 @@
 				INSTALL_PATH = "/Library/Application Support/pEp";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				OTHER_LDFLAGS = "${inherited}";
 				PRODUCT_BUNDLE_IDENTIFIER = pEp.foundation.pEpMacOSAdapter;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;

pEpMacOSAdapter.xcodeproj/xcshareddata/xcschemes/All.xcscheme

@@ -4,7 +4,7 @@
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "NO">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -14,10 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "35DC18D1244DA19100FB2002"
-               BuildableName = "foundation.pEp.adapter.macOS.xpc"
-               BlueprintName = "foundation.pEp.adapter.macOS"
-               ReferencedContainer = "container:pEpMacOSAdapter.xcodeproj">
+               BlueprintIdentifier = "35380AC5247BBB03004A08A6"
+               BuildableName = "libdownloadclient.a"
+               BlueprintName = "downloadclient"
+               ReferencedContainer = "container:../downloadclient/downloadclient.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
@@ -28,10 +28,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "3527B2AD24802F84007A6276"
-               BuildableName = "p&#x2261;p updates.app"
-               BlueprintName = "p&#x2261;p updates"
-               ReferencedContainer = "container:Submodules/pEpNotifications/pEpNotifications.xcodeproj">
+               BlueprintIdentifier = "35DC18D1244DA19100FB2002"
+               BuildableName = "foundation.pEp.adapter.macOS.xpc"
+               BlueprintName = "foundation.pEp.adapter.macOS"
+               ReferencedContainer = "container:pEpMacOSAdapter.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
@@ -42,10 +42,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "35380AC5247BBB03004A08A6"
-               BuildableName = "libdownloadclient.a"
-               BlueprintName = "downloadclient"
-               ReferencedContainer = "container:Submodules/downloadclient/downloadclient.xcodeproj">
+               BlueprintIdentifier = "3527B2AD24802F84007A6276"
+               BuildableName = "p&#x2261;p updates.app"
+               BlueprintName = "p&#x2261;p updates"
+               ReferencedContainer = "container:Submodules/pEpNotifications/pEpNotifications.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -56,16 +56,6 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "35F06976247DC95A00543884"
-               BuildableName = "pEpUpdater Test.xctest"
-               BlueprintName = "pEpUpdater Test"
-               ReferencedContainer = "container:pEpMacOSAdapter.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

pEpMacOSAdapter/pEpUpdater.mm

@@ -9,7 +9,7 @@
 
 #import "pEpUpdater.h"
 
-#include "../../downloadclient/downloadclient.hh"
+#include <downloadclient/downloadclient.hh>
 
 const double CYCLE = 7200.0; // 7200 seconds = 2 hours
 NSString* CONFIG_PATH = @"/Library/Application Support/pEp/Updater";