From 39e38f8fc953c73a9bf7446324988a90a5fc43b8 Mon Sep 17 00:00:00 2001 From: Andreas Buff Date: Mon, 12 Jul 2021 14:16:42 +0200 Subject: [PATCH] IOSAD-213 fixes: doesnt build with pEpMimeObjCAdapter --- .../project.pbxproj | 4 +- .../project.pbxproj | 84 ------------------- 2 files changed, 1 insertion(+), 87 deletions(-) diff --git a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/project.pbxproj b/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/project.pbxproj index ef2be18..5b409af 100644 --- a/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/project.pbxproj +++ b/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj/project.pbxproj @@ -99,7 +99,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 1585EB0D269861CE00B822E1 /* PEPObjCTypeUtils.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PEPObjCTypeUtils.xcodeproj; path = ../PEPObjCTypeUtils/PEPObjCTypeUtils.xcodeproj; sourceTree = ""; }; 43D44C832685BE4300638D1C /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = ""; }; 4E575841268328CD0084F02D /* PEPObjCAdapterTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPObjCAdapterTypes.h; sourceTree = ""; }; 4E575843268328CD0084F02D /* PEPObjCAdapterTypes.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPObjCAdapterTypes.m; sourceTree = ""; }; @@ -170,7 +169,6 @@ 4E575835268328CD0084F02D = { isa = PBXGroup; children = ( - 1585EB0D269861CE00B822E1 /* PEPObjCTypeUtils.xcodeproj */, 4E575840268328CD0084F02D /* PEPObjCAdapterTypes */, 4E575859268329170084F02D /* PEPObjCAdapterTypes_macOS */, 4E575866268329A20084F02D /* PEPObjCAdapterTypes_iOS */, @@ -467,7 +465,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "CUSTOM_BUILD_DIR=${PROJECT_DIR}/build\nmkdir -p ${CUSTOM_BUILD_DIR}\n\ncp -R \"${BUILD_DIR}/${CONFIGURATION}/usr/local/include\" ${CUSTOM_BUILD_DIR}\ncp \"${BUILT_PRODUCTS_DIR}/libPEPObjCAdapterTypes_macOS.a\" ${CUSTOM_BUILD_DIR}\n"; + shellScript = "CUSTOM_BUILD_DIR=${PROJECT_DIR}/build\nmkdir -p ${CUSTOM_BUILD_DIR}\n\ncp -R \"${BUILT_PRODUCTS_DIR}/usr/local/include\" ${CUSTOM_BUILD_DIR}\ncp \"${BUILT_PRODUCTS_DIR}/libPEPObjCAdapterTypes_macOS.a\" ${CUSTOM_BUILD_DIR}\n"; }; 4E5758F8268371B10084F02D /* Copy artefacts to custom build dir */ = { isa = PBXShellScriptBuildPhase; diff --git a/Subprojects/PEPObjCTypeUtils/PEPObjCTypeUtils.xcodeproj/project.pbxproj b/Subprojects/PEPObjCTypeUtils/PEPObjCTypeUtils.xcodeproj/project.pbxproj index 7540a32..15dd836 100644 --- a/Subprojects/PEPObjCTypeUtils/PEPObjCTypeUtils.xcodeproj/project.pbxproj +++ b/Subprojects/PEPObjCTypeUtils/PEPObjCTypeUtils.xcodeproj/project.pbxproj @@ -25,41 +25,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 1585EC67269C39ED00B822E1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1585EC64269C39ED00B822E1 /* PEPObjCAdapterTypes.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 4E575864268329A20084F02D; - remoteInfo = PEPObjCAdapterTypes_iOS; - }; - 1585EC6C269C39ED00B822E1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1585EC64269C39ED00B822E1 /* PEPObjCAdapterTypes.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4E575858268329170084F02D; - remoteInfo = PEPObjCAdapterTypes_macOS; - }; - 1585EC6E269C39ED00B822E1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1585EC64269C39ED00B822E1 /* PEPObjCAdapterTypes.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4E575865268329A20084F02D; - remoteInfo = PEPObjCAdapterTypes_iOS; - }; - 1585EC70269C39ED00B822E1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1585EC64269C39ED00B822E1 /* PEPObjCAdapterTypes.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 4E5758BF26833D140084F02D; - remoteInfo = PEPObjCAdapterTypesTests_iOS; - }; - 1585EC72269C39F700B822E1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1585EC64269C39ED00B822E1 /* PEPObjCAdapterTypes.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 4E575857268329170084F02D; - remoteInfo = PEPObjCAdapterTypes_macOS; - }; 1585EC90269C51EC00B822E1 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 1585EACB269850B400B822E1 /* pEpEngine.xcodeproj */; @@ -136,7 +101,6 @@ 1585EB3D2698636C00B822E1 /* libPEPObjCTypeUtils_iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPEPObjCTypeUtils_iOS.a; sourceTree = BUILT_PRODUCTS_DIR; }; 1585EBC12698A8FC00B822E1 /* PEPObjCTypeUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PEPObjCTypeUtils.h; sourceTree = ""; }; 1585EBC22698A8FC00B822E1 /* PEPObjCTypeUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PEPObjCTypeUtils.m; sourceTree = ""; }; - 1585EC64269C39ED00B822E1 /* PEPObjCAdapterTypes.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PEPObjCAdapterTypes.xcodeproj; path = /Users/buff/workspace/pEp/src_pEp4iOS/pEpObjCAdapter/Subprojects/PEPObjCAdapterTypes/PEPObjCAdapterTypes.xcodeproj; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -165,7 +129,6 @@ 1585EA7E26984C4300B822E1 /* PEPObjCTypeUtils */, 1585EA7D26984C4300B822E1 /* Products */, 1585EADB269850C700B822E1 /* Frameworks */, - 1585EC64269C39ED00B822E1 /* PEPObjCAdapterTypes.xcodeproj */, ); sourceTree = ""; }; @@ -216,16 +179,6 @@ name = Frameworks; sourceTree = ""; }; - 1585EC65269C39ED00B822E1 /* Products */ = { - isa = PBXGroup; - children = ( - 1585EC6D269C39ED00B822E1 /* libPEPObjCAdapterTypes_macOS.a */, - 1585EC6F269C39ED00B822E1 /* libPEPObjCAdapterTypes_iOS.a */, - 1585EC71269C39ED00B822E1 /* PEPObjCAdapterTypesTests_iOS.xctest */, - ); - name = Products; - sourceTree = ""; - }; 1585EC8A269C51EC00B822E1 /* Products */ = { isa = PBXGroup; children = ( @@ -287,7 +240,6 @@ ); dependencies = ( 1585ECC4269C5A0800B822E1 /* PBXTargetDependency */, - 1585EC73269C39F700B822E1 /* PBXTargetDependency */, ); name = PEPObjCTypeUtils_macOS; productName = PEPObjCTypeUtils; @@ -307,7 +259,6 @@ buildRules = ( ); dependencies = ( - 1585EC68269C39ED00B822E1 /* PBXTargetDependency */, ); name = PEPObjCTypeUtils_iOS; productName = PEPObjCTypeUtils_iOS; @@ -346,10 +297,6 @@ ProductGroup = 1585EC8A269C51EC00B822E1 /* Products */; ProjectRef = 1585EACB269850B400B822E1 /* pEpEngine.xcodeproj */; }, - { - ProductGroup = 1585EC65269C39ED00B822E1 /* Products */; - ProjectRef = 1585EC64269C39ED00B822E1 /* PEPObjCAdapterTypes.xcodeproj */; - }, { ProductGroup = 1585EC99269C51EC00B822E1 /* Products */; ProjectRef = 1585EADF2698524500B822E1 /* PEPObjCAdapterTypes.xcodeproj */; @@ -364,27 +311,6 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 1585EC6D269C39ED00B822E1 /* libPEPObjCAdapterTypes_macOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libPEPObjCAdapterTypes_macOS.a; - remoteRef = 1585EC6C269C39ED00B822E1 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1585EC6F269C39ED00B822E1 /* libPEPObjCAdapterTypes_iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libPEPObjCAdapterTypes_iOS.a; - remoteRef = 1585EC6E269C39ED00B822E1 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1585EC71269C39ED00B822E1 /* PEPObjCAdapterTypesTests_iOS.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = PEPObjCAdapterTypesTests_iOS.xctest; - remoteRef = 1585EC70269C39ED00B822E1 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 1585EC91269C51EC00B822E1 /* libpEpEngine.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -494,16 +420,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 1585EC68269C39ED00B822E1 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = PEPObjCAdapterTypes_iOS; - targetProxy = 1585EC67269C39ED00B822E1 /* PBXContainerItemProxy */; - }; - 1585EC73269C39F700B822E1 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = PEPObjCAdapterTypes_macOS; - targetProxy = 1585EC72269C39F700B822E1 /* PBXContainerItemProxy */; - }; 1585ECC4269C5A0800B822E1 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = pEpEngine_macOS;