Browse Source

APPLEMAIL-24. Refactor pEpMacOSAdapter project. Add a new workspace. Create a new pEpMacOSAdapter project. Add downloadclient to workspace. Delete pEpNotifications project.

APPLEMAIL-28
David Alarcon 2 years ago
parent
commit
ece25fa2b6
37 changed files with 138 additions and 2059 deletions
  1. +70
    -414
      pEpMacOSAdapter.xcodeproj/project.pbxproj
  2. +0
    -7
      pEpMacOSAdapter.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  3. +6
    -10
      pEpMacOSAdapter.xcodeproj/xcshareddata/xcschemes/pEpMacOSAdapter.xcscheme
  4. +4
    -4
      pEpMacOSAdapter.xcodeproj/xcshareddata/xcschemes/pEpMacOSAdapterTests.xcscheme
  5. +10
    -0
      pEpMacOSAdapter.xcworkspace/contents.xcworkspacedata
  6. +0
    -0
      pEpMacOSAdapter.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
  7. +2
    -2
      pEpMacOSAdapter/Info.plist
  8. +0
    -111
      pEpMacOSAdapter/Makefile
  9. +46
    -0
      pEpMacOSAdapter/README.md
  10. +0
    -23
      pEpMacOSAdapter/foundation.pEp.adapter.macOS.plist
  11. +0
    -12
      pEpMacOSAdapter/local.conf
  12. BIN
      pEpMacOSAdapter/p≡p for Thunderbird.der
  13. +0
    -10
      pEpMacOSAdapter/test.plist
  14. +0
    -663
      pEpNotifications/pEpNotifications.xcodeproj/project.pbxproj
  15. +0
    -7
      pEpNotifications/pEpNotifications.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  16. +0
    -8
      pEpNotifications/pEpNotifications.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
  17. +0
    -98
      pEpNotifications/pEpNotifications.xcodeproj/xcshareddata/xcschemes/p≡p updates.xcscheme
  18. +0
    -238
      pEpNotifications/pEpNotifications/AppDelegate.swift
  19. BIN
      pEpNotifications/pEpNotifications/Assets.xcassets/AppIcon.appiconset/AppStore1024x1024-2.png
  20. +0
    -59
      pEpNotifications/pEpNotifications/Assets.xcassets/AppIcon.appiconset/Contents.json
  21. +0
    -6
      pEpNotifications/pEpNotifications/Assets.xcassets/Contents.json
  22. +0
    -70
      pEpNotifications/pEpNotifications/Base.lproj/Main.storyboard
  23. +0
    -40
      pEpNotifications/pEpNotifications/Info.plist
  24. +0
    -6
      pEpNotifications/pEpNotifications/Preview Content/Preview Assets.xcassets/Contents.json
  25. BIN
      pEpNotifications/pEpNotifications/de.lproj/Localizable.strings
  26. +0
    -22
      pEpNotifications/pEpNotifications/de.lproj/Main.strings
  27. BIN
      pEpNotifications/pEpNotifications/en.lproj/Localizable.strings
  28. +0
    -18
      pEpNotifications/pEpNotifications/en.lproj/Main.strings
  29. +0
    -12
      pEpNotifications/pEpNotifications/pEpNotifications.entitlements
  30. +0
    -22
      pEpNotifications/pEpNotificationsTests/Info.plist
  31. +0
    -34
      pEpNotifications/pEpNotificationsTests/pEpNotificationsTests.swift
  32. +0
    -22
      pEpNotifications/pEpNotificationsUITests/Info.plist
  33. +0
    -43
      pEpNotifications/pEpNotificationsUITests/pEpNotificationsUITests.swift
  34. +0
    -22
      pEpUpdater Test/Info.plist
  35. +0
    -66
      pEpUpdater Test/pEpUpdater_Test.m
  36. BIN
      pEpUpdater Test/test.der
  37. +0
    -10
      pEpUpdater Test/test.plist

+ 70
- 414
pEpMacOSAdapter.xcodeproj/project.pbxproj View File

@ -7,251 +7,113 @@
objects = {
/* Begin PBXBuildFile section */
35380AE7247BD13A004A08A6 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 35380AE6247BD13A004A08A6 /* README.md */; };
35380AEA247C784E004A08A6 /* pEpUpdater.mm in Sources */ = {isa = PBXBuildFile; fileRef = 35380AE9247C784E004A08A6 /* pEpUpdater.mm */; };
35942FBC2482A12A00DCBD65 /* test.plist in Resources */ = {isa = PBXBuildFile; fileRef = 35942FBB2482A12A00DCBD65 /* test.plist */; };
35DC18D8244DA19100FB2002 /* pEpMacOSAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 35DC18D7244DA19100FB2002 /* pEpMacOSAdapter.m */; };
35DC18DA244DA19100FB2002 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 35DC18D9244DA19100FB2002 /* main.m */; };
35E131262487F2CA00BA7136 /* libdownloadclient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 35380AD9247BBB04004A08A6 /* libdownloadclient.a */; };
35F0697A247DC95A00543884 /* pEpUpdater_Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 35F06979247DC95A00543884 /* pEpUpdater_Test.m */; };
35F06980247DD05F00543884 /* pEpUpdater.mm in Sources */ = {isa = PBXBuildFile; fileRef = 35380AE9247C784E004A08A6 /* pEpUpdater.mm */; };
35F06985247DD17400543884 /* libdownloadclient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 35380AD9247BBB04004A08A6 /* libdownloadclient.a */; };
35F06993247F013300543884 /* test.der in Resources */ = {isa = PBXBuildFile; fileRef = 35F06990247F00E500543884 /* test.der */; };
4E71B8FC24E44C6A001016F0 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 4E71B8F524E44C69001016F0 /* README.md */; };
4E71B8FD24E44C6A001016F0 /* pEpMacOSAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E71B8F724E44C69001016F0 /* pEpMacOSAdapter.m */; };
4E71B8FE24E44C6A001016F0 /* pEpUpdater.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4E71B8FA24E44C69001016F0 /* pEpUpdater.mm */; };
4E71B8FF24E44C6A001016F0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E71B8FB24E44C69001016F0 /* main.m */; };
4E71B90224E44CB3001016F0 /* libdownloadclient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E71B90124E44CB3001016F0 /* libdownloadclient.a */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
3527B2E624802F88007A6276 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3527B2E024802F87007A6276 /* pEpNotifications.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 3527B2AE24802F84007A6276;
remoteInfo = pEpNotifications;
};
3527B2E824802F88007A6276 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3527B2E024802F87007A6276 /* pEpNotifications.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 3527B2C324802F87007A6276;
remoteInfo = pEpNotificationsTests;
};
3527B2EA24802F88007A6276 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3527B2E024802F87007A6276 /* pEpNotifications.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 3527B2CE24802F87007A6276;
remoteInfo = pEpNotificationsUITests;
};
35380AD8247BBB04004A08A6 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 35380AD4247BBB03004A08A6 /* downloadclient.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 35380AC6247BBB03004A08A6;
remoteInfo = downloadclient;
};
35E131272487F35600BA7136 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 35380AD4247BBB03004A08A6 /* downloadclient.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 35380AC5247BBB03004A08A6;
remoteInfo = downloadclient;
};
35F0698C247E31F900543884 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 35380AD4247BBB03004A08A6 /* downloadclient.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 35380AC5247BBB03004A08A6;
remoteInfo = downloadclient;
};
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
3527B2E024802F87007A6276 /* pEpNotifications.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = pEpNotifications.xcodeproj; path = pEpNotifications/pEpNotifications.xcodeproj; sourceTree = "<group>"; };
35380AD4247BBB03004A08A6 /* downloadclient.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = downloadclient.xcodeproj; path = ../downloadclient/downloadclient/downloadclient.xcodeproj; sourceTree = "<group>"; };
35380AE6247BD13A004A08A6 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
35380AE8247C784E004A08A6 /* pEpUpdater.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pEpUpdater.h; sourceTree = "<group>"; };
35380AE9247C784E004A08A6 /* pEpUpdater.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = pEpUpdater.mm; sourceTree = "<group>"; };
35942FBB2482A12A00DCBD65 /* test.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = test.plist; sourceTree = "<group>"; };
35BE8E4424856B9B006038C4 /* Subscriber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Subscriber.h; sourceTree = "<group>"; };
35DC18D2244DA19100FB2002 /* pEpMacOSAdapter.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = pEpMacOSAdapter.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
35DC18D5244DA19100FB2002 /* pEpMacOSAdapterProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pEpMacOSAdapterProtocol.h; sourceTree = "<group>"; };
35DC18D6244DA19100FB2002 /* pEpMacOSAdapter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pEpMacOSAdapter.h; sourceTree = "<group>"; };
35DC18D7244DA19100FB2002 /* pEpMacOSAdapter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = pEpMacOSAdapter.m; sourceTree = "<group>"; };
35DC18D9244DA19100FB2002 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
35DC18DB244DA19100FB2002 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
35F06977247DC95A00543884 /* pEpUpdater Test.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "pEpUpdater Test.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
35F06979247DC95A00543884 /* pEpUpdater_Test.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = pEpUpdater_Test.m; sourceTree = "<group>"; };
35F0697B247DC95A00543884 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
35F06990247F00E500543884 /* test.der */ = {isa = PBXFileReference; lastKnownFileType = file; path = test.der; sourceTree = "<group>"; };
4E57C39D24E19C9F0004D420 /* libboost_regex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libboost_regex.a; path = ../../boost_1_72_0/lib/libboost_regex.a; sourceTree = "<group>"; };
4E57C39F24E19CAC0004D420 /* libboost_iostreams.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libboost_iostreams.a; path = ../../boost_1_72_0/lib/libboost_iostreams.a; sourceTree = "<group>"; };
4E57C3A124E19CBC0004D420 /* libboost_system.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libboost_system.a; path = ../../boost_1_72_0/lib/libboost_system.a; sourceTree = "<group>"; };
4E57C3A324E19D140004D420 /* libcryptopp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcryptopp.a; path = ../../../../../usr/local/lib/libcryptopp.a; sourceTree = "<group>"; };
4E57C3A624E19D8B0004D420 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = ../../GitHub/openssl/libcrypto.a; sourceTree = "<group>"; };
4E59689124E14FE400559192 /* libssl.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.3.dylib; path = ../../GitHub/openssl/libssl.3.dylib; sourceTree = "<group>"; };
4E59689824E14FEA00559192 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = ../../GitHub/openssl/libssl.a; sourceTree = "<group>"; };
4E5968A224E18DFB00559192 /* libcrypto.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.3.dylib; path = ../../GitHub/openssl/libcrypto.3.dylib; sourceTree = "<group>"; };
4E5968A524E18FC000559192 /* libboost_regex.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_regex.dylib; path = ../../boost_1_72_0/lib/libboost_regex.dylib; sourceTree = "<group>"; };
4E71B8F524E44C69001016F0 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
4E71B8F624E44C69001016F0 /* pEpMacOSAdapterProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pEpMacOSAdapterProtocol.h; sourceTree = "<group>"; };
4E71B8F724E44C69001016F0 /* pEpMacOSAdapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = pEpMacOSAdapter.m; sourceTree = "<group>"; };
4E71B8F824E44C69001016F0 /* pEpMacOSAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pEpMacOSAdapter.h; sourceTree = "<group>"; };
4E71B8F924E44C69001016F0 /* pEpUpdater.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pEpUpdater.h; sourceTree = "<group>"; };
4E71B8FA24E44C69001016F0 /* pEpUpdater.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = pEpUpdater.mm; sourceTree = "<group>"; };
4E71B8FB24E44C69001016F0 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
4E71B90124E44CB3001016F0 /* libdownloadclient.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libdownloadclient.a; sourceTree = BUILT_PRODUCTS_DIR; };
4EC93EF224E4499700E96297 /* pEpMacOSAdapter.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = pEpMacOSAdapter.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
4EC93EFB24E4499700E96297 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
35DC18CF244DA19100FB2002 /* Frameworks */ = {
4EC93EEF24E4499700E96297 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
35E131262487F2CA00BA7136 /* libdownloadclient.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
35F06974247DC95A00543884 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
35F06985247DD17400543884 /* libdownloadclient.a in Frameworks */,
4E71B90224E44CB3001016F0 /* libdownloadclient.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
3527B2E124802F87007A6276 /* Products */ = {
4E71B90024E44CB3001016F0 /* Frameworks */ = {
isa = PBXGroup;
children = (
3527B2E724802F88007A6276 /* p≡p updates.app */,
3527B2E924802F88007A6276 /* pEpNotificationsTests.xctest */,
3527B2EB24802F88007A6276 /* pEpNotificationsUITests.xctest */,
4E71B90124E44CB3001016F0 /* libdownloadclient.a */,
);
name = Products;
sourceTree = "<group>";
};
35380AD5247BBB03004A08A6 /* Products */ = {
isa = PBXGroup;
children = (
35380AD9247BBB04004A08A6 /* libdownloadclient.a */,
);
name = Products;
name = Frameworks;
sourceTree = "<group>";
};
35DC18C9244DA19100FB2002 = {
4EC93EE924E4499700E96297 = {
isa = PBXGroup;
children = (
3527B2E024802F87007A6276 /* pEpNotifications.xcodeproj */,
35380AD4247BBB03004A08A6 /* downloadclient.xcodeproj */,
35DC18D4244DA19100FB2002 /* pEpMacOSAdapter */,
35F06978247DC95A00543884 /* pEpUpdater Test */,
35DC18D3244DA19100FB2002 /* Products */,
35F06969247D58C800543884 /* Frameworks */,
4EC93EF424E4499700E96297 /* pEpMacOSAdapter */,
4EC93EF324E4499700E96297 /* Products */,
4E71B90024E44CB3001016F0 /* Frameworks */,
);
sourceTree = "<group>";
};
35DC18D3244DA19100FB2002 /* Products */ = {
4EC93EF324E4499700E96297 /* Products */ = {
isa = PBXGroup;
children = (
35DC18D2244DA19100FB2002 /* pEpMacOSAdapter.xpc */,
35F06977247DC95A00543884 /* pEpUpdater Test.xctest */,
4EC93EF224E4499700E96297 /* pEpMacOSAdapter.xpc */,
);
name = Products;
sourceTree = "<group>";
};
35DC18D4244DA19100FB2002 /* pEpMacOSAdapter */ = {
4EC93EF424E4499700E96297 /* pEpMacOSAdapter */ = {
isa = PBXGroup;
children = (
35380AE6247BD13A004A08A6 /* README.md */,
35DC18D5244DA19100FB2002 /* pEpMacOSAdapterProtocol.h */,
35DC18D6244DA19100FB2002 /* pEpMacOSAdapter.h */,
35DC18D7244DA19100FB2002 /* pEpMacOSAdapter.m */,
35380AE8247C784E004A08A6 /* pEpUpdater.h */,
35380AE9247C784E004A08A6 /* pEpUpdater.mm */,
35BE8E4424856B9B006038C4 /* Subscriber.h */,
35DC18D9244DA19100FB2002 /* main.m */,
35DC18DB244DA19100FB2002 /* Info.plist */,
4E71B8F524E44C69001016F0 /* README.md */,
4E71B8F624E44C69001016F0 /* pEpMacOSAdapterProtocol.h */,
4E71B8F824E44C69001016F0 /* pEpMacOSAdapter.h */,
4E71B8F724E44C69001016F0 /* pEpMacOSAdapter.m */,
4E71B8F924E44C69001016F0 /* pEpUpdater.h */,
4E71B8FA24E44C69001016F0 /* pEpUpdater.mm */,
4E71B8FB24E44C69001016F0 /* main.m */,
4EC93EFB24E4499700E96297 /* Info.plist */,
);
path = pEpMacOSAdapter;
sourceTree = "<group>";
};
35F06969247D58C800543884 /* Frameworks */ = {
isa = PBXGroup;
children = (
4E57C3A624E19D8B0004D420 /* libcrypto.a */,
4E57C3A324E19D140004D420 /* libcryptopp.a */,
4E57C3A124E19CBC0004D420 /* libboost_system.a */,
4E57C39F24E19CAC0004D420 /* libboost_iostreams.a */,
4E57C39D24E19C9F0004D420 /* libboost_regex.a */,
4E5968A524E18FC000559192 /* libboost_regex.dylib */,
4E5968A224E18DFB00559192 /* libcrypto.3.dylib */,
4E59689824E14FEA00559192 /* libssl.a */,
4E59689124E14FE400559192 /* libssl.3.dylib */,
);
name = Frameworks;
sourceTree = "<group>";
};
35F06978247DC95A00543884 /* pEpUpdater Test */ = {
isa = PBXGroup;
children = (
35F06990247F00E500543884 /* test.der */,
35F06979247DC95A00543884 /* pEpUpdater_Test.m */,
35F0697B247DC95A00543884 /* Info.plist */,
35942FBB2482A12A00DCBD65 /* test.plist */,
);
path = "pEpUpdater Test";
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
35DC18D1244DA19100FB2002 /* pEpMacOSAdapter */ = {
4EC93EF124E4499700E96297 /* pEpMacOSAdapter */ = {
isa = PBXNativeTarget;
buildConfigurationList = 35DC18DE244DA19100FB2002 /* Build configuration list for PBXNativeTarget "pEpMacOSAdapter" */;
buildConfigurationList = 4EC93EFE24E4499700E96297 /* Build configuration list for PBXNativeTarget "pEpMacOSAdapter" */;
buildPhases = (
35DC18CE244DA19100FB2002 /* Sources */,
35DC18CF244DA19100FB2002 /* Frameworks */,
35DC18D0244DA19100FB2002 /* Resources */,
4EC93EEE24E4499700E96297 /* Sources */,
4EC93EEF24E4499700E96297 /* Frameworks */,
4EC93EF024E4499700E96297 /* Resources */,
);
buildRules = (
);
dependencies = (
35E131282487F35600BA7136 /* PBXTargetDependency */,
);
name = pEpMacOSAdapter;
productName = pEpMacOSAdapter;
productReference = 35DC18D2244DA19100FB2002 /* pEpMacOSAdapter.xpc */;
productReference = 4EC93EF224E4499700E96297 /* pEpMacOSAdapter.xpc */;
productType = "com.apple.product-type.xpc-service";
};
35F06976247DC95A00543884 /* pEpUpdater Test */ = {
isa = PBXNativeTarget;
buildConfigurationList = 35F0697C247DC95A00543884 /* Build configuration list for PBXNativeTarget "pEpUpdater Test" */;
buildPhases = (
35F06973247DC95A00543884 /* Sources */,
35F06974247DC95A00543884 /* Frameworks */,
35F06975247DC95A00543884 /* Resources */,
);
buildRules = (
);
dependencies = (
35F0698D247E31F900543884 /* PBXTargetDependency */,
);
name = "pEpUpdater Test";
productName = "pEpUpdater Test";
productReference = 35F06977247DC95A00543884 /* pEpUpdater Test.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
35DC18CA244DA19100FB2002 /* Project object */ = {
4EC93EEA24E4499700E96297 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1150;
LastUpgradeCheck = 1160;
ORGANIZATIONNAME = "p≡p foundation";
TargetAttributes = {
35DC18D1244DA19100FB2002 = {
CreatedOnToolsVersion = 11.4.1;
};
35F06976247DC95A00543884 = {
CreatedOnToolsVersion = 11.5;
4EC93EF124E4499700E96297 = {
CreatedOnToolsVersion = 11.6;
};
};
};
buildConfigurationList = 35DC18CD244DA19100FB2002 /* Build configuration list for PBXProject "pEpMacOSAdapter" */;
buildConfigurationList = 4EC93EED24E4499700E96297 /* Build configuration list for PBXProject "pEpMacOSAdapter" */;
compatibilityVersion = "Xcode 9.3";
developmentRegion = en;
hasScannedForEncodings = 0;
@ -259,115 +121,42 @@
en,
Base,
);
mainGroup = 35DC18C9244DA19100FB2002;
productRefGroup = 35DC18D3244DA19100FB2002 /* Products */;
mainGroup = 4EC93EE924E4499700E96297;
productRefGroup = 4EC93EF324E4499700E96297 /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 35380AD5247BBB03004A08A6 /* Products */;
ProjectRef = 35380AD4247BBB03004A08A6 /* downloadclient.xcodeproj */;
},
{
ProductGroup = 3527B2E124802F87007A6276 /* Products */;
ProjectRef = 3527B2E024802F87007A6276 /* pEpNotifications.xcodeproj */;
},
);
projectRoot = "";
targets = (
35DC18D1244DA19100FB2002 /* pEpMacOSAdapter */,
35F06976247DC95A00543884 /* pEpUpdater Test */,
4EC93EF124E4499700E96297 /* pEpMacOSAdapter */,
);
};
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
3527B2E724802F88007A6276 /* p≡p updates.app */ = {
isa = PBXReferenceProxy;
fileType = wrapper.application;
path = "p≡p updates.app";
remoteRef = 3527B2E624802F88007A6276 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
3527B2E924802F88007A6276 /* pEpNotificationsTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = pEpNotificationsTests.xctest;
remoteRef = 3527B2E824802F88007A6276 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
3527B2EB24802F88007A6276 /* pEpNotificationsUITests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = pEpNotificationsUITests.xctest;
remoteRef = 3527B2EA24802F88007A6276 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
35380AD9247BBB04004A08A6 /* libdownloadclient.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libdownloadclient.a;
remoteRef = 35380AD8247BBB04004A08A6 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
35DC18D0244DA19100FB2002 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
35380AE7247BD13A004A08A6 /* README.md in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
35F06975247DC95A00543884 /* Resources */ = {
4EC93EF024E4499700E96297 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
35942FBC2482A12A00DCBD65 /* test.plist in Resources */,
35F06993247F013300543884 /* test.der in Resources */,
4E71B8FC24E44C6A001016F0 /* README.md in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
35DC18CE244DA19100FB2002 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
35380AEA247C784E004A08A6 /* pEpUpdater.mm in Sources */,
35DC18DA244DA19100FB2002 /* main.m in Sources */,
35DC18D8244DA19100FB2002 /* pEpMacOSAdapter.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
35F06973247DC95A00543884 /* Sources */ = {
4EC93EEE24E4499700E96297 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
35F0697A247DC95A00543884 /* pEpUpdater_Test.m in Sources */,
35F06980247DD05F00543884 /* pEpUpdater.mm in Sources */,
4E71B8FD24E44C6A001016F0 /* pEpMacOSAdapter.m in Sources */,
4E71B8FF24E44C6A001016F0 /* main.m in Sources */,
4E71B8FE24E44C6A001016F0 /* pEpUpdater.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
35E131282487F35600BA7136 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = downloadclient;
targetProxy = 35E131272487F35600BA7136 /* PBXContainerItemProxy */;
};
35F0698D247E31F900543884 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = downloadclient;
targetProxy = 35F0698C247E31F900543884 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
35DC18DC244DA19100FB2002 /* Debug */ = {
4EC93EFC24E4499700E96297 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
@ -417,8 +206,6 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "";
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.15;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
@ -427,7 +214,7 @@
};
name = Debug;
};
35DC18DD244DA19100FB2002 /* Release */ = {
4EC93EFD24E4499700E96297 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
@ -471,8 +258,6 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "";
LIBRARY_SEARCH_PATHS = "";
MACOSX_DEPLOYMENT_TARGET = 10.15;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
@ -480,195 +265,66 @@
};
name = Release;
};
35DC18DF244DA19100FB2002 /* Debug */ = {
4EC93EFF24E4499700E96297 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
CLANG_LINK_OBJC_RUNTIME = NO;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = NQLYU6MGPN;
GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO;
ENABLE_HARDENED_RUNTIME = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Users/davidalarcon/Development/boost_1_72_0/include,
/usr/local/include,
/Users/davidalarcon/Development/GitHub/openssl/include,
);
INFOPLIST_FILE = pEpMacOSAdapter/Info.plist;
INSTALL_PATH = "/Library/Application Support/pEp";
LD_RUNPATH_SEARCH_PATHS = (
"$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)_$(_BOOL_$(SKIP_INSTALL)))",
/Users/davidalarcon/Development/boost_1_72_0/lib,
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
/Users/davidalarcon/Development/boost_1_72_0/lib,
/usr/local/lib,
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
OTHER_LDFLAGS = (
"-lobjc",
/Users/davidalarcon/Development/GitHub/openssl/libssl.a,
);
PRELINK_LIBS = "-lssl";
PRODUCT_BUNDLE_IDENTIFIER = pEp.foundation.pEpMacOSAdapter;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = NO;
SUPPORTED_PLATFORMS = macosx;
VALID_ARCHS = x86_64;
SKIP_INSTALL = YES;
};
name = Debug;
};
35DC18E0244DA19100FB2002 /* Release */ = {
4EC93F0024E4499700E96297 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
CLANG_LINK_OBJC_RUNTIME = NO;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = NQLYU6MGPN;
GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO;
ENABLE_HARDENED_RUNTIME = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Users/davidalarcon/Development/boost_1_72_0/include,
/usr/local/include,
/Users/davidalarcon/Development/GitHub/openssl/include,
);
INFOPLIST_FILE = pEpMacOSAdapter/Info.plist;
INSTALL_PATH = "/Library/Application Support/pEp";
LD_RUNPATH_SEARCH_PATHS = (
"$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)_$(_BOOL_$(SKIP_INSTALL)))",
/Users/davidalarcon/Development/boost_1_72_0/lib,
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
/Users/davidalarcon/Development/boost_1_72_0/lib,
/usr/local/lib,
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
OTHER_LDFLAGS = (
"-lobjc",
/Users/davidalarcon/Development/GitHub/openssl/libssl.a,
);
PRELINK_LIBS = "-lssl";
PRODUCT_BUNDLE_IDENTIFIER = pEp.foundation.pEpMacOSAdapter;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SKIP_INSTALL = NO;
SUPPORTED_PLATFORMS = macosx;
VALID_ARCHS = x86_64;
};
name = Release;
};
35F0697D247DC95A00543884 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Users/vb/dev/boost_1_72_0,
/opt/local/include,
);
INFOPLIST_FILE = "pEpUpdater Test/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
"/Users/vb/dev/boost_1_72_0/stage/lib\n/Users/vb/dev/boost_1_72_0/stage/lib\n/Users/vb/dev/boost_1_72_0/stage/lib",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
/Users/vb/dev/boost_1_72_0/stage/lib,
/opt/local/lib,
);
OTHER_LDFLAGS = (
"-lssl",
"-lcrypto",
"-lboost_regex",
"-lcryptopp",
);
PRODUCT_BUNDLE_IDENTIFIER = "pEp.foundation.pEpUpdater-Test";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
USE_HEADERMAP = YES;
VALID_ARCHS = x86_64;
};
name = Debug;
};
35F0697E247DC95A00543884 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Users/vb/dev/boost_1_72_0,
/opt/local/include,
);
INFOPLIST_FILE = "pEpUpdater Test/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
"/Users/vb/dev/boost_1_72_0/stage/lib\n/Users/vb/dev/boost_1_72_0/stage/lib\n/Users/vb/dev/boost_1_72_0/stage/lib",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
/Users/vb/dev/boost_1_72_0/stage/lib,
/opt/local/lib,
);
OTHER_LDFLAGS = (
"-lssl",
"-lcrypto",
"-lboost_regex",
"-lcryptopp",
);
PRODUCT_BUNDLE_IDENTIFIER = "pEp.foundation.pEpUpdater-Test";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
USE_HEADERMAP = YES;
VALID_ARCHS = x86_64;
SKIP_INSTALL = YES;
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
35DC18CD244DA19100FB2002 /* Build configuration list for PBXProject "pEpMacOSAdapter" */ = {
isa = XCConfigurationList;
buildConfigurations = (
35DC18DC244DA19100FB2002 /* Debug */,
35DC18DD244DA19100FB2002 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
35DC18DE244DA19100FB2002 /* Build configuration list for PBXNativeTarget "pEpMacOSAdapter" */ = {
4EC93EED24E4499700E96297 /* Build configuration list for PBXProject "pEpMacOSAdapter" */ = {
isa = XCConfigurationList;
buildConfigurations = (
35DC18DF244DA19100FB2002 /* Debug */,
35DC18E0244DA19100FB2002 /* Release */,
4EC93EFC24E4499700E96297 /* Debug */,
4EC93EFD24E4499700E96297 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
35F0697C247DC95A00543884 /* Build configuration list for PBXNativeTarget "pEpUpdater Test" */ = {
4EC93EFE24E4499700E96297 /* Build configuration list for PBXNativeTarget "pEpMacOSAdapter" */ = {
isa = XCConfigurationList;
buildConfigurations = (
35F0697D247DC95A00543884 /* Debug */,
35F0697E247DC95A00543884 /* Release */,
4EC93EFF24E4499700E96297 /* Debug */,
4EC93F0024E4499700E96297 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 35DC18CA244DA19100FB2002 /* Project object */;
rootObject = 4EC93EEA24E4499700E96297 /* Project object */;
}

+ 0
- 7
pEpMacOSAdapter.xcodeproj/project.xcworkspace/contents.xcworkspacedata View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:pEpMacOSAdapter.xcodeproj">
</FileRef>
</Workspace>

+ 6
- 10
pEpMacOSAdapter.xcodeproj/xcshareddata/xcschemes/pEpMacOSAdapter.xcscheme View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1150"
LastUpgradeVersion = "1160"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@ -14,7 +14,7 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "35DC18D1244DA19100FB2002"
BlueprintIdentifier = "4EC93EF124E4499700E96297"
BuildableName = "pEpMacOSAdapter.xpc"
BlueprintName = "pEpMacOSAdapter"
ReferencedContainer = "container:pEpMacOSAdapter.xcodeproj">
@ -32,9 +32,9 @@
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "35F06976247DC95A00543884"
BuildableName = "pEpUpdater Test.xctest"
BlueprintName = "pEpUpdater Test"
BlueprintIdentifier = "4E71B90624E44E45001016F0"
BuildableName = "pEpMacOSAdapterTests.xctest"
BlueprintName = "pEpMacOSAdapterTests"
ReferencedContainer = "container:pEpMacOSAdapter.xcodeproj">
</BuildableReference>
</TestableReference>
@ -50,10 +50,6 @@
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<PathRunnable
runnableDebuggingMode = "0"
FilePath = "/Users/vb/Library/Developer/Xcode/DerivedData/pEpMacOSAdapter-fdkuxqnmbllhyqepcwbjgbectwfc/Build/Products/Debug/pEpMacOSAdapter.xpc">
</PathRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
@ -64,7 +60,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "35DC18D1244DA19100FB2002"
BlueprintIdentifier = "4EC93EF124E4499700E96297"
BuildableName = "pEpMacOSAdapter.xpc"
BlueprintName = "pEpMacOSAdapter"
ReferencedContainer = "container:pEpMacOSAdapter.xcodeproj">


pEpMacOSAdapter.xcodeproj/xcshareddata/xcschemes/pEpUpdater Test.xcscheme → pEpMacOSAdapter.xcodeproj/xcshareddata/xcschemes/pEpMacOSAdapterTests.xcscheme View File


+ 10
- 0
pEpMacOSAdapter.xcworkspace/contents.xcworkspacedata View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "group:pEpMacOSAdapter.xcodeproj">
</FileRef>
<FileRef
location = "group:../downloadclient/downloadclient/downloadclient.xcodeproj">
</FileRef>
</Workspace>

pEpMacOSAdapter.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist → pEpMacOSAdapter.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist View File


+ 2
- 2
pEpMacOSAdapter/Info.plist View File

@ -21,11 +21,11 @@
<key>CFBundleVersion</key>
<string>1</string>
<key>NSHumanReadableCopyright</key>
<string>Copyleft © 2020 p≡p foundation. All rights reserved.</string>
<string>Copyright © 2020 p≡p foundation. All rights reserved.</string>
<key>XPCService</key>
<dict>
<key>ServiceType</key>
<string>User</string>
<string>Application</string>
</dict>
</dict>
</plist>

+ 0
- 111
pEpMacOSAdapter/Makefile View File

@ -1,111 +0,0 @@
# this file is under GNU GPL 3.0, see LICENSE.txt
# see LICENSE.txt
DOWNLOADCLIENT?=../../downloadclient
BOOST_INCLUDE?=$(HOME)/dev/boost_1_72_0
BOOST_LIB?=$(HOME)/dev/boost_1_72_0/stage/lib
CRYPTOPP_INCLUDE?=/opt/local/include
CRYPTOPP_LIB?=/opt/local/lib
OPENSSL_INCLUDE?=$(HOME)/include
OPENSSL_LIB?=$(HOME)/lib
SIGNING_IDENTITY?=68AD28395D8090C2A8ACDD3A31FA6735C8DAE2F4
ifeq ($(wildcard local.conf),local.conf)
-include local.conf
endif
CC?=cc
CXX?=c++
CFLAGS+=-std=c17
CXXFLAGS+=-I$(BOOST_INCLUDE) -I$(CRYPTOPP_INCLUDE) -I$(OPENSSL_INCLUDE) -std=c++17
LDFLAGS+=$(BOOST_LIB)/libboost_regex.a $(BOOST_LIB)/libboost_iostreams.a $(BOOST_LIB)/libboost_system.a
LDFLAGS+=$(CRYPTOPP_LIB)/libcryptopp.a
LDFLAGS+=$(OPENSSL_LIB)/libssl.a $(OPENSSL_LIB)/libcrypto.a
LDFLAGS+=$(DOWNLOADCLIENT)/libdownloadclient.a
LDFLAGS+=-lobjc -framework Foundation -framework AppKit
ifdef NDEBUG
CFLAGS+=-O3 -DNDEBUG
CXXFLAGS+=-O3 -DNDEBUG
else
CFLAGS+=-O0 -g
CXXFLAGS+=-O0 -g
endif
TARGET=foundation.pEp.adapter.macOS
INSTALL_TARGET=/Library/Application Support/pEp
ALL_SOURCE=$(wildcard *.m) $(wildcard *.mm)
DEPENDS=$(subst .m,.d,$(subst .mm,.d,$(ALL_SOURCE)))
ALL_OBJECTS=$(subst .d,.o,$(DEPENDS))
all: $(TARGET)
%.d: %.m
@set -e; rm -f $@; \
$(CC) -MM $(CPPFLAGS) $(CFLAGS) $< > $@.$$$$; \
sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
rm -f $@.$$$$
%.d: %.mm
@set -e; rm -f $@; \
$(CC) -MM $(CPPFLAGS) $(CFLAGS) $< > $@.$$$$; \
sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
rm -f $@.$$$$
# If only the goal 'clean' is given, do not generate and include the '%.d' files.
ifneq ($(MAKECMDGOALS),clean)
-include $(DEPENDS)
endif
$(TARGET): $(ALL_OBJECTS)
$(CXX) $(LDFLAGS) -o $@ $^
ifdef NDEBUG
strip $@
endif
%.o: %.mm
$(CXX) $(CXXFLAGS) -c -o $@ $^
.PHONY: clean uninstall install unload load
load:
launchctl load /Library/LaunchAgents/foundation.pEp.adapter.macOS.plist
unload:
launchctl unload /Library/LaunchAgents/foundation.pEp.adapter.macOS.plist
install: $(TARGET)
sudo install -d "$(INSTALL_TARGET)/Updater"
sudo install -c foundation.pEp.adapter.macOS "$(INSTALL_TARGET)/foundation.pEp.adapter.macOS"
sudo install -c foundation.pEp.adapter.macOS.plist "/Library/LaunchAgents/foundation.pEp.adapter.macOS.plist"
sudo install -c test.plist "$(INSTALL_TARGET)/Updater/test.plist"
sudo cp -f *.der "$(INSTALL_TARGET)/Updater/"
uninstall:
sudo rm -f "$(INSTALL_TARGET)/foundation.pEp.adapter.macOS"
sudo rm -f "/Library/LaunchAgents/foundation.pEp.adapter.macOS.plist"
sudo rm -f "/Library/Application Support/pEp/Updater/test.plist"
clean:
rm -f *.o *.d *.d.* $(TARGET)
local.conf:
@echo DOWNLOADCLIENT=$(DOWNLOADCLIENT) > local.conf
@echo >> local.conf
@echo BOOST_INCLUDE=$(BOOST_INCLUDE) >> local.conf
@echo BOOST_LIB=$(BOOST_LIB) >> local.conf
@echo >> local.conf
@echo CRYPTOPP_INCLUDE=$(CRYPTOPP_INCLUDE) >> local.conf
@echo CRYPTOPP_LIB=$(CRYPTOPP_LIB) >> local.conf
@echo >> local.conf
@echo OPENSSL_INCLUDE=$(OPENSSL_INCLUDE) >> local.conf
@echo OPENSSL_LIB=$(OPENSSL_LIB) >> local.conf
@echo >> local.conf
@echo SIGNING_IDENTITY=$(SIGNING_IDENTITY) >> local.conf

+ 46
- 0
pEpMacOSAdapter/README.md View File

@ -0,0 +1,46 @@
# p≡p macOS Desktop adapter
This adapter will sport three main features:
- p≡p API via Apple XPC (not yet implemented)
- p≡p API via p≡p JSON adapter (still provided by miniadapter)
- p≡p Update Client
## Deployment
PER_MACHINE_DIRECTORY="/Library/Application Support/pEp"
PER_USER_DIRECTORY=$HOME/.pEp
This software is supporting macOS 10.8 and later.
## Build
- to build pEpMacOSAdapter use the Makefile
- to build pEpNotifications use Xcode
## Build using Makefile
1. Download and install boost (1.72.0). https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.gz
2. Download and install crypto++ (master branch, CRYPTOPP_8_2_0). https://github.com/weidai11/cryptopp
3. Download and install openssl (1.1.1g). https://github.com/openssl/openssl
4. Go to pEpMacOSAdapter folder
5. make local.conf (only if local.conf doesn't exist)
6. Edit local.conf and update
- The paths (include and lib) from boost, crypto++ and openssl libraries
- The path from downloadclient library
- The signing identity
7. make
## Implementation
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
### pEpMacOSAdapterProtocol, implemented with XPC
see [pEpMacOSAdapterProtocol.h](https://gitea.pep.foundation/fdik/pEpMacOSAdapter/src/branch/master/pEpMacOSAdapter/pEpMacOSAdapterProtocol.h)
This protocol is provided to the User Interface to get informed when a download was happening.
When a subscription is active updateNow() can be used to search for immediate updates.

+ 0
- 23
pEpMacOSAdapter/foundation.pEp.adapter.macOS.plist View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<!-- Copyleft (c) 2020 by p≡p foundation -->
<!-- this file is under GNU General Public License 3.0 -->
<dict>
<key>Label</key>
<string>foundation.pEp.adapter.macOS</string>
<key>ProgramArguments</key>
<array>
<string>/Library/Application Support/pEp/foundation.pEp.adapter.macOS</string>
</array>
<key>MachServices</key>
<dict>
<key>foundation.pEp.adapter.macOS</key>
<true/>
</dict>
<key>StandardOutPath</key>
<string>/tmp/foundation.pEp.adapter.macOS.log</string>
<key>StandardErrorPath</key>
<string>/tmp/foundation.pEp.adapter.macOS.log</string>
</dict>
</plist>

+ 0
- 12
pEpMacOSAdapter/local.conf View File

@ -1,12 +0,0 @@
DOWNLOADCLIENT=../../downloadclient
BOOST_INCLUDE=/Users/davidalarcon/Development/boost_1_72_0/include
BOOST_LIB=/Users/davidalarcon/Development/boost_1_72_0/lib
CRYPTOPP_INCLUDE=/usr/local/include
CRYPTOPP_LIB=/usr/local/lib
OPENSSL_INCLUDE=/Users/davidalarcon/Development/GitHub/openssl/include
OPENSSL_LIB=/Users/davidalarcon/Development/GitHub/openssl
SIGNING_IDENTITY=68AD28395D8090C2A8ACDD3A31FA6735C8DAE2F4

BIN
pEpMacOSAdapter/p≡p for Thunderbird.der View File


+ 0
- 10
pEpMacOSAdapter/test.plist View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>name</key>
<string>p≡p for Thunderbird</string>
<key>url</key>
<string>https://fdik.org/cgidownload?hash=42232323234242</string>
</dict>
</plist>

+ 0
- 663
pEpNotifications/pEpNotifications.xcodeproj/project.pbxproj View File

@ -1,663 +0,0 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objects = {
/* Begin PBXBuildFile section */
3527B2B224802F84007A6276 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3527B2B124802F84007A6276 /* AppDelegate.swift */; };
3527B2B624802F87007A6276 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3527B2B524802F87007A6276 /* Assets.xcassets */; };
3527B2B924802F87007A6276 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3527B2B824802F87007A6276 /* Preview Assets.xcassets */; };
3527B2C824802F87007A6276 /* pEpNotificationsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3527B2C724802F87007A6276 /* pEpNotificationsTests.swift */; };
3527B2D324802F87007A6276 /* pEpNotificationsUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3527B2D224802F87007A6276 /* pEpNotificationsUITests.swift */; };
3594303F2483011000DCBD65 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3594303D2483011000DCBD65 /* Main.storyboard */; };
359430482483264F00DCBD65 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3594304A2483264F00DCBD65 /* Localizable.strings */; };
4E59688424E14CD600559192 /* pEpMacOSAdapter.xpc in Embed XPC Services */ = {isa = PBXBuildFile; fileRef = 4E59688124E148F000559192 /* pEpMacOSAdapter.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
3527B2C424802F87007A6276 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3527B2A624802F84007A6276 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 3527B2AD24802F84007A6276;
remoteInfo = pEpNotifications;
};
3527B2CF24802F87007A6276 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3527B2A624802F84007A6276 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 3527B2AD24802F84007A6276;
remoteInfo = pEpNotifications;
};
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
4E59688524E14CD600559192 /* Embed XPC Services */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "$(CONTENTS_FOLDER_PATH)/XPCServices";
dstSubfolderSpec = 16;
files = (
4E59688424E14CD600559192 /* pEpMacOSAdapter.xpc in Embed XPC Services */,
);
name = "Embed XPC Services";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
3527B2AE24802F84007A6276 /* p≡p updates.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "p≡p updates.app"; sourceTree = BUILT_PRODUCTS_DIR; };
3527B2B124802F84007A6276 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
3527B2B524802F87007A6276 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
3527B2B824802F87007A6276 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
3527B2BD24802F87007A6276 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3527B2BE24802F87007A6276 /* pEpNotifications.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = pEpNotifications.entitlements; sourceTree = "<group>"; };
3527B2C324802F87007A6276 /* pEpNotificationsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = pEpNotificationsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
3527B2C724802F87007A6276 /* pEpNotificationsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = pEpNotificationsTests.swift; sourceTree = "<group>"; };
3527B2C924802F87007A6276 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3527B2CE24802F87007A6276 /* pEpNotificationsUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = pEpNotificationsUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
3527B2D224802F87007A6276 /* pEpNotificationsUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = pEpNotificationsUITests.swift; sourceTree = "<group>"; };
3527B2D424802F87007A6276 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3594303E2483011000DCBD65 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
359430432483081B00DCBD65 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Main.strings; sourceTree = "<group>"; };
35943044248309BE00DCBD65 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Main.strings; sourceTree = "<group>"; };
359430492483264F00DCBD65 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
3594304B2483266200DCBD65 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
4E59688124E148F000559192 /* pEpMacOSAdapter.xpc */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.xpc-service"; name = pEpMacOSAdapter.xpc; path = "../../../../Library/Developer/Xcode/DerivedData/pEpMacOSAdapter-bztwbtbzqpzoebbxexqeubgzpjtx/Build/Products/Debug/pEpMacOSAdapter.xpc"; sourceTree = "<group>"; };
4E59688624E14DBF00559192 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = ../../../GitHub/openssl/libssl.a; sourceTree = "<group>"; };
4E59688824E14DD300559192 /* libssl.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.3.dylib; path = ../../../GitHub/openssl/libssl.3.dylib; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
3527B2AB24802F84007A6276 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
3527B2C024802F87007A6276 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
3527B2CB24802F87007A6276 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
3527B2A524802F84007A6276 = {
isa = PBXGroup;
children = (
4E59688124E148F000559192 /* pEpMacOSAdapter.xpc */,
3527B2B024802F84007A6276 /* pEpNotifications */,
3527B2C624802F87007A6276 /* pEpNotificationsTests */,
3527B2D124802F87007A6276 /* pEpNotificationsUITests */,
3527B2AF24802F84007A6276 /* Products */,
4E59688324E14CD600559192 /* Frameworks */,
);
sourceTree = "<group>";
};
3527B2AF24802F84007A6276 /* Products */ = {
isa = PBXGroup;
children = (
3527B2AE24802F84007A6276 /* p≡p updates.app */,
3527B2C324802F87007A6276 /* pEpNotificationsTests.xctest */,
3527B2CE24802F87007A6276 /* pEpNotificationsUITests.xctest */,
);
name = Products;
sourceTree = "<group>";
};
3527B2B024802F84007A6276 /* pEpNotifications */ = {
isa = PBXGroup;
children = (
3594303D2483011000DCBD65 /* Main.storyboard */,
3594304A2483264F00DCBD65 /* Localizable.strings */,
3527B2B124802F84007A6276 /* AppDelegate.swift */,
3527B2B524802F87007A6276 /* Assets.xcassets */,
3527B2BD24802F87007A6276 /* Info.plist */,
3527B2BE24802F87007A6276 /* pEpNotifications.entitlements */,
3527B2B724802F87007A6276 /* Preview Content */,
);
path = pEpNotifications;
sourceTree = "<group>";
};
3527B2B724802F87007A6276 /* Preview Content */ = {
isa = PBXGroup;
children = (
3527B2B824802F87007A6276 /* Preview Assets.xcassets */,
);
path = "Preview Content";
sourceTree = "<group>";
};
3527B2C624802F87007A6276 /* pEpNotificationsTests */ = {
isa = PBXGroup;
children = (
3527B2C724802F87007A6276 /* pEpNotificationsTests.swift */,
3527B2C924802F87007A6276 /* Info.plist */,
);
path = pEpNotificationsTests;
sourceTree = "<group>";
};
3527B2D124802F87007A6276 /* pEpNotificationsUITests */ = {
isa = PBXGroup;
children = (
3527B2D224802F87007A6276 /* pEpNotificationsUITests.swift */,
3527B2D424802F87007A6276 /* Info.plist */,
);
path = pEpNotificationsUITests;
sourceTree = "<group>";
};
4E59688324E14CD600559192 /* Frameworks */ = {
isa = PBXGroup;
children = (
4E59688824E14DD300559192 /* libssl.3.dylib */,
4E59688624E14DBF00559192 /* libssl.a */,
);
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
3527B2AD24802F84007A6276 /* p≡p updates */ = {
isa = PBXNativeTarget;
buildConfigurationList = 3527B2D724802F87007A6276 /* Build configuration list for PBXNativeTarget "p≡p updates" */;
buildPhases = (
3527B2AA24802F84007A6276 /* Sources */,
3527B2AB24802F84007A6276 /* Frameworks */,
3527B2AC24802F84007A6276 /* Resources */,
4E59688524E14CD600559192 /* Embed XPC Services */,
);
buildRules = (
);
dependencies = (
);
name = "p≡p updates";
productName = pEpNotifications;
productReference = 3527B2AE24802F84007A6276 /* p≡p updates.app */;
productType = "com.apple.product-type.application";
};
3527B2C224802F87007A6276 /* pEpNotificationsTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 3527B2DA24802F87007A6276 /* Build configuration list for PBXNativeTarget "pEpNotificationsTests" */;
buildPhases = (
3527B2BF24802F87007A6276 /* Sources */,
3527B2C024802F87007A6276 /* Frameworks */,
3527B2C124802F87007A6276 /* Resources */,
);
buildRules = (
);
dependencies = (
3527B2C524802F87007A6276 /* PBXTargetDependency */,
);
name = pEpNotificationsTests;
productName = pEpNotificationsTests;
productReference = 3527B2C324802F87007A6276 /* pEpNotificationsTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
3527B2CD24802F87007A6276 /* pEpNotificationsUITests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 3527B2DD24802F87007A6276 /* Build configuration list for PBXNativeTarget "pEpNotificationsUITests" */;
buildPhases = (
3527B2CA24802F87007A6276 /* Sources */,
3527B2CB24802F87007A6276 /* Frameworks */,
3527B2CC24802F87007A6276 /* Resources */,
);
buildRules = (
);
dependencies = (
3527B2D024802F87007A6276 /* PBXTargetDependency */,
);
name = pEpNotificationsUITests;
productName = pEpNotificationsUITests;
productReference = 3527B2CE24802F87007A6276 /* pEpNotificationsUITests.xctest */;
productType = "com.apple.product-type.bundle.ui-testing";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
3527B2A624802F84007A6276 /* Project object */ = {
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1150;
LastUpgradeCheck = 1150;
ORGANIZATIONNAME = "p≡p foundation";
TargetAttributes = {
3527B2AD24802F84007A6276 = {
CreatedOnToolsVersion = 11.5;
};
3527B2C224802F87007A6276 = {
CreatedOnToolsVersion = 11.5;
TestTargetID = 3527B2AD24802F84007A6276;
};
3527B2CD24802F87007A6276 = {
CreatedOnToolsVersion = 11.5;
TestTargetID = 3527B2AD24802F84007A6276;
};
};
};
buildConfigurationList = 3527B2A924802F84007A6276 /* Build configuration list for PBXProject "pEpNotifications" */;
compatibilityVersion = "Xcode 9.3";
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
de,
);
mainGroup = 3527B2A524802F84007A6276;
productRefGroup = 3527B2AF24802F84007A6276 /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
3527B2AD24802F84007A6276 /* p≡p updates */,
3527B2C224802F87007A6276 /* pEpNotificationsTests */,
3527B2CD24802F87007A6276 /* pEpNotificationsUITests */,
);
};
/* End PBXProject section */
/* Begin PBXResourcesBuildPhase section */
3527B2AC24802F84007A6276 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3594303F2483011000DCBD65 /* Main.storyboard in Resources */,
359430482483264F00DCBD65 /* Localizable.strings in Resources */,
3527B2B924802F87007A6276 /* Preview Assets.xcassets in Resources */,
3527B2B624802F87007A6276 /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
3527B2C124802F87007A6276 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
3527B2CC24802F87007A6276 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
3527B2AA24802F84007A6276 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3527B2B224802F84007A6276 /* AppDelegate.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
3527B2BF24802F87007A6276 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3527B2C824802F87007A6276 /* pEpNotificationsTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
3527B2CA24802F87007A6276 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3527B2D324802F87007A6276 /* pEpNotificationsUITests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
3527B2C524802F87007A6276 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 3527B2AD24802F84007A6276 /* p≡p updates */;
targetProxy = 3527B2C424802F87007A6276 /* PBXContainerItemProxy */;
};
3527B2D024802F87007A6276 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 3527B2AD24802F84007A6276 /* p≡p updates */;
targetProxy = 3527B2CF24802F87007A6276 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
3594303D2483011000DCBD65 /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
3594303E2483011000DCBD65 /* Base */,
359430432483081B00DCBD65 /* en */,
35943044248309BE00DCBD65 /* de */,
);
name = Main.storyboard;
sourceTree = "<group>";
};
3594304A2483264F00DCBD65 /* Localizable.strings */ = {
isa = PBXVariantGroup;
children = (
359430492483264F00DCBD65 /* de */,
3594304B2483266200DCBD65 /* en */,
);
name = Localizable.strings;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
3527B2D524802F87007A6276 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_MODULE_NAME = pEp_updater;
PRODUCT_NAME = "p≡p updater";
SDKROOT = macosx;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
name = Debug;
};
3527B2D624802F87007A6276 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
PRODUCT_MODULE_NAME = pEp_updater;
PRODUCT_NAME = "p≡p updater";
SDKROOT = macosx;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OBJC_BRIDGING_HEADER = "";
SWIFT_OPTIMIZATION_LEVEL = "-O";
};
name = Release;
};
3527B2D824802F87007A6276 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = pEpNotifications/pEpNotifications.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_ASSET_PATHS = "\"pEpNotifications/Preview Content\"";
DEVELOPMENT_TEAM = NQLYU6MGPN;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = pEpNotifications/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
/Users/davidalarcon/Development/GitHub/openssl,
/Users/davidalarcon/Development/boost_1_72_0/lib,
/usr/local/lib,
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
PRODUCT_BUNDLE_IDENTIFIER = pEp.foundation.Notifications;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
VALID_ARCHS = x86_64;
};
name = Debug;
};
3527B2D924802F87007A6276 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = pEpNotifications/pEpNotifications.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_ASSET_PATHS = "\"pEpNotifications/Preview Content\"";
DEVELOPMENT_TEAM = NQLYU6MGPN;
ENABLE_PREVIEWS = YES;
INFOPLIST_FILE = pEpNotifications/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
/Users/davidalarcon/Development/GitHub/openssl,
/Users/davidalarcon/Development/boost_1_72_0/lib,
/usr/local/lib,
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
PRODUCT_BUNDLE_IDENTIFIER = pEp.foundation.Notifications;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
VALID_ARCHS = x86_64;
};
name = Release;
};
3527B2DB24802F87007A6276 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = pEpNotificationsTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
PRODUCT_BUNDLE_IDENTIFIER = pEp.foundation.pEpNotificationsTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/pEpNotifications.app/Contents/MacOS/pEpNotifications";
};
name = Debug;
};
3527B2DC24802F87007A6276 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = pEpNotificationsTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
PRODUCT_BUNDLE_IDENTIFIER = pEp.foundation.pEpNotificationsTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/pEpNotifications.app/Contents/MacOS/pEpNotifications";
};
name = Release;
};
3527B2DE24802F87007A6276 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = pEpNotificationsUITests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = pEp.foundation.pEpNotificationsUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TEST_TARGET_NAME = pEpNotifications;
};
name = Debug;
};
3527B2DF24802F87007A6276 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = pEpNotificationsUITests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = pEp.foundation.pEpNotificationsUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TEST_TARGET_NAME = pEpNotifications;
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
3527B2A924802F84007A6276 /* Build configuration list for PBXProject "pEpNotifications" */ = {
isa = XCConfigurationList;
buildConfigurations = (
3527B2D524802F87007A6276 /* Debug */,
3527B2D624802F87007A6276 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
3527B2D724802F87007A6276 /* Build configuration list for PBXNativeTarget "p≡p updates" */ = {
isa = XCConfigurationList;
buildConfigurations = (
3527B2D824802F87007A6276 /* Debug */,
3527B2D924802F87007A6276 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
3527B2DA24802F87007A6276 /* Build configuration list for PBXNativeTarget "pEpNotificationsTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
3527B2DB24802F87007A6276 /* Debug */,
3527B2DC24802F87007A6276 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
3527B2DD24802F87007A6276 /* Build configuration list for PBXNativeTarget "pEpNotificationsUITests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
3527B2DE24802F87007A6276 /* Debug */,
3527B2DF24802F87007A6276 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 3527B2A624802F84007A6276 /* Project object */;
}

+ 0
- 7
pEpNotifications/pEpNotifications.xcodeproj/project.xcworkspace/contents.xcworkspacedata View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:">
</FileRef>
</Workspace>

+ 0
- 8
pEpNotifications/pEpNotifications.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>

+ 0
- 98
pEpNotifications/pEpNotifications.xcodeproj/xcshareddata/xcschemes/p≡p updates.xcscheme View File

@ -1,98 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1150"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3527B2AD24802F84007A6276"
BuildableName = "p&#x2261;p updates.app"
BlueprintName = "p&#x2261;p updates"
ReferencedContainer = "container:pEpNotifications.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3527B2C224802F87007A6276"
BuildableName = "pEpNotificationsTests.xctest"
BlueprintName = "pEpNotificationsTests"
ReferencedContainer = "container:pEpNotifications.xcodeproj">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3527B2CD24802F87007A6276"
BuildableName = "pEpNotificationsUITests.xctest"
BlueprintName = "pEpNotificationsUITests"
ReferencedContainer = "container:pEpNotifications.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3527B2AD24802F84007A6276"
BuildableName = "p&#x2261;p updates.app"
BlueprintName = "p&#x2261;p updates"
ReferencedContainer = "container:pEpNotifications.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3527B2AD24802F84007A6276"
BuildableName = "p&#x2261;p updates.app"
BlueprintName = "p&#x2261;p updates"
ReferencedContainer = "container:pEpNotifications.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

+ 0
- 238
pEpNotifications/pEpNotifications/AppDelegate.swift View File

@ -1,238 +0,0 @@
//
// AppDelegate.swift
// pEpNotifications
//
// Created by Volker Birk on 28.05.20.
// Copyright © 2020 pp foundation. All rights reserved.
// This file is under GNU General Public License 3.0
//
import Cocoa
import SwiftUI
enum DNType : Int { case ready = 0, downloading, downloadArrived, noDownloadAvailable }
@objc(pEpNotificationProtocol) protocol pEpNotificationProtocol {
func notifyDownload(_ type: Int, withName: NSString, withFilename: NSString)
}
@objc(pEpMacOSAdapterProtocol) protocol pEpMacOSAdapterProtocol {
func subscribeForUpdate(_ endpoint: NSXPCListenerEndpoint?)
func unsubscribeForUpdate()
func updateNow()
func scheduleUpdates()
func stopUpdates()
}
@objc class pEpNotification : NSObject, pEpNotificationProtocol {
var delegate: pEpNotificationProtocol!
func notifyDownload(_ type: Int, withName: NSString, withFilename: NSString) {
NSLog("notifyDownload");
delegate?.notifyDownload(type, withName: withName, withFilename: withFilename)
}
}
@NSApplicationMain
class AppDelegate: NSObject, NSApplicationDelegate, NSUserNotificationCenterDelegate, NSXPCListenerDelegate, pEpNotificationProtocol {
@IBOutlet weak var pEpMenu: NSMenu!
@IBOutlet weak var statusText: NSMenuItem!
@IBOutlet weak var _updateNow: NSMenuItem!
@IBOutlet weak var _scheduleUpdates: NSMenuItem!
@IBOutlet weak var _alwaysShowThisMenu: NSMenuItem!
var statusBarItem: NSStatusItem? = nil
var connection: NSXPCConnection!
var service: pEpMacOSAdapterProtocol!
var nc = NSUserNotificationCenter.default
var clientListener: NSXPCListener!
var receiver: pEpNotification!
@objc func installMenuExtra() {
if statusBarItem == nil {
statusBarItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.squareLength)
statusBarItem?.button?.title = "p≡p"
statusBarItem?.menu = NSApp.menu?.item(at: 0)?.submenu
_updateNow.action = #selector(updateNow)
}
}
func uninstallMenuExtra() {
if (statusBarItem != nil && !UserDefaults.standard.bool(forKey: "AlwaysShowThisMenu")) {
NSStatusBar.system.removeStatusItem(statusBarItem!)
statusBarItem = nil
}
}
func setDownloadState(_ text: String, _ product: Dictionary<String, Any>? = nil) {
if product == nil {
statusText.title = NSLocalizedString(text, comment: "")
statusText.isEnabled = false
}
else {
let name = product?["name"] as! String
statusText.title = NSString.localizedStringWithFormat(NSLocalizedString(text, comment: "") as NSString, name) as String
statusText.isEnabled = true
}
statusText.representedObject = product
}
@IBAction func scheduleUpdates(_ sender: NSMenuItem) {
if sender.state == NSControl.StateValue.on {
sender.state = NSControl.StateValue.off
UserDefaults.standard.set(false, forKey: "ScheduleUpdates")
service.stopUpdates()
}
else {
sender.state = NSControl.StateValue.on
UserDefaults.standard.set(true, forKey: "ScheduleUpdates")
service.scheduleUpdates()
}
}
@IBAction func alwaysShowThisMenu(_ sender: NSMenuItem) {
if sender.state == NSControl.StateValue.on {
sender.state = NSControl.StateValue.off
UserDefaults.standard.set(false, forKey: "AlwaysShowThisMenu")
if statusText.representedObject == nil {
uninstallMenuExtra()
}
}
else {